X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=72dffdf5aeba0d66165908370608c7c624309a07;hb=ffc52312097ac25aaca6d20a132242f5f0670c5b;hp=33f3fe41e5f53f2e9c520982bd24578552b5146b;hpb=5df82cb2854e4f7c693c8a31e0c2d56682a93855;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 33f3fe4..72dffdf 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -15,6 +15,7 @@ #include #include #include +#include #include // close #include // gethostbyname @@ -25,10 +26,12 @@ #include // SHA1 #define USE_NCURSES_INTERFACE 0 +#define DEBUG_TRACE_SERVER 0 // === TYPES === typedef struct sItem { - char *Ident; + char *Type; + int ID; char *Desc; int Price; } tItem; @@ -46,10 +49,14 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const void PopulateItemList(int Socket); int DispenseItem(int Socket, int ItemID); int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason); - int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason); + int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason); + int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason); + int Dispense_Donate(int Socket, int Ammount, const char *Reason); int Dispense_EnumUsers(int Socket); int Dispense_ShowUser(int Socket, const char *Username); void _PrintUserLine(const char *Line); + int Dispense_AddUser(int Socket, const char *Username); + int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString); // --- Helpers --- char *ReadLine(int Socket); int sendf(int Socket, const char *Format, ...); @@ -66,9 +73,11 @@ tItem *gaItems; regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex; int gbIsAuthenticated = 0; -char *gsOverrideUser; //!< '-u' argument (dispense as another user) +char *gsItemPattern; //!< Item pattern +char *gsEffectiveUser; //!< '-u' Dispense as another user int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? - int giSocket = -1; + int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct` + int giMaximumBalance = INT_MAX; //!< '-M' Maximum balance for `dispense acct` // === CODE === int main(int argc, char *argv[]) @@ -81,7 +90,7 @@ int main(int argc, char *argv[]) // > Code Type Count ... CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED); // // > Code Type Ident Price Desc - CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); + CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); // > Code 'SALT' salt CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED); // > Code 'User' Username Balance Flags @@ -101,8 +110,15 @@ int main(int argc, char *argv[]) ShowUsage(); return 0; + case 'm': // Minimum balance + giMinimumBalance = atoi(argv[++i]); + break; + case 'M': // Maximum balance + giMaximumBalance = atoi(argv[++i]); + break; + case 'u': // Override User - gsOverrideUser = argv[++i]; + gsEffectiveUser = argv[++i]; break; case 'G': // Use GUI @@ -113,9 +129,11 @@ int main(int argc, char *argv[]) continue; } + // + // `dispense acct` + // - if( strcmp(arg, "acct") == 0 ) { - // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); if( sock < 0 ) return -1; @@ -129,15 +147,16 @@ int main(int argc, char *argv[]) // argv[i+1]: Username // Alter account? - if( i + 2 < argc ) { - + if( i + 2 < argc ) + { if( i + 3 >= argc ) { fprintf(stderr, "Error: `dispense acct' needs a reason\n"); exit(1); } // Authentication required - Authenticate(sock); + if( Authenticate(sock) ) + return -1; // argv[i+1]: Username // argv[i+2]: Ammount @@ -145,7 +164,12 @@ int main(int argc, char *argv[]) if( argv[i+2][0] == '=' ) { // Set balance - Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2] + 1), argv[i+3]); + if( argv[i+2][1] != '0' && atoi(&argv[i+2][1]) == 0 ) { + fprintf(stderr, "Error: Invalid balance to be set\n"); + exit(1); + } + + Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2]+1), argv[i+3]); } else { // Alter balance @@ -153,13 +177,117 @@ int main(int argc, char *argv[]) } } + // Show user information Dispense_ShowUser(sock, argv[i+1]); close(sock); return 0; } + // + // `dispense give` + // - "Here, have some money." + if( strcmp(arg, "give") == 0 ) + { + if( i + 3 >= argc ) { + fprintf(stderr, "`dispense give` takes three arguments\n"); + ShowUsage(); + return -1; + } + // TODO: `dispense give` + + // argv[i+1]: Destination + // argv[i+2]: Ammount + // argv[i+3]: Reason + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // Authenticate + if( Authenticate(sock) ) + return -1; + + Dispense_Give(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]); + return 0; + } + // + // `dispense user` + // - User administration (Admin Only) + if( strcmp(arg, "user") == 0 ) + { + // Check argument count + if( i + 1 >= argc ) { + fprintf(stderr, "Error: `dispense user` requires arguments\n"); + ShowUsage(); + exit(1); + } + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // Attempt authentication + if( Authenticate(sock) ) + return -1; + + // Add new user? + if( strcmp(argv[i+1], "add") == 0 ) + { + if( i + 2 >= argc ) { + fprintf(stderr, "Error: `dispense user add` requires an argument\n"); + ShowUsage(); + exit(1); + } + + Dispense_AddUser(sock, argv[i+2]); + } + // Update a user + else if( strcmp(argv[i+1], "type") == 0 ) + { + if( i + 3 >= argc ) { + fprintf(stderr, "Error: `dispense user type` requires two arguments\n"); + ShowUsage(); + exit(1); + } + + Dispense_SetUserType(sock, argv[i+2], argv[i+3]); + } + else + { + fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n"); + ShowUsage(); + exit(1); + } + return 0; + } + + // Donation! + if( strcmp(arg, "donate") == 0 ) + { + // Check argument count + if( i + 2 >= argc ) { + fprintf(stderr, "Error: `dispense donate` requires two arguments\n"); + ShowUsage(); + exit(1); + } + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // Attempt authentication + if( Authenticate(sock) ) + return -1; + + // Do donation + Dispense_Donate(sock, atoi(argv[i+1]), argv[i+1]); + + return 0; + } + else { // Item name / pattern + gsItemPattern = arg; break; } } @@ -174,14 +302,22 @@ int main(int argc, char *argv[]) // Get items PopulateItemList(sock); - if( gbUseNCurses ) + if( gsItemPattern ) + { + // TODO: Implement `dispense ` + printf("TODO: Implement `dispense `\n"); + i = -1; + } + else if( gbUseNCurses ) { i = ShowNCursesUI(); } else { + // Very basic dispense interface for( i = 0; i < giNumItems; i ++ ) { - printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc); + printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID, + gaItems[i].Price, gaItems[i].Desc); } printf(" q Quit\n"); for(;;) @@ -222,24 +358,40 @@ void ShowUsage(void) { printf( "Usage:\n" - "\tdispense\n" - "\t\tShow interactive list\n" - "\tdispense \n" - "\t\tDispense named item\n" - "\tdispense give \"\"\n" - "\t\tGive some of your money away\n" - "\tdispense acct []\n" - "\t\tShow user balances\n" - "\tdispense acct [+-=] \"\"\n" - "\t\tAlter a account value (Coke members only)\n" + " == Everyone ==\n" + " dispense\n" + " Show interactive list\n" + " dispense \n" + " Dispense named item\n" + " dispense give \"\"\n" + " Give money to another user\n" + " dispense donate \"\"\n" + " Donate to the club\n" + " == Coke members == \n" + " dispense acct []\n" + " Show user balances\n" + " dispense acct [+-] \"\"\n" + " Alter a account value\n" + " == Dispense administrators ==\n" + " dispense acct = \"\"\n" + " Set an account balance\n" + " dispense user add \n" + " Create new coke account (Admins only)\n" + " dispense user type \n" + " Alter a user's flags\n" + " is a comma-separated list of user, coke, admin or disabled\n" + " Flags are removed by preceding the name with '-' or '!'\n" "\n" "General Options:\n" - "\t-u \n" - "\t\tSet a different user (Coke members only)\n" - "\t-h / -?\n" - "\t\tShow help text\n" - "\t-G\n" - "\t\tUse alternate GUI\n" + " -u \n" + " Set a different user (Coke members only)\n" + " -h / -?\n" + " Show help text\n" + " -G\n" + " Use alternate GUI\n" + " -m \n" + " -M \n" + " Set the Maximum/Minimum balances shown in `dispense acct`\n" ); } @@ -566,11 +718,9 @@ int Authenticate(int Socket) responseCode = atoi(buf); switch( responseCode ) { - - case 200: // Authenticated, return :) - gbIsAuthenticated = 1; + case 200: // Autoauth succeeded, return free(buf); - return 0; + break; case 401: // Untrusted, attempt password authentication free(buf); @@ -637,12 +787,9 @@ int Authenticate(int Socket) return -1; } free(buf); - if( i < 3 ) { - gbIsAuthenticated = 1; - return 0; - } - else + if( i == 3 ) return 2; // 2 = Bad Password + break; case 404: // Bad Username fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); @@ -655,6 +802,43 @@ int Authenticate(int Socket) free(buf); return -1; } + + // Set effective user + if( gsEffectiveUser ) { + sendf(Socket, "SETEUSER %s\n", gsEffectiveUser); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("Running as '%s' by '%s'\n", gsEffectiveUser, pwd->pw_name); + break; + + case 403: + printf("Only coke members can use `dispense -u`\n"); + free(buf); + return -1; + + case 404: + printf("Invalid user selected\n"); + free(buf); + return -1; + + default: + fprintf(stderr, "Unkown response code %i from server\n", responseCode); + printf("%s\n", buf); + free(buf); + exit(-1); + } + + free(buf); + } + + gbIsAuthenticated = 1; + + return 0; } @@ -664,8 +848,7 @@ int Authenticate(int Socket) */ void PopulateItemList(int Socket) { - char buffer[BUFSIZ]; - int len; + char *buf; int responseCode; char *itemType, *itemStart; @@ -674,14 +857,11 @@ void PopulateItemList(int Socket) // Ask server for stock list send(Socket, "ENUM_ITEMS\n", 11, 0); - len = recv(Socket, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - - trim(buffer); + buf = ReadLine(Socket); - //printf("Output: %s\n", buffer); + //printf("Output: %s\n", buf); - responseCode = atoi(buffer); + responseCode = atoi(buf); if( responseCode != 201 ) { fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); exit(-1); @@ -689,11 +869,13 @@ void PopulateItemList(int Socket) // - Get item list - - // Expected format: 201 Items ... - RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response"); + // Expected format: + // 201 Items + // 202 Item + RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response"); - itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0'; - count = atoi( &buffer[ matches[3].rm_so ] ); + itemType = &buf[ matches[2].rm_so ]; buf[ matches[2].rm_eo ] = '\0'; + count = atoi( &buf[ matches[3].rm_so ] ); // Check array type if( strcmp(itemType, "Items") != 0 ) { @@ -703,42 +885,51 @@ void PopulateItemList(int Socket) exit(-1); } - itemStart = &buffer[ matches[3].rm_eo ]; - - gaItems = malloc( count * sizeof(tItem) ); - - for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ ) - { - char *next = strchr( ++itemStart, ' ' ); - if( next ) *next = '\0'; - gaItems[giNumItems].Ident = strdup(itemStart); - itemStart = next; - } + itemStart = &buf[ matches[3].rm_eo ]; + + free(buf); + + giNumItems = count; + gaItems = malloc( giNumItems * sizeof(tItem) ); // Fetch item information for( i = 0; i < giNumItems; i ++ ) { - regmatch_t matches[6]; + regmatch_t matches[7]; // Get item info - sendf(Socket, "ITEM_INFO %s\n", gaItems[i].Ident); - len = recv(Socket, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); + buf = ReadLine(Socket); + responseCode = atoi(buf); - responseCode = atoi(buffer); if( responseCode != 202 ) { fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); exit(-1); } - RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response"); + RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response"); - buffer[ matches[3].rm_eo ] = '\0'; + buf[ matches[3].rm_eo ] = '\0'; - gaItems[i].Price = atoi( buffer + matches[4].rm_so ); - gaItems[i].Desc = strdup( buffer + matches[5].rm_so ); + gaItems[i].Type = strdup( buf + matches[3].rm_so ); + gaItems[i].ID = atoi( buf + matches[4].rm_so ); + gaItems[i].Price = atoi( buf + matches[5].rm_so ); + gaItems[i].Desc = strdup( buf + matches[6].rm_so ); + + free(buf); } + + // Read end of list + buf = ReadLine(Socket); + responseCode = atoi(buf); + + if( responseCode != 200 ) { + fprintf(stderr, "Unknown response from dispense server %i\n'%s'", + responseCode, buf + ); + exit(-1); + } + + free(buf); } /** @@ -753,7 +944,7 @@ int DispenseItem(int Socket, int ItemID) if( ItemID < 0 || ItemID > giNumItems ) return -1; // Dispense! - sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident); + sendf(Socket, "DISPENSE %s:%i\n", gaItems[ItemID].Type, gaItems[ItemID].ID); buf = ReadLine(Socket); responseCode = atoi(buf); @@ -810,6 +1001,9 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c switch(responseCode) { case 200: return 0; // OK + case 402: + fprintf(stderr, "Insufficient balance\n"); + return 1; case 403: // Not in coke fprintf(stderr, "You are not in coke (sucker)\n"); return 1; @@ -825,14 +1019,15 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c } /** - * \brief Alter a user's balance + * \brief Set a user's balance + * \note Only avaliable to dispense admins */ -int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason) +int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason) { char *buf; int responseCode; - sendf(Socket, "SET %s %i %s\n", Username, Ammount, Reason); + sendf(Socket, "SET %s %i %s\n", Username, Balance, Reason); buf = ReadLine(Socket); responseCode = atoi(buf); @@ -842,7 +1037,7 @@ int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const cha { case 200: return 0; // OK case 403: // Not in coke - fprintf(stderr, "You are not in coke (sucker)\n"); + fprintf(stderr, "You are not an admin\n"); return 1; case 404: // Unknown user fprintf(stderr, "Unknown user '%s'\n", Username); @@ -855,12 +1050,163 @@ int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const cha return -1; } -int Dispense_EnumUsers(int Socket) +/** + * \brief Give money to another user + */ +int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason) { - printf("TODO: Dispense_EnumUsers\n"); + char *buf; + int responseCode; + + if( Ammount < 0 ) { + printf("Sorry, you can only give, you can't take.\n"); + return -1; + } + + // Fast return on zero + if( Ammount == 0 ) { + printf("Are you actually going to give any?\n"); + return 0; + } + + sendf(Socket, "GIVE %s %i %s\n", Username, Ammount, Reason); + buf = ReadLine(Socket); + + responseCode = atoi(buf); + free(buf); + + switch(responseCode) + { + case 200: return 0; // OK + + case 402: + fprintf(stderr, "Insufficient balance\n"); + return 1; + + case 404: // Unknown user + fprintf(stderr, "Unknown user '%s'\n", Username); + return 2; + + default: + fprintf(stderr, "Unknown response code %i\n", responseCode); + return -1; + } + return -1; } + +/** + * \brief Donate money to the club + */ +int Dispense_Donate(int Socket, int Ammount, const char *Reason) +{ + char *buf; + int responseCode; + + if( Ammount < 0 ) { + printf("Sorry, you can only give, you can't take.\n"); + return -1; + } + + // Fast return on zero + if( Ammount == 0 ) { + printf("Are you actually going to give any?\n"); + return 0; + } + + sendf(Socket, "DONATE %i %s\n", Ammount, Reason); + buf = ReadLine(Socket); + + responseCode = atoi(buf); + free(buf); + + switch(responseCode) + { + case 200: return 0; // OK + + case 402: + fprintf(stderr, "Insufficient balance\n"); + return 1; + + default: + fprintf(stderr, "Unknown response code %i\n", responseCode); + return -1; + } + + return -1; +} + +/** + * \brief Enumerate users + */ +int Dispense_EnumUsers(int Socket) +{ + char *buf; + int responseCode; + int nUsers; + regmatch_t matches[4]; + + if( giMinimumBalance != INT_MIN ) { + if( giMaximumBalance != INT_MAX ) { + sendf(Socket, "ENUM_USERS min_balance:%i max_balance:%i\n", giMinimumBalance, giMaximumBalance); + } + else { + sendf(Socket, "ENUM_USERS min_balance:%i\n", giMinimumBalance); + } + } + else { + if( giMaximumBalance != INT_MAX ) { + sendf(Socket, "ENUM_USERS max_balance:%i\n", giMaximumBalance); + } + else { + sendf(Socket, "ENUM_USERS\n"); + } + } + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 201: break; // Ok, length follows + + default: + fprintf(stderr, "Unknown response code %i\n%s\n", responseCode, buf); + free(buf); + return -1; + } + + // Get count (not actually used) + RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response"); + nUsers = atoi( buf + matches[3].rm_so ); + printf("%i users returned\n", nUsers); + + // Free string + free(buf); + + // Read returned users + do { + buf = ReadLine(Socket); + responseCode = atoi(buf); + + if( responseCode != 202 ) break; + + _PrintUserLine(buf); + free(buf); + } while(responseCode == 202); + + // Check final response + if( responseCode != 200 ) { + fprintf(stderr, "Unknown response code %i\n%s\n", responseCode, buf); + free(buf); + return -1; + } + + free(buf); + + return 0; +} + int Dispense_ShowUser(int Socket, const char *Username) { char *buf; @@ -915,8 +1261,91 @@ void _PrintUserLine(const char *Line) flags[flagsLen] = '\0'; bal = atoi(Line + matches[4].rm_so); - printf("%-15s: $%i.%02i (%s)\n", username, bal/100, bal%100, flags); + printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, abs(bal)%100, flags); + } +} + +int Dispense_AddUser(int Socket, const char *Username) +{ + char *buf; + int responseCode, ret; + + sendf(Socket, "USER_ADD %s\n", Username); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("User '%s' added\n", Username); + ret = 0; + break; + + case 403: + printf("Only wheel can add users\n"); + ret = 1; + break; + + case 404: + printf("User '%s' already exists\n", Username); + ret = 0; + break; + + default: + fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); + ret = -1; + break; } + + free(buf); + + return ret; +} + +int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString) +{ + char *buf; + int responseCode, ret; + + // TODO: Pre-validate the string + + sendf(Socket, "USER_FLAGS %s %s\n", Username, TypeString); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("User '%s' updated\n", Username); + ret = 0; + break; + + case 403: + printf("Only wheel can modify users\n"); + ret = 1; + break; + + case 404: + printf("User '%s' does not exist\n", Username); + ret = 0; + break; + + case 407: + printf("Flag string is invalid\n"); + ret = 0; + break; + + default: + fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); + ret = -1; + break; + } + + free(buf); + + return ret; } // --------------- @@ -926,12 +1355,13 @@ char *ReadLine(int Socket) { static char buf[BUFSIZ]; static int bufPos = 0; + static int bufValid = 0; int len; char *newline = NULL; int retLen = 0; char *ret = malloc(10); - #if DBG_TRACE_SERVER + #if DEBUG_TRACE_SERVER printf("ReadLine: "); #endif fflush(stdout); @@ -940,8 +1370,13 @@ char *ReadLine(int Socket) while( !newline ) { - len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0); - buf[bufPos+len] = '\0'; + if( bufValid ) { + len = bufValid; + } + else { + len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0); + buf[bufPos+len] = '\0'; + } newline = strchr( buf+bufPos, '\n' ); if( newline ) { @@ -953,12 +1388,14 @@ char *ReadLine(int Socket) strcat( ret, buf+bufPos ); if( newline ) { - bufPos += newline - (buf+bufPos) + 1; + int newLen = newline - (buf+bufPos) + 1; + bufValid = len - newLen; + bufPos += newLen; } if( len + bufPos == BUFSIZ - 1 ) bufPos = 0; } - #if DBG_TRACE_SERVER + #if DEBUG_TRACE_SERVER printf("%i '%s'\n", retLen, ret); #endif @@ -980,7 +1417,7 @@ int sendf(int Socket, const char *Format, ...) vsnprintf(buf, len+1, Format, args); va_end(args); - #if DBG_TRACE_SERVER + #if DEBUG_TRACE_SERVER printf("sendf: %s", buf); #endif