X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=cd692242c87f499e9f9af97f072e46da0cad9b07;hb=91d11fd7f9bf911c6abc59a18e17ec5890cee148;hp=c997c43b68767db767b90019c6dd8f22090ffe97;hpb=15d5ac704abc63c3f11ac8743cbd2ffa1fb70c88;p=tpg%2Fopendispense2.git diff --git a/src/server/server.c b/src/server/server.c index c997c43..cd69224 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,13 +60,17 @@ 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 --- +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, ...); // === CONSTANTS === @@ -82,7 +87,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}, @@ -140,12 +147,26 @@ void Server_Start(void) 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); @@ -153,6 +174,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,6 +186,7 @@ void Server_Start(void) { 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 bTrusted = 1; @@ -202,6 +228,7 @@ void Server_HandleClient(int Socket, int bTrusted) clientInfo.Socket = Socket; clientInfo.ID = giServer_NextClientID ++; clientInfo.bIsTrusted = bTrusted; + clientInfo.EffectiveUID = -1; // Read from client /* @@ -211,6 +238,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; @@ -328,7 +356,7 @@ void Server_Cmd_USER(tClient *Client, char *Args) // Debug! if( giDebugLevel ) - printf("Client %i authenticating as '%s'\n", Client->ID, Args); + Debug(Client, "Authenticating as '%s'", Args); // Save username if(Client->Username) @@ -389,7 +417,7 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) // 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 ; } @@ -398,7 +426,7 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) Client->UID = Bank_GetAcctByName( Args ); if( Client->UID < 0 ) { if(giDebugLevel) - printf("Client %i: Unknown user '%s'\n", Client->ID, Args); + Debug(Client, "Unknown user '%s'", Args); sendf(Client->Socket, "401 Auth Failure\n"); return ; } @@ -409,9 +437,11 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) sendf(Client->Socket, "401 Auth Failure\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)", Args, Client->UID); sendf(Client->Socket, "200 Auth OK\n"); } @@ -433,7 +463,7 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args) } // Check user permissions - if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE) ) { + if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) { sendf(Client->Socket, "403 Not in coke\n"); return ; } @@ -460,16 +490,24 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args) */ 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 ++ ) { + 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 @@ -640,6 +678,64 @@ void Server_Cmd_GIVE(tClient *Client, char *Args) } } +void Server_Cmd_DONATE(tClient *Client, char *Args) +{ + char *ammount, *reason; + 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"); + 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"); + return ; + } + + // Parse ammount + iAmmount = atoi(ammount); + if( iAmmount <= 0 ) { + sendf(Client->Socket, "407 Invalid Argument, ammount must be > zero\n"); + return ; + } + + // Handle effective users + if( Client->EffectiveUID != -1 ) { + thisUid = Client->EffectiveUID; + } + else { + thisUid = Client->UID; + } + + // Do give + switch( DispenseDonate(Client->UID, thisUid, iAmmount, reason) ) + { + case 0: + sendf(Client->Socket, "200 Give OK\n"); + return ; + case 2: + sendf(Client->Socket, "402 Poor You\n"); + return ; + default: + sendf(Client->Socket, "500 Unknown error\n"); + return ; + } +} + void Server_Cmd_ADD(tClient *Client, char *Args) { char *user, *ammount, *reason; @@ -669,7 +765,7 @@ void Server_Cmd_ADD(tClient *Client, char *Args) reason ++; // Check user permissions - if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE) ) { + if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) { sendf(Client->Socket, "403 Not in coke\n"); return ; } @@ -695,7 +791,76 @@ void Server_Cmd_ADD(tClient *Client, char *Args) } // Do give - switch( DispenseAdd(uid, Client->UID, iAmmount, reason) ) + 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 ; + } +} + +void Server_Cmd_SET(tClient *Client, char *Args) +{ + 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"); + return ; + } + *ammount = '\0'; + ammount ++; + + reason = strchr(ammount, ' '); + if( !reason ) { + sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n"); + return ; + } + *reason = '\0'; + reason ++; + + // Check user permissions + if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) { + sendf(Client->Socket, "403 Not an admin\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 ; + } + + // Do give + switch( DispenseSet(Client->UID, uid, iAmmount, reason) ) { case 0: sendf(Client->Socket, "200 Add OK\n"); @@ -712,36 +877,133 @@ 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 != "-" - if( strcmp(min, "-") != 0 ) - minBal = atoi(min); - // If != "-" - if( max && strcmp(max, "-") != 0 ) - maxBal = atoi(max); + char *space = Args, *type, *val; + do + { + type = space; + // 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 ) @@ -763,12 +1025,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 ) { @@ -796,10 +1053,14 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args) 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 ; } @@ -815,13 +1076,13 @@ void _SendUserInfo(tClient *Client, int UserID) type = "internal"; } else if( flags & USER_FLAG_COKE ) { - if( flags & USER_FLAG_WHEEL ) - type = "coke,wheel"; + if( flags & USER_FLAG_ADMIN ) + type = "coke,admin"; else type = "coke"; } - else if( flags & USER_FLAG_WHEEL ) { - type = "wheel"; + else if( flags & USER_FLAG_ADMIN ) { + type = "admin"; } else { type = "user"; @@ -834,9 +1095,9 @@ 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 ); } @@ -845,8 +1106,8 @@ void Server_Cmd_USERADD(tClient *Client, char *Args) char *username, *space; // Check permissions - if( !(Bank_GetFlags(Client->UID) & USER_FLAG_WHEEL) ) { - sendf(Client->Socket, "403 Not Wheel\n"); + if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) { + sendf(Client->Socket, "403 Not a coke admin\n"); return ; } @@ -862,6 +1123,12 @@ void Server_Cmd_USERADD(tClient *Client, char *Args) 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"); } @@ -873,8 +1140,8 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) int uid; // Check permissions - if( !(Bank_GetFlags(Client->UID) & USER_FLAG_WHEEL) ) { - sendf(Client->Socket, "403 Not Wheel\n"); + if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) { + sendf(Client->Socket, "403 Not a coke admin\n"); return ; } @@ -902,55 +1169,12 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) } // Parse flags - do { - int bRemove = 0; - int i; - struct { - const char *Name; - int Mask; - int Value; - } cFLAGS[] = { - {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED} - ,{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP} - ,{"coke", USER_FLAG_COKE, USER_FLAG_COKE} - ,{"wheel", USER_FLAG_WHEEL, USER_FLAG_WHEEL} - // ,{"internal", USER_FLAG_INTERNAL, USER_FLAG_INTERNAL} - }; - const int ciNumFlags = sizeof(cFLAGS)/sizeof(cFLAGS[0]); - - while( *flags == ' ' ) flags ++; // Eat whitespace - space = strchr(flags, ','); // Find the end of the flag - if(space) *space = '\0'; - - // Check for inversion/removal - if( *flags == '!' || *flags == '-' ) { - bRemove = 1; - flags ++; - } - else if( *flags == '+' ) { - flags ++; - } - - // Check flag values - for( i = 0; i < ciNumFlags; i ++ ) - { - if( strcmp(flags, cFLAGS[i].Name) == 0 ) { - mask |= cFLAGS[i].Mask; - value &= ~cFLAGS[i].Mask; - if( !bRemove ) - value |= cFLAGS[i].Value; - break; - } - } - - // Error check - if( i == ciNumFlags ) { - sendf(Client->Socket, "407 Unknown flag value '%s'\n", flags); - return ; - } - - flags = space + 1; - } while(space); + 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); @@ -960,6 +1184,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; @@ -982,3 +1217,70 @@ int sendf(int Socket, const char *Format, ...) return send(Socket, buf, len, 0); } } + +int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value) +{ + struct { + const char *Name; + int Mask; + int Value; + } cFLAGS[] = { + {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED} + ,{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP} + ,{"coke", USER_FLAG_COKE, USER_FLAG_COKE} + ,{"admin", USER_FLAG_ADMIN, USER_FLAG_ADMIN} + ,{"internal", USER_FLAG_INTERNAL, USER_FLAG_INTERNAL} + }; + const int ciNumFlags = sizeof(cFLAGS)/sizeof(cFLAGS[0]); + + char *space; + + *Mask = 0; + *Value = 0; + + do { + int bRemove = 0; + int i; + int len; + + while( *Str == ' ' ) Str ++; // Eat whitespace + space = strchr(Str, ','); // Find the end of the flag + if(space) + len = space - Str; + else + len = strlen(Str); + + // Check for inversion/removal + if( *Str == '!' || *Str == '-' ) { + bRemove = 1; + Str ++; + } + else if( *Str == '+' ) { + Str ++; + } + + // Check flag values + for( i = 0; i < ciNumFlags; i ++ ) + { + if( strncmp(Str, cFLAGS[i].Name, len) == 0 ) { + *Mask |= cFLAGS[i].Mask; + *Value &= ~cFLAGS[i].Mask; + if( !bRemove ) + *Value |= cFLAGS[i].Value; + break; + } + } + + // Error check + if( i == ciNumFlags ) { + char val[len+1]; + strncpy(val, Str, len+1); + sendf(Client->Socket, "407 Unknown flag value '%s'\n", val); + return -1; + } + + Str = space + 1; + } while(space); + + return 0; +}