X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gaas%2Flib%2FglobalLib.php;h=79857cf5615cb92ee718d8a8f5ecdcc9fadd505a;hb=HEAD;hp=f3fe9fb3ba8938b8c3f1958ccbd57f69ff4fcb2b;hpb=6ae20292cc7aa6a712b492de306613192733e756;p=ga4php.git

diff --git a/gaas/lib/globalLib.php b/gaas/lib/globalLib.php
index f3fe9fb..79857cf 100644
--- a/gaas/lib/globalLib.php
+++ b/gaas/lib/globalLib.php
@@ -5,10 +5,34 @@ $BASE_DIR = realpath(dirname(__FILE__)."/../../");
 global $BASE_DIR;
 
 // the tcp port number we use for comms
-$TCP_PORT_NUMBER = 21336;
+$TCP_PORT_NUMBER = 21256;
 global $TCP_PORT_NUMBER;
 
 
+/* tasks we need to do (- prefix means done or working)
+ * - status
+ * - init
+ * - set ad login
+ * - set ad client group
+ * - set ad admin group
+ * - provision user
+ * - get users
+ * - delete user
+ * - create hardware token
+ * - list hardware tokens
+ * - assign hardware token
+ * disable user
+ * set user password
+ * enable admin for user
+ * disable admin for user
+ * resync token
+ * get qrcode
+ * re-create user token
+ * set user pin
+ * authenticate user by token
+ * authenticate user by password
+ * 
+ */
 
 
 // the messages structure, used to extend gaas if needed
@@ -19,16 +43,24 @@ define("MSG_SET_CLIENT_GROUP", 21);
 define("MSG_SET_ADMIN_GROUP", 22);
 define("MSG_PROVISION_USER",23);
 define("MSG_GET_USERS", 24);
+define("MSG_DELETE_USER", 25);
+define("MSG_ASSIGN_TOKEN",26);
+define("MSG_ADD_HARDWARE",27);
+define("MSG_GET_HARDWARE",28);
 
 // the gaasd call's $MESSAGE[<MSG>]_server() for the server side
 // and $MESSAGE[<msg>]_client() for the client side 
-$MESSAGES[MSG_STATUS] = "gaasStatus";
-$MESSAGES[MSG_INIT_SERVER] = "gaasInitServer"; 
+$MESSAGES[MSG_STATUS] = "gaasStatus"; //
+$MESSAGES[MSG_INIT_SERVER] = "gaasInitServer"; // AD: "AD", "user", "pass", "domain", "client def", "admin def" - IN: "IN", "user", "pass"
 $MESSAGES[MSG_SET_AD_LOGIN] = "gaasSetADLogin"; // domain, user, password
 $MESSAGES[MSG_SET_CLIENT_GROUP] = "gaasSetClientGroup"; // groupname
-$MESSAGES[MSG_SET_ADMIN_GROUP] = "gaasSetAdminGroup";
-$MESSAGES[MSG_PROVISION_USER] = "gaasProvisionUser"; // username
+$MESSAGES[MSG_SET_ADMIN_GROUP] = "gaasSetAdminGroup"; // groupname
+$MESSAGES[MSG_PROVISION_USER] = "gaasProvisionUser"; // username, tokentype, tokenkey, hardware|software
 $MESSAGES[MSG_GET_USERS] = "gaasGetUsers"; // [admin|client], [name pattern], [only with tokens]
+$MESSAGES[MSG_DELETE_USER] = "gaasDeleteUser"; // username
+$MESSAGES[MSG_ASSIGN_TOKEN] = "gaasAssignToken"; // username, tokenid
+$MESSAGES[MSG_ADD_HARDWARE] = "gaasAddHardwareToken"; // username, tokenid
+$MESSAGES[MSG_GET_HARDWARE] = "gaasGetHardwareTokens"; //
 
 global $MESSAGES;
 
@@ -140,13 +172,15 @@ function userInGroup($user, $domain, $adlogin, $adpass, $group)
 	
 	//exit(0);
 	
+	//echo "usercn: $usercn\n";
 	$basecn = preg_replace("/,$/", "", $tcn);
 	$sr = ldap_search($cnt, "$basecn", "(&(objectCategory=group)(member:1.2.840.113556.1.4.1941:=$usercn))");
 	$fil = "(&(objectCategory=group)(member:1.2.840.113556.1.4.1941:=$usercn))";
 	$info = ldap_get_entries($cnt, $sr);
 	foreach($info as $kpot => $lpot) {
 		if(isset($lpot["samaccountname"])) {
-			if($lpot["cn"][0] == $group) return true;
+			//echo "checking: ".$lpot["cn"][0]."\n";
+			if(strtolower($lpot["cn"][0]) == strtolower($group)) return true;
 		}
 	}
 	return false;
@@ -198,8 +232,8 @@ function getUsersInGroup($domain, $adlogin, $adpass, $group)
 	$i = 0;
 	foreach($info as $kpot => $lpot) {
 		if(isset($lpot["samaccountname"])) {
-			$arbi[$i]["username"] = $lpot["samaccountname"][0];
-			$arbi[$i]["realname"] = $lpot["name"][0];
+			$arbi[$i]["realname"] =  $lpot["name"][0];
+			$arbi[$i]["username"] = strtolower($lpot["samaccountname"][0]);
 			$i++;
 		}
 	}