diff options
| author | jim-p <jimp@pfsense.org> | 2010-07-06 14:26:56 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-07-06 14:27:44 -0400 |
| commit | 0321fa1ba49f41e672fe0836a399e03ed05d38d5 (patch) | |
| tree | 8bf94fce801da10a1a560c632ed7deeff32b466f | |
| parent | 4b49a8a91ec6a3ac26775644b0441ccd817d04ce (diff) | |
| download | pfsense-0321fa1ba49f41e672fe0836a399e03ed05d38d5.zip pfsense-0321fa1ba49f41e672fe0836a399e03ed05d38d5.tar.gz | |
Wrap the dns rebind check in a test to see if our error function exists. If it doesn't, it's probably being called from captive portal, so skip the check. Fixes #721
| -rw-r--r-- | etc/inc/auth.inc | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 6078158..2aca48f 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -49,18 +49,22 @@ require_once("config.gui.inc"); -/* DNS ReBinding attack prevention. http://redmine.pfsense.org/issues/708 */ -$found_host = false; -if($config['dyndnses']['dyndns']) - foreach($config['dyndnses']['dyndns'] as $dyndns) - if($dyndns['host'] == $_SERVER['HTTP_HOST'] or $dyndns['host'] == $_SERVER['SERVER_ADDR']) - $found_host = true; -if($found_host == false) { - if ($_SERVER['HTTP_HOST'] != $config['system']['hostname'] . "." . $config['system']['domain'] and - $_SERVER['HTTP_HOST'] != $_SERVER['SERVER_ADDR'] and - $_SERVER['HTTP_HOST'] != $config['system']['hostname']) { - display_error_form("501", "Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding"); - exit; +/* If this function doesn't exist, we're being called from Captive Portal or + another internal subsystem which does not include authgui.inc */ +if (function_exists("display_error_form")) { + /* DNS ReBinding attack prevention. http://redmine.pfsense.org/issues/708 */ + $found_host = false; + if($config['dyndnses']['dyndns']) + foreach($config['dyndnses']['dyndns'] as $dyndns) + if($dyndns['host'] == $_SERVER['HTTP_HOST'] or $dyndns['host'] == $_SERVER['SERVER_ADDR']) + $found_host = true; + if($found_host == false) { + if ($_SERVER['HTTP_HOST'] != $config['system']['hostname'] . "." . $config['system']['domain'] and + $_SERVER['HTTP_HOST'] != $_SERVER['SERVER_ADDR'] and + $_SERVER['HTTP_HOST'] != $config['system']['hostname']) { + display_error_form("501", "Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding"); + exit; + } } } |
