#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
+#include <fcntl.h> // O_*
#include <string.h>
#include <limits.h>
#include <stdarg.h>
+#include <signal.h>
#define DEBUG_TRACE_CLIENT 0
+#define HACK_NO_REFUNDS 1
// Statistics
#define MAX_CONNECTION_QUEUE 5
#define INPUT_BUFFER_SIZE 256
+#define CLIENT_TIMEOUT 10 // Seconds
#define HASH_TYPE SHA1
#define HASH_LENGTH 20
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_REFUND(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 _SendUserInfo(tClient *Client, int UserID);
void Server_Cmd_USERADD(tClient *Client, char *Args);
void Server_Cmd_USERFLAGS(tClient *Client, char *Args);
+void Server_Cmd_UPDATEITEM(tClient *Client, char *Args);
// --- Helpers ---
void Debug(tClient *Client, const char *Format, ...);
- int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
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
{"ENUM_ITEMS", Server_Cmd_ENUMITEMS},
{"ITEM_INFO", Server_Cmd_ITEMINFO},
{"DISPENSE", Server_Cmd_DISPENSE},
+ {"REFUND", Server_Cmd_REFUND},
{"GIVE", Server_Cmd_GIVE},
{"DONATE", Server_Cmd_DONATE},
{"ADD", Server_Cmd_ADD},
{"ENUM_USERS", Server_Cmd_ENUMUSERS},
{"USER_INFO", Server_Cmd_USERINFO},
{"USER_ADD", Server_Cmd_USERADD},
- {"USER_FLAGS", Server_Cmd_USERFLAGS}
+ {"USER_FLAGS", Server_Cmd_USERFLAGS},
+ {"UPDATE_ITEM", Server_Cmd_UPDATEITEM}
};
#define NUM_COMMANDS ((int)(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0])))
// === GLOBALS ===
- int giServer_Port = 1020;
- int giServer_NextClientID = 1;
- int giServer_Socket;
+// - Configuration
+ int giServer_Port = 11020;
+ int gbServer_RunInBackground = 0;
+char *gsServer_LogFile = "/var/log/dispsrv.log";
+char *gsServer_ErrorLog = "/var/log/dispsrv.err";
+// - State variables
+ int giServer_Socket; // Server socket
+ int giServer_NextClientID = 1; // Debug client ID
+
// === CODE ===
/**
struct sockaddr_in server_addr, client_addr;
atexit(Server_Cleanup);
+ // Ignore SIGPIPE (stops crashes when the client exits early)
+ signal(SIGPIPE, SIG_IGN);
// Create Server
giServer_Socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
perror("Binding");
return ;
}
+
+ // Fork into background
+ if( gbServer_RunInBackground )
+ {
+ int newin, newout, newerr;
+ int pid = fork();
+ if( pid == -1 ) {
+ fprintf(stderr, "ERROR: Unable to fork\n");
+ perror("fork background");
+ exit(-1);
+ }
+ if( pid != 0 ) {
+ // Parent, quit
+ exit(0);
+ }
+ // In child
+ // - Sort out stdin/stdout
+ newin = open("/dev/null", O_RDONLY);
+ newout = open(gsServer_LogFile, O_CREAT|O_APPEND, 0644);
+ newerr = open(gsServer_ErrorLog, O_CREAT|O_APPEND, 0644);
+ dup2(newin, 0);
+ dup2(newout, 1);
+ dup2(newerr, 2);
+ }
+
+ // Start the helper thread
+ StartPeriodicThread();
// Listen
if( listen(giServer_Socket, MAX_CONNECTION_QUEUE) < 0 ) {
printf("Listening on 0.0.0.0:%i\n", giServer_Port);
+ // write pidfile
+ {
+ FILE *fp = fopen("/var/run/dispsrv.pid", "w");
+ if( fp ) {
+ fprintf(fp, "%i", getpid());
+ fclose(fp);
+ }
+ }
+
for(;;)
{
uint len = sizeof(client_addr);
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];
switch( ntohl( client_addr.sin_addr.s_addr ) )
{
case 0x7F000001: // 127.0.0.1 localhost
- //case 0x825E0D00: // 130.95.13.0
- case 0x825E0D07: // 130.95.13.7 motsugo
- case 0x825E0D12: // 130.95.13.18 mussel
- case 0x825E0D17: // 130.95.13.23 martello
+ // case 0x825F0D00: // 130.95.13.0
+ case 0x825F0D04: // 130.95.13.4 merlo
+ case 0x825F0D05: // 130.95.13.5 heathred (MR)
+ 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 0x825F0D2A: // 130.95.13.42 meersau
+ case 0x825F0D42: // 130.95.13.66 heathred (Clubroom)
bTrusted = 1;
break;
default:
void Server_Cleanup(void)
{
- printf("Close(%i)\n", giServer_Socket);
+ printf("\nClose(%i)\n", giServer_Socket);
close(giServer_Socket);
+ unlink("/var/run/dispsrv.pid");
}
/**
* 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;
*/
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) )
+ {
+ if( command == NULL ) return ;
+ // Is this an error? (just ignore for now)
}
// 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 ;
}
*/
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 )
- Debug(Client, "Authenticating as '%s'", 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)
*/
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 ) {
- Client->bIsAuthed = 1;
- sendf(Client->Socket, "200 Auth OK\n");
+ if( Client->UID == -1 ) {
+ sendf(Client->Socket, "401 Auth Failure\n");
+ return ;
+ }
+
+ 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");
}
/**
*/
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 ) {
}
// Get UID
- Client->UID = Bank_GetAcctByName( Args );
+ Client->UID = Bank_GetAcctByName( username, 0 );
if( Client->UID < 0 ) {
if(giDebugLevel)
- Debug(Client, "Unknown user '%s'", 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)
- Debug(Client, "Auto authenticated as '%s' (%i)", Args, Client->UID);
+ Debug(Client, "Auto authenticated as '%s' (%i)", username, Client->UID);
sendf(Client->Socket, "200 Auth OK\n");
}
*/
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");
return ;
}
+
+ // Check authentication
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
+ return ;
+ }
// Check user permissions
- if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) {
+ 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, 0);
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 ) {
- Client->EffectiveUID = -1;
- sendf(Client->Socket, "404 User not found\n");
- return ;
+ if( !(userFlags & USER_FLAG_ADMIN) )
+ {
+ 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 ) {
+ 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;
+ }
+ }
+
+ // KNOWN HACK: Naming a slot 'dead' disables it
+ if( strcmp(Item->Name, "dead") == 0 )
+ status = "sold"; // Another status?
+
+ 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");
*/
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)
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 ;
case 1: sendf(Client->Socket, "501 Unable to dispense\n"); return ;
case 2: sendf(Client->Socket, "402 Poor You\n"); return ;
default:
- sendf(Client->Socket, "500 Dispense Error\n");
+ sendf(Client->Socket, "500 Dispense Error (%i)\n", ret);
return ;
}
}
-void Server_Cmd_GIVE(tClient *Client, char *Args)
+void Server_Cmd_REFUND(tClient *Client, char *Args)
{
- char *recipient, *ammount, *reason;
- int uid, iAmmount;
- int thisUid;
-
+ tItem *item;
+ int uid, price_override = 0;
+ char *username, *itemname, *price_str;
+
+ if( Server_int_ParseArgs(0, Args, &username, &itemname, &price_str, NULL) ) {
+ if( !itemname || price_str ) {
+ sendf(Client->Socket, "407 REFUND takes 2 or 3 arguments\n");
+ return ;
+ }
+ }
+
if( !Client->bIsAuthed ) {
sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- recipient = Args;
+ // Check user permissions
+ if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) {
+ sendf(Client->Socket, "403 Not in coke\n");
+ return ;
+ }
- ammount = strchr(Args, ' ');
- if( !ammount ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+ uid = Bank_GetAcctByName(username, 0);
+ if( uid == -1 ) {
+ sendf(Client->Socket, "404 Unknown user\n");
+ return ;
+ }
+
+ item = _GetItemFromString(itemname);
+ if( !item ) {
+ sendf(Client->Socket, "406 Bad Item ID\n");
return ;
}
- *ammount = '\0';
- ammount ++;
- reason = strchr(ammount, ' ');
- if( !reason ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+ if( price_str )
+ price_override = atoi(price_str);
+
+ switch( DispenseRefund( Client->UID, uid, item, price_override ) )
+ {
+ case 0: sendf(Client->Socket, "200 Item Refunded\n"); return ;
+ default:
+ sendf(Client->Socket, "500 Dispense Error\n");
+ return;
+ }
+}
+
+void Server_Cmd_GIVE(tClient *Client, char *Args)
+{
+ char *recipient, *ammount, *reason;
+ int uid, iAmmount;
+ int thisUid;
+
+ // Parse arguments
+ if( Server_int_ParseArgs(1, Args, &recipient, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 GIVE takes only 3 arguments\n");
+ return ;
+ }
+
+ // Check for authed
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- *reason = '\0';
- reason ++;
// Get recipient
- uid = Bank_GetAcctByName(recipient);
+ uid = Bank_GetAcctByName(recipient, 0);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid target user\n");
return ;
}
// 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);
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 ;
}
char *user, *ammount, *reason;
int uid, iAmmount;
- if( !Client->bIsAuthed ) {
- sendf(Client->Socket, "401 Not Authenticated\n");
- return ;
- }
-
- user = 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, &user, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 ADD takes 3 arguments\n");
return ;
}
- *ammount = '\0';
- ammount ++;
-
- reason = strchr(ammount, ' ');
- if( !reason ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+
+ 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|USER_FLAG_ADMIN)) ) {
return ;
}
+ #if HACK_NO_REFUNDS
+ if( strstr(reason, "refund") != NULL || strstr(reason, "misdispense") != NULL )
+ {
+ sendf(Client->Socket, "499 Don't use `dispense acct` for refunds, use `dispense refund` (and `dispense -G` to get item IDs)\n");
+ return ;
+ }
+ #endif
+
// Get recipient
- uid = Bank_GetAcctByName(user);
+ uid = Bank_GetAcctByName(user, 0);
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 ;
+ if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) )
+ {
+ if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
+ sendf(Client->Socket, "404 Invalid user\n");
+ return ;
+ }
+ // TODO: Maybe disallow changes to disabled?
}
// Parse ammount
char *user, *ammount, *reason;
int uid, iAmmount;
- if( !Client->bIsAuthed ) {
- sendf(Client->Socket, "401 Not Authenticated\n");
- return ;
- }
-
- user = 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, &user, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 SET takes 3 arguments\n");
return ;
}
- *ammount = '\0';
- ammount ++;
-
- reason = strchr(ammount, ' ');
- if( !reason ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- *reason = '\0';
- reason ++;
// Check user permissions
if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
}
// Get recipient
- uid = Bank_GetAcctByName(user);
+ uid = Bank_GetAcctByName(user, 0);
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);
do
{
type = space;
+ while(*type == ' ') type ++;
// Get next space
space = strchr(space, ' ');
if(space) *space = '\0';
void Server_Cmd_USERINFO(tClient *Client, char *Args)
{
int uid;
- char *user = Args;
- char *space;
+ char *user;
- space = strchr(user, ' ');
- if(space) *space = '\0';
+ // Parse arguments
+ if( Server_int_ParseArgs(0, Args, &user, NULL) ) {
+ sendf(Client->Socket, "407 USER_INFO takes 1 argument\n");
+ return ;
+ }
- if( giDebugLevel )
- Debug(Client, "User Info '%s'", user);
+ if( giDebugLevel ) Debug(Client, "User Info '%s'", user);
// Get recipient
- uid = Bank_GetAcctByName(user);
+ uid = Bank_GetAcctByName(user, 0);
+
+ 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 ;
}
// 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 authentication
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
+ return ;
+ }
// Check permissions
if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
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");
void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
{
- char *username, *flags;
- char *space;
+ char *username, *flags, *reason=NULL;
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(1, Args, &username, &flags, &reason, NULL) ) {
+ if( !flags ) {
+ sendf(Client->Socket, "407 USER_FLAGS takes at least 2 arguments\n");
+ return ;
+ }
+ reason = "";
+ }
+
+ // Check authentication
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\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);
+ uid = Bank_GetAcctByName(username, 0);
if( uid == -1 ) {
sendf(Client->Socket, "404 User '%s' not found\n", username);
return ;
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);
+
+ // Log the change
+ Log_Info("Updated '%s' with flag set '%s' - Reason: %s",
+ username, flags, reason);
// Return OK
sendf(Client->Socket, "200 User Updated\n");
}
+void Server_Cmd_UPDATEITEM(tClient *Client, char *Args)
+{
+ char *itemname, *price_str, *description;
+ int price;
+ tItem *item;
+
+ if( Server_int_ParseArgs(1, Args, &itemname, &price_str, &description, NULL) ) {
+ sendf(Client->Socket, "407 UPDATE_ITEM takes 3 arguments\n");
+ return ;
+ }
+
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
+ return ;
+ }
+
+ // Check user permissions
+ if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) {
+ sendf(Client->Socket, "403 Not in coke\n");
+ return ;
+ }
+
+ item = _GetItemFromString(itemname);
+ if( !item ) {
+ // TODO: Create item?
+ sendf(Client->Socket, "406 Bad Item ID\n");
+ return ;
+ }
+
+ price = atoi(price_str);
+ if( price <= 0 && price_str[0] != '0' ) {
+ sendf(Client->Socket, "407 Invalid price set\n");
+ }
+
+ switch( DispenseUpdateItem( Client->UID, item, description, price ) )
+ {
+ case 0:
+ // Return OK
+ sendf(Client->Socket, "200 Item updated\n");
+ break;
+ default:
+ break;
+ }
+}
+
// --- INTERNAL HELPERS ---
void Debug(tClient *Client, const char *Format, ...)
{
//printf("%010i [%i] ", (int)time(NULL), Client->ID);
printf("[%i] ", Client->ID);
va_start(args, Format);
- vprintf(NULL, 0, Format, args);
+ vprintf(Format, args);
va_end(args);
printf("\n");
}
}
}
+// 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 {
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au