CaptivePortal : Include zone name in Nas-Identifier (Redmine 8998)

[Augustin-FL]

Since 2.4.4 RADIUS attribute NAS-Identifier is the same on all CaptivePortal zones. This is an issue for users that need to distinguish multiple zones and can't use NAS-Port for that

• Redmine Issue: https://redmine.pfsense.org/issues/8998
• Ready for review

[jim-p]

I'm OK with this PR as a new default but I still think we should allow the user to override the NAS ID as was possible previously, so this needs more work yet. This can be merged, I'll look into doing the other change soon.

[rayhdez87]

Hello, I followed the steps described in the Bugs https://redmine.pfsense.org/issues/8998, however I received several errors in the Pfsense web interface, related to PHP, any ideas that you can contribute, thanks.

[Augustin-FL]

@rayhdez87 could you copy here the PHP errors you got ?

[rayhdez87]

@Augustin-FL Hello, these are the mistakes that shows me.

PHP errors PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.prunecaptiveportal, Line: 53, Message: Uncaught Error: Call to undefined function captiveportal_prune_old() in /etc/rc.prunecaptiveportal:53
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.prunecaptiveportal, Line: 53, Message: Uncaught Error: Call to undefined function captiveportal_prune_old() in /etc/rc.prunecaptiveportal:53
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/inc/system.inc, Line: 2107, Message: Uncaught Error: Call to undefined function captiveportal_radius_stop_all() in /etc/inc/system.inc:2107
Stack trace:
#0 /etc/inc/system.inc(2093): system_reboot_cleanup()
#1 /etc/rc.initial.reboot(66): system_reboot_sync()
#2 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.prunecaptiveportal, Line: 53, Message: Uncaught Error: Call to undefined function captiveportal_prune_old() in /etc/rc.prunecaptiveportal:53
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/inc/system.inc, Line: 2107, Message: Uncaught Error: Call to undefined function captiveportal_radius_stop_all() in /etc/inc/system.inc:2107
Stack trace:
#0 /etc/inc/system.inc(2093): system_reboot_cleanup()
#1 /etc/rc.initial.reboot(66): system_reboot_sync()
#2 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.bootup, Line: 309, Message: Uncaught Error: Call to undefined function captiveportal_configure() in /etc/rc.bootup:309
Stack trace:
#0 {main}
thrown

Thanks for your comments.

[Augustin-FL]

These errors are pretty weird. Looks like your pfSense files are now corrupted ...

Hello, I followed the steps described in the Bugs https://redmine.pfsense.org/issues/8998 , [...]

What do you mean by "I followed the steps"? What did you do exactly?

Anyway, I would recommend you to re-install from a fresh, new ISO, instead of trying to "install" this pull request manually.

This pull request has been cherry-picked to 2.4.4 branch, meaning it is currently included in any recent pfSense 2.4.4 ISO.

[rayhdez87]

@Augustin-FL Hello, these are the mistakes that shows me.

PHP errors PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.prunecaptiveportal, Line: 53, Message: Uncaught Error: Call to undefined function captiveportal_prune_old() in /etc/rc.prunecaptiveportal:53
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.prunecaptiveportal, Line: 53, Message: Uncaught Error: Call to undefined function captiveportal_prune_old() in /etc/rc.prunecaptiveportal:53
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /usr/local/bin/captiveportal_gather_stats.php, Line: 33, Message: Uncaught Error: Call to undefined function captiveportal_read_db() in /usr/local/bin/captiveportal_gather_stats.php:33
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/inc/system.inc, Line: 2107, Message: Uncaught Error: Call to undefined function captiveportal_radius_stop_all() in /etc/inc/system.inc:2107
Stack trace:
#0 /etc/inc/system.inc(2093): system_reboot_cleanup()
#1 /etc/rc.initial.reboot(66): system_reboot_sync()
#2 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.prunecaptiveportal, Line: 53, Message: Uncaught Error: Call to undefined function captiveportal_prune_old() in /etc/rc.prunecaptiveportal:53
Stack trace:
#0 {main}
thrown PHP ERROR: Type: 1, File: /etc/inc/system.inc, Line: 2107, Message: Uncaught Error: Call to undefined function captiveportal_radius_stop_all() in /etc/inc/system.inc:2107
Stack trace:
#0 /etc/inc/system.inc(2093): system_reboot_cleanup()
#1 /etc/rc.initial.reboot(66): system_reboot_sync()
#2 {main}
thrown PHP ERROR: Type: 1, File: /etc/rc.bootup, Line: 309, Message: Uncaught Error: Call to undefined function captiveportal_configure() in /etc/rc.bootup:309
Stack trace:
#0 {main}
thrown

Thanks for your comments.

[rayhdez87]

The steps described in the reference url https://redmine.pfsense.org/issues/8998, was to overwrite the following files: /etc/inc/captiveportal.inc for the one offered in this site, and also the file: /usr/local/www/services_captiveportal.php, before performing the suggested operations, make a save of both files, and compare the originals with the downloaded ones, in the case of the second file, it is the only one that shows significant changes in its code, the first file is exactly the same, once those errors are shown, return to put in its place the saved files of the installation that worked, and everything works fine, except to be able to achieve the desired changes according to the response to said bugs.
Thank you for your comments, and excuse my writing in your language.