Browse Source

Auth work

causefx 8 years ago
parent
commit
a7d1ce8ecb
1 changed files with 13 additions and 6 deletions
  1. 13 6
      api/functions/organizr-functions.php

+ 13 - 6
api/functions/organizr-functions.php

@@ -552,24 +552,31 @@ function auth(){
     $ban = isset($_GET['ban']) ? strtoupper($_GET['ban']) : "";
     $whitelist = isset($_GET['whitelist']) ? $_GET['whitelist'] : false;
     $blacklist = isset($_GET['blacklist']) ? $_GET['blacklist'] : false;
-    $group = isset($_GET['group']) ? $_GET['group'] : 0;
+    $group = isset($_GET['group']) ? (int)$_GET['group'] : (int)0;
     $currentIP = userIP();
-    $currentUser = $GLOBALS['organizrUser']['username'];
+	if(isset($GLOBALS['organizrUser'])){
+		$currentUser = $GLOBALS['organizrUser']['username'];
+        $currentGroup = $GLOBALS['organizrUser']['groupID'];
+    }else{
+		$currentUser = 'Guest';
+		$currentGroup = getUserLevel();
+	}
+	$userInfo = "User: $currentUser | Group: $currentGroup | IP: $currentIP | Requesting Access to Group $group | Result: ";
     if ($whitelist) {
         if(in_array($currentIP, arrayIP($whitelist))) {
-           !$debug ? exit(http_response_code(200)) : die("$currentIP Whitelist Authorized");
+           !$debug ? exit(http_response_code(200)) : die("$userInfo Whitelist Authorized");
     	}
     }
     if ($blacklist) {
         if(in_array($currentIP, arrayIP($blacklist))) {
-           !$debug ? exit(http_response_code(401)) : die("$currentIP Blacklisted");
+           !$debug ? exit(http_response_code(401)) : die("$userInfo Blacklisted");
     	}
     }
     if($group !== null){
         if(qualifyRequest($group)){
-            !$debug ? exit(http_response_code(200)) : die("$currentUser on $currentIP Authorized");
+            !$debug ? exit(http_response_code(200)) : die("$userInfo Authorized");
         }else{
-            !$debug ? exit(http_response_code(401)) : die("$currentUser on $currentIP Not Authorized");
+            !$debug ? exit(http_response_code(401)) : die("$userInfo Not Authorized");
         }
     }else{
         !$debug ? exit(http_response_code(401)) : die("Not Authorized Due To No Parameters Set");