X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=974efca34166c503ca7927852a6560389c963320;hp=0b9005d14eeb88386db04fc12bf1e2a26606f9c1;hb=24654ef0078320798912a273508e37f9ce921ba7;hpb=f8ff5876b5787375fe629450d0c5d088965720d0

diff --git a/src/server/server.c b/src/server/server.c
index 0b9005d..974efca 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -23,6 +23,7 @@
 // Statistics
 #define MAX_CONNECTION_QUEUE	5
 #define INPUT_BUFFER_SIZE	256
+#define CLIENT_TIMEOUT	10	// Seconds
 
 #define HASH_TYPE	SHA1
 #define HASH_LENGTH	20
@@ -59,15 +60,19 @@ void	Server_Cmd_ENUMITEMS(tClient *Client, char *Args);
 void	Server_Cmd_ITEMINFO(tClient *Client, char *Args);
 void	Server_Cmd_DISPENSE(tClient *Client, char *Args);
 void	Server_Cmd_GIVE(tClient *Client, char *Args);
+void	Server_Cmd_DONATE(tClient *Client, char *Args);
 void	Server_Cmd_ADD(tClient *Client, char *Args);
+void	Server_Cmd_SET(tClient *Client, char *Args);
 void	Server_Cmd_ENUMUSERS(tClient *Client, char *Args);
 void	Server_Cmd_USERINFO(tClient *Client, char *Args);
 void	_SendUserInfo(tClient *Client, int UserID);
 void	Server_Cmd_USERADD(tClient *Client, char *Args);
 void	Server_Cmd_USERFLAGS(tClient *Client, char *Args);
 // --- Helpers ---
- int	Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
+void	Debug(tClient *Client, const char *Format, ...);
  int	sendf(int Socket, const char *Format, ...);
+ int	Server_int_ParseArgs(int bUseLongArg, char *ArgStr, ...);
+ int	Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
 
 // === CONSTANTS ===
 // - Commands
@@ -83,7 +88,9 @@ const struct sClientCommand {
 	{"ITEM_INFO", Server_Cmd_ITEMINFO},
 	{"DISPENSE", Server_Cmd_DISPENSE},
 	{"GIVE", Server_Cmd_GIVE},
+	{"DONATE", Server_Cmd_DONATE},
 	{"ADD", Server_Cmd_ADD},
+	{"SET", Server_Cmd_SET},
 	{"ENUM_USERS", Server_Cmd_ENUMUSERS},
 	{"USER_INFO", Server_Cmd_USERINFO},
 	{"USER_ADD", Server_Cmd_USERADD},
@@ -92,7 +99,7 @@ const struct sClientCommand {
 #define NUM_COMMANDS	((int)(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0])))
 
 // === GLOBALS ===
- int	giServer_Port = 1020;
+ int	giServer_Port = 11020;
  int	giServer_NextClientID = 1;
  int	giServer_Socket;
 
@@ -136,17 +143,38 @@ void Server_Start(void)
 	
 	printf("Listening on 0.0.0.0:%i\n", giServer_Port);
 	
+	// write pidfile
+//	{
+//		FILE *fp = fopen("/var/run/dispsrv.pid", "w");
+//		fprintf(fp, "%i", getpid());
+//		fclose(fp);
+//	}
+
 	for(;;)
 	{
 		uint	len = sizeof(client_addr);
 		 int	bTrusted = 0;
 		
+		// Accept a connection
 		client_socket = accept(giServer_Socket, (struct sockaddr *) &client_addr, &len);
 		if(client_socket < 0) {
 			fprintf(stderr, "ERROR: Unable to accept client connection\n");
 			return ;
 		}
 		
+		// Set a timeout on the user conneciton
+		{
+			struct timeval tv;
+			tv.tv_sec = CLIENT_TIMEOUT;
+			tv.tv_usec = 0;
+			if( setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) )
+			{
+				perror("setsockopt");
+				return ;
+			}
+		}
+		
+		// Debug: Print the connection string
 		if(giDebugLevel >= 2) {
 			char	ipstr[INET_ADDRSTRLEN];
 			inet_ntop(AF_INET, &client_addr.sin_addr, ipstr, INET_ADDRSTRLEN);
@@ -154,6 +182,10 @@ void Server_Start(void)
 				ipstr, ntohs(client_addr.sin_port));
 		}
 		
+		// Doesn't matter what, localhost is trusted
+		if( ntohl( client_addr.sin_addr.s_addr ) == 0x7F000001 )
+			bTrusted = 1;
+		
 		// Trusted Connections
 		if( ntohs(client_addr.sin_port) < 1024 )
 		{
@@ -161,9 +193,12 @@ void Server_Start(void)
 			switch( ntohl( client_addr.sin_addr.s_addr ) )
 			{
 			case 0x7F000001:	// 127.0.0.1	localhost
-			//case 0x825E0D00:	// 130.95.13.0
-			case 0x825E0D12:	// 130.95.13.18	mussel
-			case 0x825E0D17:	// 130.95.13.23	martello
+		//	case 0x825F0D00:	// 130.95.13.0
+			case 0x825F0D07:	// 130.95.13.7	motsugo
+			case 0x825F0D11:	// 130.95.13.17	mermaid
+			case 0x825F0D12:	// 130.95.13.18	mussel
+			case 0x825F0D17:	// 130.95.13.23	martello
+			case 0x825F0D42:	// 130.95.13.66	heathred
 				bTrusted = 1;
 				break;
 			default:
@@ -203,6 +238,7 @@ void Server_HandleClient(int Socket, int bTrusted)
 	clientInfo.Socket = Socket;
 	clientInfo.ID = giServer_NextClientID ++;
 	clientInfo.bIsTrusted = bTrusted;
+	clientInfo.EffectiveUID = -1;
 	
 	// Read from client
 	/*
@@ -212,6 +248,7 @@ void Server_HandleClient(int Socket, int bTrusted)
 	 *   it is saved to the beginning of `inbuf` and `buf` is updated to
 	 *   the end of it.
 	 */
+	// TODO: Use select() instead (to give a timeout)
 	while( (bytes = recv(Socket, buf, remspace, 0)) > 0 )
 	{
 		char	*eol, *start;
@@ -265,47 +302,26 @@ void Server_HandleClient(int Socket, int bTrusted)
  */
 void Server_ParseClientCommand(tClient *Client, char *CommandString)
 {
-	char	*space, *args;
+	char	*command, *args;
 	 int	i;
-	#if 0
-	char	**argList;
-	 int	numArgs = 0;
-	#endif
 	
-	// Split at first space
-	space = strchr(CommandString, ' ');
-	if(space == NULL) {
-		args = NULL;
-	}
-	else {
-		*space = '\0';
-		args = space + 1;
-		while( *space == ' ' )	space ++;
-		
-		#if 0
-		// Count arguments
-		numArgs = 1;
-		for( i = 0; args[i]; )
-		{
-			while( CommandString[i] != ' ' ) {
-				if( CommandString[i] == '"' ) {
-					while( !(CommandString[i] != '\\' CommandString[i+1] == '"' ) )
-						i ++;
-					i ++;
-				}
-				i ++;
-			}
-			numArgs ++;
-			while( CommandString[i] == ' ' )	i ++;
-		}
-		#endif
+	if( giDebugLevel >= 2 )
+		Debug(Client, "Server_ParseClientCommand: (CommandString = '%s')", CommandString);
+	
+	if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) )
+	{
+//		printf("command=%s, args=%s\n", command, args);
+		// Is this an error? (just ignore for now)
+		//args = "";
 	}
 	
 	
 	// Find command
 	for( i = 0; i < NUM_COMMANDS; i++ )
 	{
-		if(strcmp(CommandString, gaServer_Commands[i].Name) == 0) {
+		if(strcmp(command, gaServer_Commands[i].Name) == 0) {
+			if( giDebugLevel >= 2 )
+				Debug(Client, "CMD %s - \"%s\"", command, args);
 			gaServer_Commands[i].Function(Client, args);
 			return ;
 		}
@@ -324,17 +340,22 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString)
  */
 void Server_Cmd_USER(tClient *Client, char *Args)
 {
-	char	*space = strchr(Args, ' ');
-	if(space)	*space = '\0';	// Remove characters after the ' '
+	char	*username;
+	
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 USER takes 1 argument\n");
+		return ;
+	}
 	
 	// Debug!
 	if( giDebugLevel )
-		printf("Client %i authenticating as '%s'\n", Client->ID, Args);
+		Debug(Client, "Authenticating as '%s'", username);
 	
 	// Save username
 	if(Client->Username)
 		free(Client->Username);
-	Client->Username = strdup(Args);
+	Client->Username = strdup(username);
 	
 	#if USE_SALT
 	// Create a salt (that changes if the username is changed)
@@ -362,19 +383,37 @@ void Server_Cmd_USER(tClient *Client, char *Args)
  */
 void Server_Cmd_PASS(tClient *Client, char *Args)
 {
-	char	*space = strchr(Args, ' ');
-	if(space)	*space = '\0';	// Remove characters after the ' '
+	char	*passhash;
+	 int	flags;
+
+	if( Server_int_ParseArgs(0, Args, &passhash, NULL) )
+	{
+		sendf(Client->Socket, "407 PASS takes 1 argument\n");
+		return ;
+	}
 	
 	// Pass on to cokebank
-	Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, Args);
+	Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, passhash);
+
+	if( Client->UID == -1 ) {
+		sendf(Client->Socket, "401 Auth Failure\n");
+		return ;
+	}
 
-	if( Client->UID != -1 ) {
-		Client->bIsAuthed = 1;
-		sendf(Client->Socket, "200 Auth OK\n");
+	flags = Bank_GetFlags(Client->UID);
+	if( flags & USER_FLAG_DISABLED ) {
+		Client->UID = -1;
+		sendf(Client->Socket, "403 Account Disabled\n");
+		return ;
+	}
+	if( flags & USER_FLAG_INTERNAL ) {
+		Client->UID = -1;
+		sendf(Client->Socket, "403 Internal account\n");
 		return ;
 	}
 	
-	sendf(Client->Socket, "401 Auth Failure\n");
+	Client->bIsAuthed = 1;
+	sendf(Client->Socket, "200 Auth OK\n");
 }
 
 /**
@@ -384,35 +423,53 @@ void Server_Cmd_PASS(tClient *Client, char *Args)
  */
 void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 {
-	char	*space = strchr(Args, ' ');
-	if(space)	*space = '\0';	// Remove characters after the ' '
+	char	*username;
+	 int	userflags;
+	
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 AUTOAUTH takes 1 argument\n");
+		return ;
+	}
 	
 	// Check if trusted
 	if( !Client->bIsTrusted ) {
 		if(giDebugLevel)
-			printf("Client %i: Untrusted client attempting to AUTOAUTH\n", Client->ID);
+			Debug(Client, "Untrusted client attempting to AUTOAUTH");
 		sendf(Client->Socket, "401 Untrusted\n");
 		return ;
 	}
 	
 	// Get UID
-	Client->UID = Bank_GetAcctByName( Args );	
+	Client->UID = Bank_GetAcctByName( username );	
 	if( Client->UID < 0 ) {
 		if(giDebugLevel)
-			printf("Client %i: Unknown user '%s'\n", Client->ID, Args);
-		sendf(Client->Socket, "401 Auth Failure\n");
+			Debug(Client, "Unknown user '%s'", username);
+		sendf(Client->Socket, "403 Auth Failure\n");
 		return ;
 	}
 	
+	userflags = Bank_GetFlags(Client->UID);
 	// You can't be an internal account
-	if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+	if( userflags & USER_FLAG_INTERNAL ) {
+		if(giDebugLevel)
+			Debug(Client, "Autoauth as '%s', not allowed", username);
 		Client->UID = -1;
-		sendf(Client->Socket, "401 Auth Failure\n");
+		sendf(Client->Socket, "403 Account is internal\n");
 		return ;
 	}
+
+	// Disabled accounts
+	if( userflags & USER_FLAG_DISABLED ) {
+		Client->UID = -1;
+		sendf(Client->Socket, "403 Account disabled\n");
+		return ;
+	}
+
+	Client->bIsAuthed = 1;
 	
 	if(giDebugLevel)
-		printf("Client %i: Authenticated as '%s' (%i)\n", Client->ID, Args, Client->UID);
+		Debug(Client, "Auto authenticated as '%s' (%i)", username, Client->UID);
 	
 	sendf(Client->Socket, "200 Auth OK\n");
 }
@@ -422,11 +479,14 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
  */
 void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 {
-	char	*space;
+	char	*username;
+	 int	eUserFlags, userFlags;
 	
-	space = strchr(Args, ' ');
-	
-	if(space)	*space = '\0';
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 SETEUSER takes 1 argument\n");
+		return ;
+	}
 	
 	if( !strlen(Args) ) {
 		sendf(Client->Socket, "407 SETEUSER expects an argument\n");
@@ -434,47 +494,86 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 	}
 
 	// Check user permissions
-	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE) ) {
+	userFlags = Bank_GetFlags(Client->UID);
+	if( !(userFlags & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) {
 		sendf(Client->Socket, "403 Not in coke\n");
 		return ;
 	}
 	
 	// Set id
-	Client->EffectiveUID = Bank_GetAcctByName(Args);
+	Client->EffectiveUID = Bank_GetAcctByName(username);
 	if( Client->EffectiveUID == -1 ) {
 		sendf(Client->Socket, "404 User not found\n");
 		return ;
 	}
 	
 	// You can't be an internal account
-	if( Bank_GetFlags(Client->EffectiveUID) & USER_FLAG_INTERNAL ) {
+	eUserFlags = Bank_GetFlags(Client->EffectiveUID);
+	if( eUserFlags & USER_FLAG_INTERNAL ) {
 		Client->EffectiveUID = -1;
 		sendf(Client->Socket, "404 User not found\n");
 		return ;
 	}
+	// Disabled only avaliable to admins
+	if( (eUserFlags & USER_FLAG_DISABLED) && !(userFlags & USER_FLAG_ADMIN) ) {
+		Client->EffectiveUID = -1;
+		sendf(Client->Socket, "403 Account disabled\n");
+		return ;
+	}
 	
 	sendf(Client->Socket, "200 User set\n");
 }
 
+/**
+ * \brief Send an item status to the client
+ * \param Client	Who to?
+ * \param Item	Item to send
+ */
+void Server_int_SendItem(tClient *Client, tItem *Item)
+{
+	char	*status = "avail";
+	
+	if( Item->Handler->CanDispense )
+	{
+		switch(Item->Handler->CanDispense(Client->UID, Item->ID))
+		{
+		case  0:	status = "avail";	break;
+		case  1:	status = "sold";	break;
+		default:
+		case -1:	status = "error";	break;
+		}
+	}
+	
+	sendf(Client->Socket,
+		"202 Item %s:%i %s %i %s\n",
+		Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
+		);
+}
+
 /**
  * \brief Enumerate the items that the server knows about
  */
 void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 {
-	 int	i;
+	 int	i, count;
 
 	if( Args != NULL && strlen(Args) ) {
 		sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n");
 		return ;
 	}
+	
+	// Count shown items
+	count = 0;
+	for( i = 0; i < giNumItems; i ++ ) {
+		if( gaItems[i].bHidden )	continue;
+		count ++;
+	}
 
-	sendf(Client->Socket, "201 Items %i\n", giNumItems);
+	sendf(Client->Socket, "201 Items %i\n", count);
 
 	for( i = 0; i < giNumItems; i ++ ) {
-		sendf(Client->Socket,
-			"202 Item %s:%i %i %s\n",
-			 gaItems[i].Handler->Name, gaItems[i].ID, gaItems[i].Price, gaItems[i].Name
-			 );
+		if( gaItems[i].bHidden )	continue;
+		Server_int_SendItem( Client, &gaItems[i] );
 	}
 
 	sendf(Client->Socket, "200 List end\n");
@@ -522,17 +621,21 @@ tItem *_GetItemFromString(char *String)
  */
 void Server_Cmd_ITEMINFO(tClient *Client, char *Args)
 {
-	tItem	*item = _GetItemFromString(Args);
+	tItem	*item;
+	char	*itemname;
+	
+	if( Server_int_ParseArgs(0, Args, &itemname, NULL) ) {
+		sendf(Client->Socket, "407 ITEMINFO takes 1 argument\n");
+		return ;
+	}
+	item = _GetItemFromString(Args);
 	
 	if( !item ) {
 		sendf(Client->Socket, "406 Bad Item ID\n");
 		return ;
 	}
 	
-	sendf(Client->Socket,
-		"202 Item %s:%i %i %s\n",
-		 item->Handler->Name, item->ID, item->Price, item->Name
-		 );
+	Server_int_SendItem( Client, item );
 }
 
 void Server_Cmd_DISPENSE(tClient *Client, char *Args)
@@ -540,13 +643,19 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args)
 	tItem	*item;
 	 int	ret;
 	 int	uid;
+	char	*itemname;
+	
+	if( Server_int_ParseArgs(0, Args, &itemname, NULL) ) {
+		sendf(Client->Socket, "407 DISPENSE takes only 1 argument\n");
+		return ;
+	}
 	 
 	if( !Client->bIsAuthed ) {
 		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
 
-	item = _GetItemFromString(Args);
+	item = _GetItemFromString(itemname);
 	if( !item ) {
 		sendf(Client->Socket, "406 Bad Item ID\n");
 		return ;
@@ -576,28 +685,16 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
 	 int	uid, iAmmount;
 	 int	thisUid;
 	
-	if( !Client->bIsAuthed ) {
-		sendf(Client->Socket, "401 Not Authenticated\n");
-		return ;
-	}
-
-	recipient = Args;
-
-	ammount = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &recipient, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 GIVE takes only 3 arguments\n");
 		return ;
 	}
-	*ammount = '\0';
-	ammount ++;
-
-	reason = strchr(ammount, ' ');
-	if( !reason ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+	// Check for authed
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 
 	// Get recipient
 	uid = Bank_GetAcctByName(recipient);
@@ -607,10 +704,10 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
 	}
 	
 	// You can't alter an internal account
-	if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
-		sendf(Client->Socket, "404 Invalid target user\n");
-		return ;
-	}
+//	if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
+//		sendf(Client->Socket, "404 Invalid target user\n");
+//		return ;
+//	}
 
 	// Parse ammount
 	iAmmount = atoi(ammount);
@@ -647,25 +744,14 @@ void Server_Cmd_DONATE(tClient *Client, char *Args)
 	 int	iAmmount;
 	 int	thisUid;
 	
-	if( !Client->bIsAuthed ) {
-		sendf(Client->Socket, "401 Not Authenticated\n");
-		return ;
-	}
-
-	ammount = Args;
-
-	// Get the start of the reason
-	reason = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, 1 encountered\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 DONATE takes 2 arguments\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 	
-	// Check the end of the reason
-	if( strchr(reason, ' ') ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, more encountered\n");
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
 
@@ -704,32 +790,77 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
 	char	*user, *ammount, *reason;
 	 int	uid, iAmmount;
 	
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &user, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 ADD takes 3 arguments\n");
+		return ;
+	}
+	
 	if( !Client->bIsAuthed ) {
 		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
 
-	user = Args;
+	// Check user permissions
+	if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN))  ) {
+		sendf(Client->Socket, "403 Not in coke\n");
+		return ;
+	}
+
+	// Get recipient
+	uid = Bank_GetAcctByName(user);
+	if( uid == -1 ) {
+		sendf(Client->Socket, "404 Invalid user\n");
+		return ;
+	}
+	
+	// You can't alter an internal account
+	if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
+		sendf(Client->Socket, "404 Invalid user\n");
+		return ;
+	}
+
+	// Parse ammount
+	iAmmount = atoi(ammount);
+	if( iAmmount == 0 && ammount[0] != '0' ) {
+		sendf(Client->Socket, "407 Invalid Argument\n");
+		return ;
+	}
 
-	ammount = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+	// Do give
+	switch( DispenseAdd(Client->UID, uid, iAmmount, reason) )
+	{
+	case 0:
+		sendf(Client->Socket, "200 Add OK\n");
+		return ;
+	case 2:
+		sendf(Client->Socket, "402 Poor Guy\n");
+		return ;
+	default:
+		sendf(Client->Socket, "500 Unknown error\n");
 		return ;
 	}
-	*ammount = '\0';
-	ammount ++;
+}
 
-	reason = strchr(ammount, ' ');
-	if( !reason ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+void Server_Cmd_SET(tClient *Client, char *Args)
+{
+	char	*user, *ammount, *reason;
+	 int	uid, iAmmount;
+	
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &user, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 SET takes 3 arguments\n");
+		return ;
+	}
+	
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 
 	// Check user permissions
-	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE)  ) {
-		sendf(Client->Socket, "403 Not in coke\n");
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN)  ) {
+		sendf(Client->Socket, "403 Not an admin\n");
 		return ;
 	}
 
@@ -754,7 +885,7 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
 	}
 
 	// Do give
-	switch( DispenseAdd(Client->UID, uid, iAmmount, reason) )
+	switch( DispenseSet(Client->UID, uid, iAmmount, reason) )
 	{
 	case 0:
 		sendf(Client->Socket, "200 Add OK\n");
@@ -771,36 +902,134 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
 void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 {
 	 int	i, numRet = 0;
-	 int	maxBal = INT_MAX, minBal = INT_MIN;
 	tAcctIterator	*it;
+	 int	maxBal = INT_MAX, minBal = INT_MIN;
+	 int	flagMask = 0, flagVal = 0;
 	 int	sort = BANK_ITFLAG_SORT_NAME;
+	time_t	lastSeenAfter=0, lastSeenBefore=0;
+	
+	 int	flags;	// Iterator flags
+	 int	balValue;	// Balance value for iterator
+	time_t	timeValue;	// Time value for iterator
 	
 	// Parse arguments
 	if( Args && strlen(Args) )
 	{
-		char	*min = Args, *max;
-		
-		max = strchr(Args, ' ');
-		if( max ) {
-			*max = '\0';
-			max ++;
-		}
-		
-		// If <minBal> != "-"
-		if( strcmp(min, "-") != 0 )
-			minBal = atoi(min);
-		// If <maxBal> != "-"
-		if( max && strcmp(max, "-") != 0 )
-			maxBal = atoi(max);
+		char	*space = Args, *type, *val;
+		do
+		{
+			type = space;
+			while(*type == ' ')	type ++;
+			// Get next space
+			space = strchr(space, ' ');
+			if(space)	*space = '\0';
+			
+			// Get type
+			val = strchr(type, ':');
+			if( val ) {
+				*val = '\0';
+				val ++;
+				
+				// Types
+				// - Minium Balance
+				if( strcmp(type, "min_balance") == 0 ) {
+					minBal = atoi(val);
+				}
+				// - Maximum Balance
+				else if( strcmp(type, "max_balance") == 0 ) {
+					maxBal = atoi(val);
+				}
+				// - Flags
+				else if( strcmp(type, "flags") == 0 ) {
+					if( Server_int_ParseFlags(Client, val, &flagMask, &flagVal) )
+						return ;
+				}
+				// - Last seen before timestamp
+				else if( strcmp(type, "last_seen_before") == 0 ) {
+					lastSeenAfter = atoll(val);
+				}
+				// - Last seen after timestamp
+				else if( strcmp(type, "last_seen_after") == 0 ) {
+					lastSeenAfter = atoll(val);
+				}
+				// - Sorting 
+				else if( strcmp(type, "sort") == 0 ) {
+					char	*dash = strchr(val, '-');
+					if( dash ) {
+						*dash = '\0';
+						dash ++;
+					}
+					if( strcmp(val, "name") == 0 ) {
+						sort = BANK_ITFLAG_SORT_NAME;
+					}
+					else if( strcmp(val, "balance") == 0 ) {
+						sort = BANK_ITFLAG_SORT_BAL;
+					}
+					else if( strcmp(val, "lastseen") == 0 ) {
+						sort = BANK_ITFLAG_SORT_LASTSEEN;
+					}
+					else {
+						sendf(Client->Socket, "407 Unknown sort field ('%s')\n", val);
+						return ;
+					}
+					// Handle sort direction
+					if( dash ) {
+						if( strcmp(dash, "desc") == 0 ) {
+							sort |= BANK_ITFLAG_REVSORT;
+						}
+						else {
+							sendf(Client->Socket, "407 Unknown sort direction '%s'\n", dash);
+							return ;
+						}
+						dash[-1] = '-';
+					}
+				}
+				else {
+					sendf(Client->Socket, "407 Unknown argument to ENUM_USERS '%s:%s'\n", type, val);
+					return ;
+				}
+				
+				val[-1] = ':';
+			}
+			else {
+				sendf(Client->Socket, "407 Unknown argument to ENUM_USERS '%s'\n", type);
+				return ;
+			}
+			
+			// Eat whitespace
+			if( space ) {
+				*space = ' ';	// Repair (to be nice)
+				space ++;
+				while(*space == ' ')	space ++;
+			}
+		}	while(space);
 	}
 	
 	// Create iterator
-	if( maxBal != INT_MAX )
-		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MAXBALANCE, maxBal, 0);
-	else if( minBal != INT_MIN )
-		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MINBALANCE, minBal, 0);
-	else
-		it = Bank_Iterator(0, 0, sort, 0, 0);
+	if( maxBal != INT_MAX ) {
+		flags = sort|BANK_ITFLAG_MAXBALANCE;
+		balValue = maxBal;
+	}
+	else if( minBal != INT_MIN ) {
+		flags = sort|BANK_ITFLAG_MINBALANCE;
+		balValue = minBal;
+	}
+	else {
+		flags = sort;
+		balValue = 0;
+	}
+	if( lastSeenBefore ) {
+		timeValue = lastSeenBefore;
+		flags |= BANK_ITFLAG_SEENBEFORE;
+	}
+	else if( lastSeenAfter ) {
+		timeValue = lastSeenAfter;
+		flags |= BANK_ITFLAG_SEENAFTER;
+	}
+	else {
+		timeValue = 0;
+	}
+	it = Bank_Iterator(flagMask, flagVal, flags, balValue, timeValue);
 	
 	// Get return number
 	while( (i = Bank_IteratorNext(it)) != -1 )
@@ -822,12 +1051,7 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 	
 	
 	// Create iterator
-	if( maxBal != INT_MAX )
-		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MAXBALANCE, maxBal, 0);
-	else if( minBal != INT_MIN )
-		it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MINBALANCE, minBal, 0);
-	else
-		it = Bank_Iterator(0, 0, sort, 0, 0);
+	it = Bank_Iterator(flagMask, flagVal, flags, balValue, timeValue);
 	
 	while( (i = Bank_IteratorNext(it)) != -1 )
 	{
@@ -849,16 +1073,22 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 void Server_Cmd_USERINFO(tClient *Client, char *Args)
 {
 	 int	uid;
-	char	*user = Args;
-	char	*space;
+	char	*user;
+	
+	// Parse arguments
+	if( Server_int_ParseArgs(0, Args, &user, NULL) ) {
+		sendf(Client->Socket, "407 USER_INFO takes 1 argument\n");
+		return ;
+	}
 	
-	space = strchr(user, ' ');
-	if(space)	*space = '\0';
+	if( giDebugLevel )	Debug(Client, "User Info '%s'", user);
 	
 	// Get recipient
 	uid = Bank_GetAcctByName(user);
+	
+	if( giDebugLevel >= 2 )	Debug(Client, "uid = %i", uid);
 	if( uid == -1 ) {
-		sendf(Client->Socket, "404 Invalid user");
+		sendf(Client->Socket, "404 Invalid user\n");
 		return ;
 	}
 	
@@ -893,15 +1123,21 @@ void _SendUserInfo(tClient *Client, int UserID)
 	
 	// TODO: User flags/type
 	sendf(
-		Client->Socket, "202 User %s %i %s%s\n",
+		Client->Socket, "202 User %s %i %s%s%s\n",
 		Bank_GetAcctName(UserID), Bank_GetBalance(UserID),
-		type, disabled
+		type, disabled, door
 		);
 }
 
 void Server_Cmd_USERADD(tClient *Client, char *Args)
 {
-	char	*username, *space;
+	char	*username;
+	
+	// Parse arguments
+	if( Server_int_ParseArgs(0, Args, &username, NULL) ) {
+		sendf(Client->Socket, "407 USER_ADD takes 1 argument\n");
+		return ;
+	}
 	
 	// Check permissions
 	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
@@ -909,49 +1145,38 @@ void Server_Cmd_USERADD(tClient *Client, char *Args)
 		return ;
 	}
 	
-	// Read arguments
-	username = Args;
-	while( *username == ' ' )	username ++;
-	space = strchr(username, ' ');
-	if(space)	*space = '\0';
-	
 	// Try to create user
 	if( Bank_CreateAcct(username) == -1 ) {
 		sendf(Client->Socket, "404 User exists\n");
 		return ;
 	}
 	
+	{
+		char	*thisName = Bank_GetAcctName(Client->UID);
+		Log_Info("Account '%s' created by '%s'", username, thisName);
+		free(thisName);
+	}
+	
 	sendf(Client->Socket, "200 User Added\n");
 }
 
 void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 {
 	char	*username, *flags;
-	char	*space;
 	 int	mask=0, value=0;
 	 int	uid;
 	
-	// Check permissions
-	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
-		sendf(Client->Socket, "403 Not a coke admin\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(0, Args, &username, &flags, NULL) ) {
+		sendf(Client->Socket, "407 USER_FLAGS takes 2 arguments\n");
 		return ;
 	}
 	
-	// Read arguments
-	// - Username
-	username = Args;
-	while( *username == ' ' )	username ++;
-	space = strchr(username, ' ');
-	if(!space) {
-		sendf(Client->Socket, "407 USER_FLAGS requires 2 arguments, 1 given\n");
+	// Check permissions
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
+		sendf(Client->Socket, "403 Not a coke admin\n");
 		return ;
 	}
-	*space = '\0';
-	// - Flags
-	flags = space + 1;
-	while( *flags == ' ' )	flags ++;
-	space = strchr(flags, ' ');
-	if(space)	*space = '\0';
 	
 	// Get UID
 	uid = Bank_GetAcctByName(username);
@@ -964,6 +1189,10 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 	if( Server_int_ParseFlags(Client, flags, &mask, &value) )
 		return ;
 	
+	if( giDebugLevel )
+		Debug(Client, "Set %i(%s) flags to %x (masked %x)\n",
+			uid, username, mask, value);
+	
 	// Apply flags
 	Bank_SetFlags(uid, mask, value);
 	
@@ -972,6 +1201,17 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 }
 
 // --- INTERNAL HELPERS ---
+void Debug(tClient *Client, const char *Format, ...)
+{
+	va_list	args;
+	//printf("%010i [%i] ", (int)time(NULL), Client->ID);
+	printf("[%i] ", Client->ID);
+	va_start(args, Format);
+	vprintf(Format, args);
+	va_end(args);
+	printf("\n");
+}
+
 int sendf(int Socket, const char *Format, ...)
 {
 	va_list	args;
@@ -995,6 +1235,81 @@ int sendf(int Socket, const char *Format, ...)
 	}
 }
 
+// Takes a series of char *'s in
+/**
+ * \brief Parse space-separated entries into 
+ */
+int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
+{
+	va_list args;
+	char	savedChar;
+	char	**dest;
+	va_start(args, ArgStr);
+
+	// Check for null
+	if( !ArgStr )
+	{
+		while( (dest = va_arg(args, char **)) )
+			*dest = NULL;
+		va_end(args);
+		return 1;
+	}
+
+	savedChar = *ArgStr;
+	
+	while( (dest = va_arg(args, char **)) )
+	{
+		// Trim leading spaces
+		while( *ArgStr == ' ' || *ArgStr == '\t' )
+			ArgStr ++;
+		
+		// ... oops, not enough arguments
+		if( *ArgStr == '\0' )
+		{
+			// NULL unset arguments
+			do {
+				*dest = NULL;
+			}	while( (dest = va_arg(args, char **)) );
+		va_end(args);
+			return -1;
+		}
+		
+		if( *ArgStr == '"' )
+		{
+			ArgStr ++;
+			*dest = ArgStr;
+			// Read until quote
+			while( *ArgStr && *ArgStr != '"' )
+				ArgStr ++;
+		}
+		else
+		{
+			// Set destination
+			*dest = ArgStr;
+			// Read until a space
+			while( *ArgStr && *ArgStr != ' ' && *ArgStr != '\t' )
+				ArgStr ++;
+		}
+		savedChar = *ArgStr;	// savedChar is used to un-mangle the last string
+		*ArgStr = '\0';
+		ArgStr ++;
+	}
+	va_end(args);
+	
+	// Oops, extra arguments, and greedy not set
+	if( (savedChar == ' ' || savedChar == '\t') && !bUseLongLast ) {
+		return -1;
+	}
+	
+	// Un-mangle last
+	if(bUseLongLast) {
+		ArgStr --;
+		*ArgStr = savedChar;
+	}
+	
+	return 0;	// Success!
+}
+
 int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value)
 {
 	struct {