X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=315b12987f78768edbad34da98f8f9689a7824f6;hb=10fc79a2f4f72165cb1ce1ba78c84faa8d56f5db;hp=2a10babd22f4601f0fd9e8e5742737b55bb7a8cd;hpb=f75c35bdf5e2c6c1104c22c32bd0d55ca16b52c9;p=tpg%2Fopendispense2.git diff --git a/src/server/server.c b/src/server/server.c index 2a10bab..315b129 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -18,10 +18,6 @@ #include #include -// HACKS -#define HACK_TPG_NOAUTH 1 -#define HACK_ROOT_NOAUTH 1 - #define DEBUG_TRACE_CLIENT 0 // Statistics @@ -45,6 +41,7 @@ typedef struct sClient char Salt[9]; int UID; + int EffectiveUID; int bIsAuthed; } tClient; @@ -57,43 +54,51 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString); void Server_Cmd_USER(tClient *Client, char *Args); void Server_Cmd_PASS(tClient *Client, char *Args); void Server_Cmd_AUTOAUTH(tClient *Client, char *Args); +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_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, ...); - int GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash); -void HexBin(uint8_t *Dest, char *Src, int BufSize); -// === GLOBALS === - int giServer_Port = 1020; - int giServer_NextClientID = 1; +// === CONSTANTS === // - Commands -struct sClientCommand { - char *Name; +const struct sClientCommand { + const char *Name; void (*Function)(tClient *Client, char *Arguments); } gaServer_Commands[] = { {"USER", Server_Cmd_USER}, {"PASS", Server_Cmd_PASS}, {"AUTOAUTH", Server_Cmd_AUTOAUTH}, + {"SETEUSER", Server_Cmd_SETEUSER}, {"ENUM_ITEMS", Server_Cmd_ENUMITEMS}, {"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}, {"USER_FLAGS", Server_Cmd_USERFLAGS} }; -#define NUM_COMMANDS (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0])) +#define NUM_COMMANDS ((int)(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))) + +// === GLOBALS === + int giServer_Port = 1020; + int giServer_NextClientID = 1; int giServer_Socket; // === CODE === @@ -141,12 +146,14 @@ 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 ; } + // 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 +161,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 ) { @@ -162,6 +173,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; @@ -195,12 +207,15 @@ void Server_HandleClient(int Socket, int bTrusted) char *buf = inbuf; int remspace = INPUT_BUFFER_SIZE-1; int bytes = -1; - tClient clientInfo = {0}; + tClient clientInfo; + + memset(&clientInfo, 0, sizeof(clientInfo)); // Initialise Client info clientInfo.Socket = Socket; clientInfo.ID = giServer_NextClientID ++; clientInfo.bIsTrusted = bTrusted; + clientInfo.EffectiveUID = -1; // Read from client /* @@ -321,10 +336,13 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString) * Usage: USER */ void Server_Cmd_USER(tClient *Client, char *Args) -{ +{ + char *space = strchr(Args, ' '); + if(space) *space = '\0'; // Remove characters after the ' ' + // Debug! if( giDebugLevel ) - printf("Client %i authenticating as '%s'\n", Client->ID, Args); + Debug(Client, "Authenticating as '%s'", Args); // Save username if(Client->Username) @@ -357,28 +375,17 @@ void Server_Cmd_USER(tClient *Client, char *Args) */ void Server_Cmd_PASS(tClient *Client, char *Args) { - uint8_t clienthash[HASH_LENGTH] = {0}; - - // Read user's hash - HexBin(clienthash, Args, HASH_LENGTH); + char *space = strchr(Args, ' '); + if(space) *space = '\0'; // Remove characters after the ' ' - // TODO: Decrypt password passed - - Client->UID = GetUserAuth(Client->Salt, Client->Username, clienthash); + // Pass on to cokebank + Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, Args); if( Client->UID != -1 ) { Client->bIsAuthed = 1; sendf(Client->Socket, "200 Auth OK\n"); return ; } - - if( giDebugLevel ) { - int i; - printf("Client %i: Password hash ", Client->ID); - for(i=0;iSocket, "401 Auth Failure\n"); } @@ -390,32 +397,80 @@ void Server_Cmd_PASS(tClient *Client, char *Args) */ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) { - char *spos = strchr(Args, ' '); - if(spos) *spos = '\0'; // Remove characters after the ' ' + char *space = strchr(Args, ' '); + if(space) *space = '\0'; // Remove characters after the ' ' // 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 = GetUserID( 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 ; } + // You can't be an internal account + if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) { + Client->UID = -1; + 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"); } +/** + * \brief Set effective user + */ +void Server_Cmd_SETEUSER(tClient *Client, char *Args) +{ + char *space; + + space = strchr(Args, ' '); + + if(space) *space = '\0'; + + if( !strlen(Args) ) { + sendf(Client->Socket, "407 SETEUSER expects an argument\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 ; + } + + // Set id + Client->EffectiveUID = Bank_GetAcctByName(Args); + 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 ; + } + + sendf(Client->Socket, "200 User set\n"); +} + /** * \brief Enumerate the items that the server knows about */ @@ -423,6 +478,11 @@ void Server_Cmd_ENUMITEMS(tClient *Client, char *Args) { int i; + if( Args != NULL && strlen(Args) ) { + sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n"); + return ; + } + sendf(Client->Socket, "201 Items %i\n", giNumItems); for( i = 0; i < giNumItems; i ++ ) { @@ -494,6 +554,8 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args) { tItem *item; int ret; + int uid; + if( !Client->bIsAuthed ) { sendf(Client->Socket, "401 Not Authenticated\n"); return ; @@ -504,8 +566,15 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args) sendf(Client->Socket, "406 Bad Item ID\n"); return ; } + + if( Client->EffectiveUID != -1 ) { + uid = Client->EffectiveUID; + } + else { + uid = Client->UID; + } - switch( ret = DispenseItem( Client->UID, item ) ) + switch( ret = DispenseItem( Client->UID, uid, item ) ) { case 0: sendf(Client->Socket, "200 Dispense OK\n"); return ; case 1: sendf(Client->Socket, "501 Unable to dispense\n"); return ; @@ -520,6 +589,7 @@ void Server_Cmd_GIVE(tClient *Client, char *Args) { char *recipient, *ammount, *reason; int uid, iAmmount; + int thisUid; if( !Client->bIsAuthed ) { sendf(Client->Socket, "401 Not Authenticated\n"); @@ -545,11 +615,74 @@ void Server_Cmd_GIVE(tClient *Client, char *Args) reason ++; // Get recipient - uid = GetUserID(recipient); + uid = Bank_GetAcctByName(recipient); 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 ; + } + + // Parse ammount + iAmmount = atoi(ammount); + if( iAmmount <= 0 ) { + sendf(Client->Socket, "407 Invalid Argument, ammount must be > zero\n"); + return ; + } + + if( Client->EffectiveUID != -1 ) { + thisUid = Client->EffectiveUID; + } + else { + thisUid = Client->UID; + } + + // Do give + switch( DispenseGive(Client->UID, thisUid, uid, 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_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); @@ -557,9 +690,17 @@ void Server_Cmd_GIVE(tClient *Client, char *Args) 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( DispenseGive(Client->UID, uid, iAmmount, reason) ) + switch( DispenseDonate(Client->UID, thisUid, iAmmount, reason) ) { case 0: sendf(Client->Socket, "200 Give OK\n"); @@ -601,18 +742,93 @@ void Server_Cmd_ADD(tClient *Client, char *Args) *reason = '\0'; reason ++; - // TODO: Check if the current user is in coke/higher - if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) { + // 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 = GetUserID(user); + 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( 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); @@ -622,7 +838,7 @@ void Server_Cmd_ADD(tClient *Client, char *Args) } // Do give - switch( DispenseAdd(uid, Client->UID, iAmmount, reason) ) + switch( DispenseSet(Client->UID, uid, iAmmount, reason) ) { case 0: sendf(Client->Socket, "200 Add OK\n"); @@ -639,32 +855,138 @@ void Server_Cmd_ADD(tClient *Client, char *Args) void Server_Cmd_ENUMUSERS(tClient *Client, char *Args) { int i, numRet = 0; + tAcctIterator *it; int maxBal = INT_MAX, minBal = INT_MIN; - int numUsr = GetMaxID(); + 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 ) { + 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 - for( i = 0; i < numUsr; i ++ ) + while( (i = Bank_IteratorNext(it)) != -1 ) { - int bal = GetBalance(i); + int bal = Bank_GetBalance(i); if( bal == INT_MIN ) continue; @@ -674,12 +996,18 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args) numRet ++; } + Bank_DelIterator(it); + // Send count sendf(Client->Socket, "201 Users %i\n", numRet); - for( i = 0; i < numUsr; i ++ ) + + // Create iterator + it = Bank_Iterator(flagMask, flagVal, flags, balValue, timeValue); + + while( (i = Bank_IteratorNext(it)) != -1 ) { - int bal = GetBalance(i); + int bal = Bank_GetBalance(i); if( bal == INT_MIN ) continue; @@ -689,6 +1017,8 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args) _SendUserInfo(Client, i); } + Bank_DelIterator(it); + sendf(Client->Socket, "200 List End\n"); } @@ -701,10 +1031,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 = GetUserID(user); + 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 ; } @@ -713,25 +1047,34 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args) void _SendUserInfo(tClient *Client, int UserID) { - char *type, *disabled=""; - int flags = GetFlags(UserID); + char *type, *disabled="", *door=""; + int flags = Bank_GetFlags(UserID); - switch( flags & USER_FLAG_TYPEMASK ) - { - default: - case USER_TYPE_NORMAL: type = "user"; break; - case USER_TYPE_COKE: type = "coke"; break; - case USER_TYPE_WHEEL: type = "wheel"; break; - case USER_TYPE_GOD: type = "meta"; break; + if( flags & USER_FLAG_INTERNAL ) { + type = "internal"; + } + else if( flags & USER_FLAG_COKE ) { + if( flags & USER_FLAG_ADMIN ) + type = "coke,admin"; + else + type = "coke"; + } + else if( flags & USER_FLAG_ADMIN ) { + type = "admin"; + } + else { + type = "user"; } if( flags & USER_FLAG_DISABLED ) disabled = ",disabled"; + if( flags & USER_FLAG_DOORGROUP ) + door = ",door"; // TODO: User flags/type sendf( Client->Socket, "202 User %s %i %s%s\n", - GetUserName(UserID), GetBalance(UserID), + Bank_GetAcctName(UserID), Bank_GetBalance(UserID), type, disabled ); } @@ -741,8 +1084,8 @@ void Server_Cmd_USERADD(tClient *Client, char *Args) char *username, *space; // Check permissions - if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_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 ; } @@ -753,11 +1096,17 @@ void Server_Cmd_USERADD(tClient *Client, char *Args) if(space) *space = '\0'; // Try to create user - if( CreateUser(username) == -1 ) { + 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"); } @@ -769,8 +1118,8 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) int uid; // Check permissions - if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_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 ; } @@ -791,117 +1140,35 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) if(space) *space = '\0'; // Get UID - uid = GetUserID(username); + uid = Bank_GetAcctByName(username); if( uid == -1 ) { sendf(Client->Socket, "404 User '%s' not found\n", username); return ; } // 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}, - {"user", USER_FLAG_TYPEMASK, USER_TYPE_NORMAL}, - {"coke", USER_FLAG_TYPEMASK, USER_TYPE_COKE}, - {"wheel", USER_FLAG_TYPEMASK, USER_TYPE_WHEEL}, - {"meta", USER_FLAG_TYPEMASK, USER_TYPE_GOD} - }; - 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 ; // Apply flags - SetFlags(uid, mask, value); + Bank_SetFlags(uid, mask, value); // Return OK sendf(Client->Socket, "200 User Updated\n"); } -/** - * \brief Authenticate a user - * \return User ID, or -1 if authentication failed - */ -int GetUserAuth(const char *Salt, const char *Username, const uint8_t *ProvidedHash) +// --- INTERNAL HELPERS --- +void Debug(tClient *Client, const char *Format, ...) { - #if 0 - uint8_t h[20]; - int ofs = strlen(Username) + strlen(Salt); - char input[ ofs + 40 + 1]; - char tmp[4 + strlen(Username) + 1]; // uid=%s - #endif - - #if HACK_TPG_NOAUTH - if( strcmp(Username, "tpg") == 0 ) - return GetUserID("tpg"); - #endif - #if HACK_ROOT_NOAUTH - if( strcmp(Username, "root") == 0 ) { - int ret = GetUserID("root"); - if( ret == -1 ) - return CreateUser("root"); - return ret; - } - #endif - - #if 0 - // - strcpy(input, Username); - strcpy(input, Salt); - // TODO: Get user's SHA-1 hash - sprintf(tmp, "uid=%s", Username); - ldap_search_s(ld, "", LDAP_SCOPE_BASE, tmp, "userPassword", 0, res); - - sprintf(input+ofs, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9], - h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19] - ); - // Then create the hash from the provided salt - // Compare that with the provided hash - #endif - - return -1; + 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"); } -// --- INTERNAL HELPERS --- int sendf(int Socket, const char *Format, ...) { va_list args; @@ -925,79 +1192,69 @@ int sendf(int Socket, const char *Format, ...) } } -// TODO: Move to another file -void HexBin(uint8_t *Dest, char *Src, int BufSize) +int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value) { - int i; - for( i = 0; i < BufSize; i ++ ) - { - uint8_t val = 0; + 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; - if('0' <= *Src && *Src <= '9') - val |= (*Src-'0') << 4; - else if('A' <= *Src && *Src <= 'F') - val |= (*Src-'A'+10) << 4; - else if('a' <= *Src && *Src <= 'f') - val |= (*Src-'a'+10) << 4; + while( *Str == ' ' ) Str ++; // Eat whitespace + space = strchr(Str, ','); // Find the end of the flag + if(space) + len = space - Str; else - break; - Src ++; + len = strlen(Str); - if('0' <= *Src && *Src <= '9') - val |= (*Src-'0'); - else if('A' <= *Src && *Src <= 'F') - val |= (*Src-'A'+10); - else if('a' <= *Src && *Src <= 'f') - val |= (*Src-'a'+10); - else - break; - Src ++; + // Check for inversion/removal + if( *Str == '!' || *Str == '-' ) { + bRemove = 1; + Str ++; + } + else if( *Str == '+' ) { + Str ++; + } - Dest[i] = val; - } - for( ; i < BufSize; i++ ) - Dest[i] = 0; -} - -/** - * \brief Decode a Base64 value - */ -int UnBase64(uint8_t *Dest, char *Src, int BufSize) -{ - uint32_t val; - int i, j; - char *start_src = Src; - - for( i = 0; i+2 < BufSize; i += 3 ) - { - val = 0; - for( j = 0; j < 4; j++, Src ++ ) { - if('A' <= *Src && *Src <= 'Z') - val |= (*Src - 'A') << ((3-j)*6); - else if('a' <= *Src && *Src <= 'z') - val |= (*Src - 'a' + 26) << ((3-j)*6); - else if('0' <= *Src && *Src <= '9') - val |= (*Src - '0' + 52) << ((3-j)*6); - else if(*Src == '+') - val |= 62 << ((3-j)*6); - else if(*Src == '/') - val |= 63 << ((3-j)*6); - else if(!*Src) + // 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; - else if(*Src != '=') - j --; // Ignore invalid characters + } } - Dest[i ] = (val >> 16) & 0xFF; - Dest[i+1] = (val >> 8) & 0xFF; - Dest[i+2] = val & 0xFF; - if(j != 4) break; - } - - // Finish things off - if(i < BufSize) - Dest[i] = (val >> 16) & 0xFF; - if(i+1 < BufSize) - Dest[i+1] = (val >> 8) & 0xFF; + + // 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 Src - start_src; + return 0; }