X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gaas%2Flib%2FgaasdMessages.php;h=82a07e1d95e429a5df21f16fdf05b6fd10354358;hb=1d0624b43d97b21304c89b482ebad52b07700559;hp=3b23da41f5a47022ce52f0d23b367f6823c5eabb;hpb=ed1c86a90a6aa87dfc8b90c2242697a73039bfad;p=ga4php.git

diff --git a/gaas/lib/gaasdMessages.php b/gaas/lib/gaasdMessages.php
index 3b23da4..82a07e1 100644
--- a/gaas/lib/gaasdMessages.php
+++ b/gaas/lib/gaasdMessages.php
@@ -89,6 +89,7 @@ function gaasInitServer_server($msg)
 		confSetVal("ad.clientdef", $adclientdef);
 		confSetVal("ad.admindef", $adadmindef);
 		confSetVal("backend", "AD");
+		confSetVal("defaulttokentype", "TOTP");
 		
 		$initState = true;
 		$backEnd = "AD";
@@ -172,8 +173,31 @@ function gaasProvisionUser_server($msg)
 {
 	
 	// function userInGroup($user, $domain, $adlogin, $adpass, $group)
+	echo "in provision user\n";
+	print_r($msg);
+	$dttype = confGetVal("defaulttokentype");
+	if($dttype != "HOTP" && $dttype != "TOTP") {
+		echo "default token type not set, setting to TOTP\n";
+		confSetVal("defaulttokentype", "TOTP");
+		$dttype = "TOTP";
+	}
+	if($msg["tokentype"] == "") {
+		$ttype = confGetVal("defaulttokentype");
+	} else {
+		$ttype = $msg["tokentype"];
+	}
+	if($ttype != "HOTP" && $ttype != "TOTP") {
+		echo "using default token type, $dttype because user entered value of $ttype doesnt make sense\n";
+		$ttype = $dttype;
+	}
+	$tkey = $msg["tokenkey"];
 	if(confGetVal("backend") == "AD") {
-		userInGroup($msg["username"], confGetVal("ad.domain"), confGetVal("ad.user", $adlogin), confGetVal("ad.pass"), confGetVal("ad.clientdef"));
+		if(userInGroup($msg["username"], confGetVal("ad.domain"), confGetVal("ad.user"), confGetVal("ad.pass"), confGetVal("ad.clientdef"))) {
+			$myga = new gaasdGA();
+			$myga->setUser($msg["username"], $ttype, "", $tkey);
+		} else {
+			echo "User not in client group\n";
+		}
 	} else {
 		// internal db
 	}
@@ -182,4 +206,39 @@ function gaasProvisionUser_server($msg)
 	return true;
 }
 
+function gaasGetUsers_server($msg)
+{
+	$haveTokens = $msg["havetokens"];
+	$userPatter = $msg["userpattern"];
+	$group = $msg["group"];
+	
+	if(confGetval("backend") == "AD") {
+		$adgroup = "";
+		if($group == "admin") {
+			$adgroup = confGetVal("ad.admindef");
+		} else {
+			$adgroup = confGetVal("ad.clientdef");
+		}
+		$addom = confGetVal("ad.domain");
+		$aduser = confGetVal("ad.user");
+		$adpass = confGetVal("ad.pass");
+		//echo "using group $adgroup for $group\n";
+		
+		$users = getUsersInGroup($addom, $aduser, $adpass, $adgroup);
+		foreach($users as $user => $real) {
+			hasToken($user);
+		}
+	} else {
+		// internal db
+	}
+	return $users;
+}
+
+function gaasDeleteUser_server($msg)
+{
+	$username = $msg["username"];
+	$db = getDB();
+	$db->query($sql = "delete from users where users_username='$username'");
+	
+}
 ?>
\ No newline at end of file