Commit 0fe885b9 authored by Franco Fichtner's avatar Franco Fichtner

captiveportal: apply PSR2 style

parent 21377312
...@@ -79,12 +79,13 @@ if ($orig_host != $ourhostname) { ...@@ -79,12 +79,13 @@ if ($orig_host != $ourhostname) {
return; return;
} }
if (!empty($cpcfg['redirurl'])) if (!empty($cpcfg['redirurl'])) {
$redirurl = $cpcfg['redirurl']; $redirurl = $cpcfg['redirurl'];
else if (preg_match("/redirurl=(.*)/", $orig_request, $matches)) } elseif (preg_match("/redirurl=(.*)/", $orig_request, $matches)) {
$redirurl = urldecode($matches[1]); $redirurl = urldecode($matches[1]);
else if ($_REQUEST['redirurl']) } elseif ($_REQUEST['redirurl']) {
$redirurl = $_REQUEST['redirurl']; $redirurl = $_REQUEST['redirurl'];
}
$macfilter = !isset($cpcfg['nomacfilter']); $macfilter = !isset($cpcfg['nomacfilter']);
$passthrumac = isset($cpcfg['passthrumacadd']); $passthrumac = isset($cpcfg['passthrumacadd']);
...@@ -112,7 +113,7 @@ if ($macfilter || $passthrumac) { ...@@ -112,7 +113,7 @@ if ($macfilter || $passthrumac) {
$tmpres = ip_to_mac($clientip); $tmpres = ip_to_mac($clientip);
if (!$tmpres) { if (!$tmpres) {
/* unable to find MAC address - shouldn't happen! - bail out */ /* unable to find MAC address - shouldn't happen! - bail out */
captiveportal_logportalauth("unauthenticated","noclientmac",$clientip,"ERROR"); captiveportal_logportalauth("unauthenticated", "noclientmac", $clientip, "ERROR");
echo "An error occurred. Please check the system logs for more information."; echo "An error occurred. Please check the system logs for more information.";
log_error("Zone: {$cpzone} - Captive portal could not determine client's MAC address. Disable MAC address filtering in captive portal if you do not need this functionality."); log_error("Zone: {$cpzone} - Captive portal could not determine client's MAC address. Disable MAC address filtering in captive portal if you do not need this functionality.");
ob_flush(); ob_flush();
...@@ -124,16 +125,17 @@ if ($macfilter || $passthrumac) { ...@@ -124,16 +125,17 @@ if ($macfilter || $passthrumac) {
/* find out if we need RADIUS + RADIUSMAC or not */ /* find out if we need RADIUS + RADIUSMAC or not */
if (file_exists("/var/db/captiveportal_radius_{$cpzone}.db")) { if (file_exists("/var/db/captiveportal_radius_{$cpzone}.db")) {
$radius_enable = TRUE; $radius_enable = true;
if (isset($cpcfg['radmac_enable'])) { if (isset($cpcfg['radmac_enable'])) {
$radmac_enable = TRUE; $radmac_enable = true;
} }
} }
/* find radius context */ /* find radius context */
$radiusctx = 'first'; $radiusctx = 'first';
if ($_POST['auth_user2']) if ($_POST['auth_user2']) {
$radiusctx = 'second'; $radiusctx = 'second';
}
if ($_POST['logout_id']) { if ($_POST['logout_id']) {
echo <<<EOD echo <<<EOD
...@@ -154,57 +156,58 @@ setTimeout('window.close();',5000) ; ...@@ -154,57 +156,58 @@ setTimeout('window.close();',5000) ;
EOD; EOD;
captiveportal_disconnect_client($_POST['logout_id']); captiveportal_disconnect_client($_POST['logout_id']);
} else if ($macfilter && $clientmac && captiveportal_blocked_mac($clientmac)) { } elseif ($macfilter && $clientmac && captiveportal_blocked_mac($clientmac)) {
captiveportal_logportalauth($clientmac,$clientmac,$clientip,"Blocked MAC address"); captiveportal_logportalauth($clientmac, $clientmac, $clientip, "Blocked MAC address");
if (!empty($cpcfg['blockedmacsurl'])) if (!empty($cpcfg['blockedmacsurl'])) {
portal_reply_page($cpcfg['blockedmacsurl'], "redir"); portal_reply_page($cpcfg['blockedmacsurl'], "redir");
else } else {
portal_reply_page($redirurl, "error", "This MAC address has been blocked"); portal_reply_page($redirurl, "error", "This MAC address has been blocked");
}
} else if ($clientmac && $radmac_enable && portal_mac_radius($clientmac,$clientip, $radiusctx)) { } elseif ($clientmac && $radmac_enable && portal_mac_radius($clientmac, $clientip, $radiusctx)) {
/* radius functions handle everything so we exit here since we're done */ /* radius functions handle everything so we exit here since we're done */
} else if (portal_consume_passthrough_credit($clientmac)) { } elseif (portal_consume_passthrough_credit($clientmac)) {
/* allow the client through if it had a pass-through credit for its MAC */ /* allow the client through if it had a pass-through credit for its MAC */
captiveportal_logportalauth("unauthenticated",$clientmac,$clientip,"ACCEPT"); captiveportal_logportalauth("unauthenticated", $clientmac, $clientip, "ACCEPT");
portal_allow($clientip, $clientmac, "unauthenticated"); portal_allow($clientip, $clientmac, "unauthenticated");
} else if (isset($config['voucher'][$cpzone]['enable']) && $_POST['accept'] && $_POST['auth_voucher']) { } elseif (isset($config['voucher'][$cpzone]['enable']) && $_POST['accept'] && $_POST['auth_voucher']) {
$voucher = trim($_POST['auth_voucher']); $voucher = trim($_POST['auth_voucher']);
$timecredit = voucher_auth($voucher); $timecredit = voucher_auth($voucher);
// $timecredit contains either a credit in minutes or an error message // $timecredit contains either a credit in minutes or an error message
if ($timecredit > 0) { // voucher is valid. Remaining minutes returned if ($timecredit > 0) { // voucher is valid. Remaining minutes returned
// if multiple vouchers given, use the first as username // if multiple vouchers given, use the first as username
$a_vouchers = preg_split("/[\t\n\r ]+/s",$voucher); $a_vouchers = preg_split("/[\t\n\r ]+/s", $voucher);
$voucher = $a_vouchers[0]; $voucher = $a_vouchers[0];
$attr = array( 'voucher' => 1, $attr = array( 'voucher' => 1,
'session_timeout' => $timecredit*60, 'session_timeout' => $timecredit*60,
'session_terminate_time' => 0); 'session_terminate_time' => 0);
if (portal_allow($clientip, $clientmac,$voucher,null,$attr)) { if (portal_allow($clientip, $clientmac, $voucher, null, $attr)) {
// YES: user is good for $timecredit minutes. // YES: user is good for $timecredit minutes.
captiveportal_logportalauth($voucher,$clientmac,$clientip,"Voucher login good for $timecredit min."); captiveportal_logportalauth($voucher, $clientmac, $clientip, "Voucher login good for $timecredit min.");
portal_reply_page($redirurl, "redir", "Just redirect the user."); portal_reply_page($redirurl, "redir", "Just redirect the user.");
} else { } else {
portal_reply_page($redirurl, "error", $config['voucher'][$cpzone]['msgexpired'] ? $config['voucher'][$cpzone]['msgexpired']: $errormsg); portal_reply_page($redirurl, "error", $config['voucher'][$cpzone]['msgexpired'] ? $config['voucher'][$cpzone]['msgexpired']: $errormsg);
} }
} else if (-1 == $timecredit) { // valid but expired } elseif (-1 == $timecredit) { // valid but expired
captiveportal_logportalauth($voucher,$clientmac,$clientip,"FAILURE","voucher expired"); captiveportal_logportalauth($voucher, $clientmac, $clientip, "FAILURE", "voucher expired");
portal_reply_page($redirurl, "error", $config['voucher'][$cpzone]['msgexpired'] ? $config['voucher'][$cpzone]['msgexpired']: $errormsg); portal_reply_page($redirurl, "error", $config['voucher'][$cpzone]['msgexpired'] ? $config['voucher'][$cpzone]['msgexpired']: $errormsg);
} else { } else {
captiveportal_logportalauth($voucher,$clientmac,$clientip,"FAILURE"); captiveportal_logportalauth($voucher, $clientmac, $clientip, "FAILURE");
portal_reply_page($redirurl, "error", $config['voucher'][$cpzone]['msgnoaccess'] ? $config['voucher'][$cpzone]['msgnoaccess'] : $errormsg); portal_reply_page($redirurl, "error", $config['voucher'][$cpzone]['msgnoaccess'] ? $config['voucher'][$cpzone]['msgnoaccess'] : $errormsg);
} }
} else if ($_POST['accept'] && $radius_enable) { } elseif ($_POST['accept'] && $radius_enable) {
if (($_POST['auth_user'] && isset($_POST['auth_pass'])) || ($_POST['auth_user2'] && isset($_POST['auth_pass2']))) { if (($_POST['auth_user'] && isset($_POST['auth_pass'])) || ($_POST['auth_user2'] && isset($_POST['auth_pass2']))) {
if (!empty($_POST['auth_user'])) { if (!empty($_POST['auth_user'])) {
$user = $_POST['auth_user']; $user = $_POST['auth_user'];
$paswd = $_POST['auth_pass']; $paswd = $_POST['auth_pass'];
} else if (!empty($_POST['auth_user2'])) { } elseif (!empty($_POST['auth_user2'])) {
$user = $_POST['auth_user2']; $user = $_POST['auth_user2'];
$paswd = $_POST['auth_pass2']; $paswd = $_POST['auth_pass2'];
} }
$auth_list = radius($user,$paswd,$clientip,$clientmac,"USER LOGIN", $radiusctx); $auth_list = radius($user, $paswd, $clientip, $clientmac, "USER LOGIN", $radiusctx);
$type = "error"; $type = "error";
if (!empty($auth_list['url_redirection'])) { if (!empty($auth_list['url_redirection'])) {
$redirurl = $auth_list['url_redirection']; $redirurl = $auth_list['url_redirection'];
...@@ -212,49 +215,52 @@ EOD; ...@@ -212,49 +215,52 @@ EOD;
} }
if ($auth_list['auth_val'] == 1) { if ($auth_list['auth_val'] == 1) {
captiveportal_logportalauth($user,$clientmac,$clientip,"ERROR",$auth_list['error']); captiveportal_logportalauth($user, $clientmac, $clientip, "ERROR", $auth_list['error']);
portal_reply_page($redirurl, $type, $auth_list['error'] ? $auth_list['error'] : $errormsg); portal_reply_page($redirurl, $type, $auth_list['error'] ? $auth_list['error'] : $errormsg);
} else if ($auth_list['auth_val'] == 3) { } elseif ($auth_list['auth_val'] == 3) {
captiveportal_logportalauth($user,$clientmac,$clientip,"FAILURE",$auth_list['reply_message']); captiveportal_logportalauth($user, $clientmac, $clientip, "FAILURE", $auth_list['reply_message']);
portal_reply_page($redirurl, $type, $auth_list['reply_message'] ? $auth_list['reply_message'] : $errormsg); portal_reply_page($redirurl, $type, $auth_list['reply_message'] ? $auth_list['reply_message'] : $errormsg);
} }
} else { } else {
if (!empty($_POST['auth_user'])) if (!empty($_POST['auth_user'])) {
$user = $_POST['auth_user']; $user = $_POST['auth_user'];
else if (!empty($_POST['auth_user2'])) } elseif (!empty($_POST['auth_user2'])) {
$user = $_POST['auth_user2']; $user = $_POST['auth_user2'];
else } else {
$user = 'unknown'; $user = 'unknown';
captiveportal_logportalauth($user ,$clientmac,$clientip,"ERROR"); }
captiveportal_logportalauth($user, $clientmac, $clientip, "ERROR");
portal_reply_page($redirurl, "error", $errormsg); portal_reply_page($redirurl, "error", $errormsg);
} }
} else if ($_POST['accept'] && $cpcfg['auth_method'] == "local") { } elseif ($_POST['accept'] && $cpcfg['auth_method'] == "local") {
if ($_POST['auth_user'] && $_POST['auth_pass']) { if ($_POST['auth_user'] && $_POST['auth_pass']) {
//check against local user manager //check against local user manager
$loginok = local_backed($_POST['auth_user'], $_POST['auth_pass']); $loginok = local_backed($_POST['auth_user'], $_POST['auth_pass']);
if ($loginok && isset($cpcfg['localauth_priv'])) if ($loginok && isset($cpcfg['localauth_priv'])) {
$loginok = userHasPrivilege(getUserEntry($_POST['auth_user']), "user-services-captiveportal-login"); $loginok = userHasPrivilege(getUserEntry($_POST['auth_user']), "user-services-captiveportal-login");
}
if ($loginok){ if ($loginok) {
captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,"LOGIN"); captiveportal_logportalauth($_POST['auth_user'], $clientmac, $clientip, "LOGIN");
portal_allow($clientip, $clientmac,$_POST['auth_user']); portal_allow($clientip, $clientmac, $_POST['auth_user']);
portal_reply_page($redirurl, "redir", "Just redirect the user."); portal_reply_page($redirurl, "redir", "Just redirect the user.");
} else { } else {
captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,"FAILURE"); captiveportal_logportalauth($_POST['auth_user'], $clientmac, $clientip, "FAILURE");
portal_reply_page($redirurl, "error", $errormsg); portal_reply_page($redirurl, "error", $errormsg);
} }
} else } else {
portal_reply_page($redirurl, "error", $errormsg); portal_reply_page($redirurl, "error", $errormsg);
}
} else if ($_POST['accept'] && $clientip && $cpcfg['auth_method'] == "none") { } elseif ($_POST['accept'] && $clientip && $cpcfg['auth_method'] == "none") {
captiveportal_logportalauth("unauthenticated",$clientmac,$clientip,"ACCEPT"); captiveportal_logportalauth("unauthenticated", $clientmac, $clientip, "ACCEPT");
portal_allow($clientip, $clientmac, "unauthenticated"); portal_allow($clientip, $clientmac, "unauthenticated");
} else { } else {
/* display captive portal page */ /* display captive portal page */
portal_reply_page($redirurl, "login",null,$clientmac,$clientip); portal_reply_page($redirurl, "login", null, $clientmac, $clientip);
} }
ob_flush(); ob_flush();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment