X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=gaas%2Fgaasd%2Fgaasclient.php;h=cb57c3809290688be6eb55f5750efdbdfad5e6d3;hp=b03a216b58b5e0e9ff47cc6c15ee1a2b75b1353c;hb=HEAD;hpb=6ae20292cc7aa6a712b492de306613192733e756

diff --git a/gaas/gaasd/gaasclient.php b/gaas/gaasd/gaasclient.php
index b03a216..cb57c38 100644
--- a/gaas/gaasd/gaasclient.php
+++ b/gaas/gaasd/gaasclient.php
@@ -16,8 +16,12 @@ function usage()
 	echo "\tsetadlogin username password domain\n";
 	echo "\tsetclientgroup groupname - change the group membership requirements for client's with AD\n";
 	echo "\tsetadmingroup groupname - change the group membership requirements for admin's with AD\n";
-	echo "\tprovisionuser username [HOTP|TOTP] [KEY]- provision the user \"username\"\n";
+	echo "\tprovisiontoken username [HOTP|TOTP] [KEY] - provision the user \"username\"\n";
+	echo "\tassign username tokenid - assign a hardware token to a user\n";
+	echo "\taddtoken token_name token_key token_type - adds a hardware token to the DB\n";
+	echo "\tgethwtokens - gets a list of hardware tokens by token_name\n";
 	echo "\tgetusers [admin|client] [part-of-username] [yes] - get user list with admin or client group, part of a username and return only those with tokens (yes)\n";
+	echo "\tdeleteuser username - deletes the key for the specified user\n";
 	echo "\n";
 	exit(0);
 }
@@ -66,6 +70,31 @@ switch($argv[1]) {
 			echo "Resetting AD admin group details failed\n";
 		}
 		break;
+	case "assign":
+		$username = $argv[2];
+		$tokenid = $argv[3];
+		$ret = $myga->MSG_ASSIGN_TOKEN($username, $tokenid);
+		break;
+	case "gethwtokens":
+		$ret = $myga->MSG_GET_HARDWARE();
+		foreach($ret as $tok) {
+			echo "Token, ".$tok["name"]." is of type ".$tok["type"]."\n";
+		}
+		break;
+	case "addtoken":
+		$tokenid = $argv[2];
+		$tokenkey = $argv[3];
+		$tokentype = $argv[4];
+		$ret = $myga->MSG_ADD_HARDWARE($tokenid, $tokenkey, $tokentype);
+		break;
+	case "provisiontoken":
+		$username = $argv[2];
+		$ttype = "";
+		$tkey = "";
+		if(isset($argv[3])) $ttype = $argv[3];
+		if(isset($argv[4])) $tkey = $argv[4];
+		$ret = $myga->MSG_PROVISION_USER($username, $ttype, $tkey);
+		break;
 	case "getusers":
 		$group = "client";
 		$partof = "";
@@ -74,9 +103,22 @@ switch($argv[1]) {
 		if(isset($argv[3])) $partof = $argv[3];
 		if(isset($argv[4])) $onlytokens = $argv[4];
 		$ret = $myga->MSG_GET_USERS($group, $partof, $onlytokens);
-		//print_r($ret);
-		foreach($ret as $user) {
-			echo $user["realname"]." (".$user["username"].")\n";
+		foreach($ret as $key => $val) {
+			$real = $val["realname"];
+			$user = $val["username"];
+			$hastok = "";
+			if($val["hastoken"]) {
+				$hastok = " * ";
+			}
+			echo "$hastok$real ($user)\n";
+		}
+		break;
+	case "deleteuser":
+		$ret = $myga->MSG_DELETE_USER($argv[2]);
+		if($ret) {
+			echo "Delete user token succeeded\n";
+		} else {
+			echo "Delete user token failed\n";
 		}
 		break;
 	default: