X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=4404f9e68bb06c0d0322c9d34683cd6102ffcb3a;hb=4fef498619ca05876568c6bc5114fadd7c2496ee;hp=04f1c399156110a2759794400e0feb81b28d81f4;hpb=21ed7a19f1f3e046c2985043e7fbe054b65cb4e4;p=tpg%2Fopendispense2.git diff --git a/src/server/server.c b/src/server/server.c index 04f1c39..4404f9e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -17,6 +17,7 @@ #include #include #include +#include #define DEBUG_TRACE_CLIENT 0 @@ -59,6 +60,7 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args); 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); @@ -68,6 +70,7 @@ 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); +void Server_Cmd_UPDATEITEM(tClient *Client, char *Args); // --- Helpers --- void Debug(tClient *Client, const char *Format, ...); int sendf(int Socket, const char *Format, ...); @@ -87,6 +90,7 @@ const struct sClientCommand { {"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}, @@ -94,14 +98,21 @@ const struct sClientCommand { {"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 === /** @@ -113,6 +124,8 @@ void Server_Start(void) 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); @@ -133,6 +146,26 @@ void Server_Start(void) perror("Binding"); return ; } + +#if 0 + if( gbServer_RunInBackground ) + { + 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 + reopen(0, "/dev/null", O_READ); + reopen(1, gsServer_LogFile, O_CREAT|O_APPEND); + reopen(2, gsServer_ErrorLog, O_CREAT|O_APPEND); + } +#endif // Listen if( listen(giServer_Socket, MAX_CONNECTION_QUEUE) < 0 ) { @@ -143,6 +176,15 @@ 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"); + if( fp ) { + fprintf(fp, "%i", getpid()); + fclose(fp); + } + } + for(;;) { uint len = sizeof(client_addr); @@ -186,11 +228,13 @@ 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 0x825E0D07: // 130.95.13.7 motsugo - case 0x825E0D11: // 130.95.13.17 mermaid - 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 0x825F0D2A: // 130.95.13.42 meersau + case 0x825F0D42: // 130.95.13.66 heathred bTrusted = 1; break; default: @@ -207,8 +251,9 @@ void Server_Start(void) void Server_Cleanup(void) { - printf("Close(%i)\n", giServer_Socket); + printf("\nClose(%i)\n", giServer_Socket); close(giServer_Socket); + unlink("/var/run/dispsrv.pid"); } /** @@ -296,22 +341,25 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString) { char *command, *args; int i; - #if 0 - char **argList; - int numArgs = 0; - #endif + + if( giDebugLevel >= 2 ) + Debug(Client, "Server_ParseClientCommand: (CommandString = '%s')", CommandString); if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) ) { + if( command == NULL ) return ; +// printf("command=%s, args=%s\n", command, args); // Is this an error? (just ignore for now) - args = ""; + //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 ; } @@ -332,7 +380,11 @@ void Server_Cmd_USER(tClient *Client, char *Args) { char *username; - Server_int_ParseArgs(0, Args, &username, NULL); + if( Server_int_ParseArgs(0, Args, &username, NULL) ) + { + sendf(Client->Socket, "407 USER takes 1 argument\n"); + return ; + } // Debug! if( giDebugLevel ) @@ -370,19 +422,36 @@ void Server_Cmd_USER(tClient *Client, char *Args) void Server_Cmd_PASS(tClient *Client, char *Args) { char *passhash; - - Server_int_ParseArgs(0, Args, &passhash, NULL); + 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, 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"); } /** @@ -393,8 +462,13 @@ void Server_Cmd_PASS(tClient *Client, char *Args) void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) { char *username; + int userflags; - Server_int_ParseArgs(0, Args, &username, NULL); + if( Server_int_ParseArgs(0, Args, &username, NULL) ) + { + sendf(Client->Socket, "407 AUTOAUTH takes 1 argument\n"); + return ; + } // Check if trusted if( !Client->bIsTrusted ) { @@ -409,14 +483,24 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) if( Client->UID < 0 ) { if(giDebugLevel) Debug(Client, "Unknown user '%s'", username); - sendf(Client->Socket, "401 Auth Failure\n"); + 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 ; } @@ -434,8 +518,13 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) void Server_Cmd_SETEUSER(tClient *Client, char *Args) { char *username; + int eUserFlags, userFlags; - Server_int_ParseArgs(0, Args, &username, NULL); + 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"); @@ -443,7 +532,8 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args) } // 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 ; } @@ -456,15 +546,51 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args) } // 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; + } + } + + 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 */ @@ -488,10 +614,7 @@ void Server_Cmd_ENUMITEMS(tClient *Client, char *Args) for( i = 0; i < giNumItems; i ++ ) { if( gaItems[i].bHidden ) continue; - sendf(Client->Socket, - "202 Item %s:%i %i %s\n", - gaItems[i].Handler->Name, gaItems[i].ID, gaItems[i].Price, gaItems[i].Name - ); + Server_int_SendItem( Client, &gaItems[i] ); } sendf(Client->Socket, "200 List end\n"); @@ -553,10 +676,7 @@ void Server_Cmd_ITEMINFO(tClient *Client, char *Args) 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) @@ -600,6 +720,54 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args) } } +void Server_Cmd_REFUND(tClient *Client, char *Args) +{ + 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 ; + } + + // Check user permissions + if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) { + sendf(Client->Socket, "403 Not in coke\n"); + return ; + } + + uid = Bank_GetAcctByName(username); + 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 ; + } + + 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; @@ -625,10 +793,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); @@ -736,9 +904,13 @@ void Server_Cmd_ADD(tClient *Client, char *Args) } // 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 @@ -791,12 +963,6 @@ void Server_Cmd_SET(tClient *Client, char *Args) 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); @@ -1121,6 +1287,52 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) 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"); + } + + // Update the item + free(item->Name); + item->Name = strdup(description); + item->Price = price; + + // Update item file + Items_UpdateFile(); + + // Return OK + sendf(Client->Socket, "200 Item updated\n"); +} + // --- INTERNAL HELPERS --- void Debug(tClient *Client, const char *Format, ...) { @@ -1163,9 +1375,20 @@ int sendf(int Socket, const char *Format, ...) int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...) { va_list args; - char savedChar = *ArgStr; + 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 **)) ) { @@ -1180,37 +1403,42 @@ int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...) do { *dest = NULL; } while( (dest = va_arg(args, char **)) ); + va_end(args); return -1; } - // Set destination - *dest = ArgStr; - 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 == ' ' && bUseLongLast ) + if( (savedChar == ' ' || savedChar == '\t') && !bUseLongLast ) { return -1; + } // Un-mangle last - if(bUseLongLast) + if(bUseLongLast) { + ArgStr --; *ArgStr = savedChar; - - va_end(args); + } return 0; // Success! }