X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=99ea10e3857bad8b91865e119b31c7a8456529b6;hp=4c686d94bc2e4c4c277962ff29cc97eb2d3bf555;hb=4740d52e909da9e8179955043ee2020bedae6a83;hpb=792c0789eecbad303f8b65da8513d5c01bdc648e diff --git a/src/server/server.c b/src/server/server.c index 4c686d9..99ea10e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -14,11 +14,14 @@ #include #include #include +#include // O_* #include #include #include +#include #define DEBUG_TRACE_CLIENT 0 +#define HACK_NO_REFUNDS 1 // Statistics #define MAX_CONNECTION_QUEUE 5 @@ -59,6 +62,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 +72,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 +92,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 +100,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 +126,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 +148,33 @@ void Server_Start(void) 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 ) { @@ -143,6 +185,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); @@ -187,11 +238,14 @@ void Server_Start(void) { case 0x7F000001: // 127.0.0.1 localhost // 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 0x825F0D42: // 130.95.13.66 heathred + case 0x825F0D2A: // 130.95.13.42 meersau + case 0x825F0D42: // 130.95.13.66 heathred (Clubroom) bTrusted = 1; break; default: @@ -208,8 +262,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"); } /** @@ -303,9 +358,8 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString) if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) ) { - printf("command=%s, args=%s\n", command, args); + if( command == NULL ) return ; // Is this an error? (just ignore for now) - //args = ""; } @@ -377,7 +431,8 @@ void Server_Cmd_USER(tClient *Client, char *Args) void Server_Cmd_PASS(tClient *Client, char *Args) { char *passhash; - + int flags; + if( Server_int_ParseArgs(0, Args, &passhash, NULL) ) { sendf(Client->Socket, "407 PASS takes 1 argument\n"); @@ -387,13 +442,25 @@ void Server_Cmd_PASS(tClient *Client, char *Args) // 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"); } /** @@ -404,6 +471,7 @@ void Server_Cmd_PASS(tClient *Client, char *Args) void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) { char *username; + int userflags; if( Server_int_ParseArgs(0, Args, &username, NULL) ) { @@ -420,20 +488,28 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) } // Get UID - Client->UID = Bank_GetAcctByName( username ); + Client->UID = Bank_GetAcctByName( username, 0 ); 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 ; } @@ -451,6 +527,7 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) void Server_Cmd_SETEUSER(tClient *Client, char *Args) { char *username; + int eUserFlags, userFlags; if( Server_int_ParseArgs(0, Args, &username, NULL) ) { @@ -462,30 +539,77 @@ void Server_Cmd_SETEUSER(tClient *Client, char *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(username); + 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 */ @@ -509,10 +633,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"); @@ -574,10 +695,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) @@ -616,9 +734,57 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args) 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_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, 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 ; } + + 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) @@ -632,6 +798,7 @@ void Server_Cmd_GIVE(tClient *Client, char *Args) sendf(Client->Socket, "407 GIVE takes only 3 arguments\n"); return ; } + // Check for authed if( !Client->bIsAuthed ) { sendf(Client->Socket, "401 Not Authenticated\n"); @@ -639,17 +806,17 @@ void Server_Cmd_GIVE(tClient *Client, char *Args) } // 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); @@ -749,17 +916,29 @@ void Server_Cmd_ADD(tClient *Client, char *Args) 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 @@ -807,17 +986,11 @@ void Server_Cmd_SET(tClient *Client, char *Args) } // 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); @@ -1026,7 +1199,7 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args) 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 ) { @@ -1081,6 +1254,12 @@ void Server_Cmd_USERADD(tClient *Client, char *Args) return ; } + // Check authentication + if( !Client->bIsAuthed ) { + sendf(Client->Socket, "401 Not Authenticated\n"); + return ; + } + // Check permissions if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) { sendf(Client->Socket, "403 Not a coke admin\n"); @@ -1104,13 +1283,22 @@ void Server_Cmd_USERADD(tClient *Client, char *Args) void Server_Cmd_USERFLAGS(tClient *Client, char *Args) { - char *username, *flags; + char *username, *flags, *reason=NULL; int mask=0, value=0; int uid; // Parse arguments - if( Server_int_ParseArgs(0, Args, &username, &flags, NULL) ) { - sendf(Client->Socket, "407 USER_FLAGS takes 2 arguments\n"); + 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 ; } @@ -1121,7 +1309,7 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) } // 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 ; @@ -1137,11 +1325,60 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) // 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, ...) { @@ -1201,7 +1438,6 @@ int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...) while( (dest = va_arg(args, char **)) ) { - printf(" dest = %p\n", dest); // Trim leading spaces while( *ArgStr == ' ' || *ArgStr == '\t' ) ArgStr ++;