X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=b16c495a76f9e9a784261029e8207cbdbd7b7703;hp=80b160fb020ab2433d363fc12ae6355b5f7636ca;hb=4740d52e909da9e8179955043ee2020bedae6a83;hpb=fa32b1c7ddbe1740122f61d55b997f639e927e62 diff --git a/src/client/main.c b/src/client/main.c index 80b160f..b16c495 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -23,13 +23,14 @@ #include #include #include -#include // SHA1 +//#include // SHA1 #define USE_NCURSES_INTERFACE 0 #define DEBUG_TRACE_SERVER 0 #define USE_AUTOAUTH 1 #define MAX_TXT_ARGS 5 // Maximum number of textual arguments (including command) +#define DISPENSE_MULTIPLE_MAX 20 // Maximum argument to -c enum eUI_Modes { @@ -40,6 +41,20 @@ enum eUI_Modes NUM_UI_MODES }; +enum eReturnValues +{ + RV_SUCCESS, + RV_BAD_ITEM, + RV_INVALID_USER, + RV_PERMISSIONS, + RV_ARGUMENTS, + RV_BALANCE, + RV_SERVER_ERROR, // Generic for 5xx codes + RV_UNKNOWN_ERROR = -1, + RV_SOCKET_ERROR = -2, + RV_UNKNOWN_RESPONSE = -3, +}; + // === TYPES === typedef struct sItem { char *Type; @@ -50,8 +65,8 @@ typedef struct sItem { } tItem; // === PROTOTYPES === - int main(int argc, char *argv[]); void ShowUsage(void); + int main(int argc, char *argv[]); // --- GUI --- int ShowNCursesUI(void); int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted); @@ -66,12 +81,14 @@ void PopulateItemList(int Socket); int Dispense_AlterBalance(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_Refund(int Socket, const char *Username, const char *Item, int PriceOverride); 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); + int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString, const char *Reason); + int Dispense_SetItem(int Socket, const char *Type, int ID, int NewPrice, const char *NewName); // --- Helpers --- char *ReadLine(int Socket); int sendf(int Socket, const char *Format, ...); @@ -80,7 +97,7 @@ char *trim(char *string); void CompileRegex(regex_t *regex, const char *pattern, int flags); // === GLOBALS === -char *gsDispenseServer = "heathred"; +char *gsDispenseServer = "merlo.ucc.gu.uwa.edu.au"; int giDispensePort = 11020; tItem *gaItems; @@ -97,17 +114,101 @@ char *gsEffectiveUser; //!< '-u' Dispense as another user char *gsUserName; //!< User that dispense will happen as char *gsUserFlags; //!< User's flag set int giUserBalance=-1; //!< User balance (set by Authenticate) + int giDispenseCount = 1; //!< Number of dispenses to do +char *gsTextArgs[MAX_TXT_ARGS]; + int giTextArgc; // === CODE === +void ShowUsage(void) +{ + printf( "Usage:\n" ); + if( giTextArgc == 0 ) + printf( + " == Everyone ==\n" + " dispense\n" + " Show interactive list\n" + " dispense ||\n" + " Dispense named item ( matches if it is a unique prefix)\n" + ); + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "give") == 0 ) + printf( + " dispense give \"\"\n" + " Give money to another user\n" + ); + + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 ) + printf( + " dispense donate \"\"\n" + " Donate to the club\n" + ); + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "iteminfo") == 0 ) + printf( + " dispense iteminfo \n" + " Get the name and price for an item\n" + ); + if( giTextArgc == 0 ) + printf(" == Coke members == \n"); + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 ) + printf( + " dispense acct []\n" + " Show user balances\n" + " dispense acct [+-] \"\"\n" + " Alter a account value\n" + " dispense acct = \"\"\n" + " Set an account balance\n" + ); + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "refund") == 0 ) + printf( + " dispense refund []\n" + " Refund an item to a user (with optional price override)\n" + ); + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 ) + printf( + " dispense slot \n" + " Rename/Re-price a slot\n" + ); + if( giTextArgc == 0 ) + printf(" == Dispense administrators ==\n"); + if( giTextArgc == 0 || strcmp(gsTextArgs[0], "user") == 0 ) + printf( + " dispense user add \n" + " Create new account\n" + " dispense user type \n" + " Alter a user's flags\n" + " is a comma-separated list of user, coke, admin, internal or disabled\n" + " Flags are removed by preceding the name with '-' or '!'\n" + ); + if( giTextArgc == 0 ) + printf( "\n" + "General Options:\n" + " -c \n" + " Dispense multiple times\n" + " -u \n" + " Set a different user (Coke members only)\n" + " -h / -?\n" + " Show help text\n" + " -G\n" + " Use simple textual interface (instead of ncurses)\n" + " -n\n" + " Dry run - Do not actually do dispenses\n" + " -m \n" + " -M \n" + " Set the Maximum/Minimum balances shown in `dispense acct`\n" + "Definitions:\n" + " \n" + " Item ID of the form : where is a non-empty string of alpha-numeric characters, and is a non-negative integer\n" +// " \n" +// " Account name\n" + ); +} + int main(int argc, char *argv[]) { int sock; int i, ret = 0; char buffer[BUFSIZ]; - char *text_args[MAX_TXT_ARGS]; // Non-flag arguments - int text_argc = 0; - text_args[0] = ""; + gsTextArgs[0] = ""; // -- Create regular expressions // > Code Type Count ... @@ -134,11 +235,26 @@ int main(int argc, char *argv[]) case '?': ShowUsage(); return 0; - + + case 'c': + if( i + 1 >= argc ) { + fprintf(stderr, "%s: -c takes an argument\n", argv[0]); + ShowUsage(); + return -1; + } + giDispenseCount = atoi(argv[++i]); + if( giDispenseCount < 1 || giDispenseCount > DISPENSE_MULTIPLE_MAX ) { + fprintf(stderr, "Sorry, only 1-20 can be passed to -c (safety)\n"); + return -1; + } + + break ; + case 'm': // Minimum balance if( i + 1 >= argc ) { fprintf(stderr, "%s: -m takes an argument\n", argv[0]); ShowUsage(); + return RV_ARGUMENTS; } giMinimumBalance = atoi(argv[++i]); break; @@ -146,6 +262,7 @@ int main(int argc, char *argv[]) if( i + 1 >= argc ) { fprintf(stderr, "%s: -M takes an argument\n", argv[0]); ShowUsage(); + return RV_ARGUMENTS; } giMaximumBalance = atoi(argv[++i]); break; @@ -154,6 +271,7 @@ int main(int argc, char *argv[]) if( i + 1 >= argc ) { fprintf(stderr, "%s: -u takes an argument\n", argv[0]); ShowUsage(); + return RV_ARGUMENTS; } gsEffectiveUser = argv[++i]; break; @@ -162,6 +280,7 @@ int main(int argc, char *argv[]) if( i + 1 >= argc ) { fprintf(stderr, "%s: -H takes an argument\n", argv[0]); ShowUsage(); + return RV_ARGUMENTS; } gsDispenseServer = argv[++i]; break; @@ -169,10 +288,22 @@ int main(int argc, char *argv[]) if( i + 1 >= argc ) { fprintf(stderr, "%s: -P takes an argument\n", argv[0]); ShowUsage(); + return RV_ARGUMENTS; } giDispensePort = atoi(argv[++i]); break; + // Set slot name/price + case 's': + if( giTextArgc != 0 ) { + fprintf(stderr, "%s: -s must appear before other arguments\n", argv[0]); + ShowUsage(); + return RV_ARGUMENTS; + } + gsTextArgs[0] = "slot"; // HACK!! + giTextArgc ++; + break; + case 'G': // Don't use GUI giUIMode = UI_MODE_BASIC; break; @@ -182,225 +313,345 @@ int main(int argc, char *argv[]) case 'n': // Dry Run / read-only gbDryRun = 1; break; - case '0': case '1': - case '2': case '3': - case '4': case '5': - case '6': case '7': - case '8': case '9': - if( text_argc + 1 == MAX_TXT_ARGS ) + case '-': + if( strcmp(argv[i], "--help") == 0 ) { + ShowUsage(); + return 0; + } + else { + fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]); + ShowUsage(); + return RV_ARGUMENTS; + } + break; + default: + // The first argument is not allowed to begin with 'i' + // (catches most bad flags) + if( giTextArgc == 0 ) { + fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]); + ShowUsage(); + return RV_ARGUMENTS; + } + if( giTextArgc == MAX_TXT_ARGS ) { fprintf(stderr, "ERROR: Too many arguments\n"); - return 1; + return RV_ARGUMENTS; } - text_args[text_argc++] = argv[i]; + gsTextArgs[giTextArgc++] = argv[i]; break; } continue; } - if( text_argc + 1 == MAX_TXT_ARGS ) + if( giTextArgc == MAX_TXT_ARGS ) { fprintf(stderr, "ERROR: Too many arguments\n"); - return 1; + return RV_ARGUMENTS; } - text_args[text_argc++] = argv[i]; + gsTextArgs[giTextArgc++] = argv[i]; } // // `dispense acct` // - - if( strcmp(text_args[0], "acct") == 0 ) + if( strcmp(gsTextArgs[0], "acct") == 0 ) { // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; - // List accounts? - if( text_argc == 1 ) { - Dispense_EnumUsers(sock); + if( sock < 0 ) return RV_SOCKET_ERROR; + // List accounts? + if( giTextArgc == 1 ) { + ret = Dispense_EnumUsers(sock); close(sock); - return 0; + return ret; } - // text_args[1]: Username + // gsTextArgs[1]: Username // Alter account? - if( text_argc == 4 ) + if( giTextArgc != 2 ) { + if( giTextArgc != 4 ) { + fprintf(stderr, "`dispense acct` requires a reason\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + // Authentication required - if( Authenticate(sock) ) - return -1; + ret = Authenticate(sock); + if(ret) return ret; - // text_args[1]: Username - // text_args[2]: Ammount - // text_args[3]: Reason + // gsTextArgs[1]: Username + // gsTextArgs[2]: Ammount + // gsTextArgs[3]: Reason - if( text_args[2][0] == '=' ) { + if( gsTextArgs[2][0] == '=' ) { // Set balance - if( text_args[2][1] != '0' && atoi(text_args[2]+1) == 0 ) { + if( gsTextArgs[2][1] != '0' && atoi(gsTextArgs[2]+1) == 0 ) { fprintf(stderr, "Error: Invalid balance to be set\n"); exit(1); } - Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]); + ret = Dispense_SetBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]+1), gsTextArgs[3]); } else { // Alter balance - Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]); + ret = Dispense_AlterBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]); } } + // On error, quit + if( ret ) { + close(sock); + return ret; + } // Show user information - Dispense_ShowUser(sock, text_args[1]); + ret = Dispense_ShowUser(sock, gsTextArgs[1]); close(sock); - return 0; + return ret; } // // `dispense give` // - "Here, have some money." - if( strcmp(text_args[0], "give") == 0 ) + else if( strcmp(gsTextArgs[0], "give") == 0 ) { - if( text_argc != 4 ) { + if( giTextArgc != 4 ) { fprintf(stderr, "`dispense give` takes three arguments\n"); ShowUsage(); - return -1; + return RV_ARGUMENTS; } - // text_args[1]: Destination - // text_args[2]: Ammount - // text_args[3]: Reason + // gsTextArgs[1]: Destination + // gsTextArgs[2]: Ammount + // gsTextArgs[3]: Reason // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + if( sock < 0 ) return RV_SOCKET_ERROR; // Authenticate - if( Authenticate(sock) ) - return -1; + ret = Authenticate(sock); + if(ret) return ret; - Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]); + ret = Dispense_Give(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]); close(sock); - return 0; + return ret; } // // `dispense user` // - User administration (Admin Only) - if( strcmp(text_args[0], "user") == 0 ) + if( strcmp(gsTextArgs[0], "user") == 0 ) { // Check argument count - if( text_argc == 1 ) { + if( giTextArgc == 1 ) { fprintf(stderr, "Error: `dispense user` requires arguments\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + if( sock < 0 ) return RV_SOCKET_ERROR; // Attempt authentication - if( Authenticate(sock) ) - return -1; + ret = Authenticate(sock); + if(ret) return ret; // Add new user? - if( strcmp(text_args[1], "add") == 0 ) + if( strcmp(gsTextArgs[1], "add") == 0 ) { - if( text_argc != 3 ) { + if( giTextArgc != 3 ) { fprintf(stderr, "Error: `dispense user add` requires an argument\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } - Dispense_AddUser(sock, text_args[2]); + ret = Dispense_AddUser(sock, gsTextArgs[2]); } // Update a user - else if( strcmp(text_args[1], "type") == 0 || strcmp(text_args[1], "flags") == 0 ) + else if( strcmp(gsTextArgs[1], "type") == 0 || strcmp(gsTextArgs[1], "flags") == 0 ) { - if( text_argc != 4 ) { - fprintf(stderr, "Error: `dispense user flags` requires two arguments\n"); + if( giTextArgc < 4 || giTextArgc > 5 ) { + fprintf(stderr, "Error: `dispense user type` requires two arguments\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } - Dispense_SetUserType(sock, text_args[2], text_args[3]); + if( giTextArgc == 4 ) + ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3], ""); + else + ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3], gsTextArgs[4]); } else { fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } close(sock); - return 0; + return ret; } // Donation! - else if( strcmp(text_args[0], "donate") == 0 ) + else if( strcmp(gsTextArgs[0], "donate") == 0 ) { // Check argument count - if( text_argc != 3 ) { + if( giTextArgc != 3 ) { fprintf(stderr, "Error: `dispense donate` requires two arguments\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + if( sock < 0 ) return RV_SOCKET_ERROR; // Attempt authentication - if( Authenticate(sock) ) - return -1; + ret = Authenticate(sock); + if(ret) return ret; // Do donation - Dispense_Donate(sock, atoi(text_args[1]), text_args[2]); + ret = Dispense_Donate(sock, atoi(gsTextArgs[1]), gsTextArgs[2]); close(sock); - return 0; + return ret; + } + // Refund an item + else if( strcmp(gsTextArgs[0], "refund") == 0 ) + { + int price = 0; + // Check argument count + if( giTextArgc != 3 && giTextArgc != 4 ) { + fprintf(stderr, "Error: `dispense refund` takes 2 or 3 arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if(sock < 0) return RV_SOCKET_ERROR; + + // Attempt authentication + ret = Authenticate(sock); + if(ret) return ret; + + if( giTextArgc == 4 ) { + price = atoi(gsTextArgs[3]); + if( price <= 0 ) { + fprintf(stderr, "Error: Override price is invalid (should be > 0)\n"); + return RV_ARGUMENTS; + } + } + + // Username, Item, cost + ret = Dispense_Refund(sock, gsTextArgs[1], gsTextArgs[2], price); + + // TODO: More + close(sock); + return ret; } // Query an item price - else if( strcmp(text_args[0], "iteminfo") == 0 ) + else if( strcmp(gsTextArgs[0], "iteminfo") == 0 ) { regmatch_t matches[3]; char *type; int id; // Check argument count - if( text_argc != 2 ) { + if( giTextArgc != 2 ) { fprintf(stderr, "Error: `dispense iteminfo` requires an argument\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } // Parse item ID - if( RunRegex(&gUserItemIdentRegex, text_args[1], 3, matches, NULL) != 0 ) { + if( RunRegex(&gUserItemIdentRegex, gsTextArgs[1], 3, matches, NULL) != 0 ) { fprintf(stderr, "Error: Invalid item ID passed (: expected)\n"); - exit(1); + return RV_ARGUMENTS; } - type = text_args[1] + matches[1].rm_so; - text_args[1][ matches[1].rm_eo ] = '\0'; - id = atoi( text_args[1] + matches[2].rm_so ); + type = gsTextArgs[1] + matches[1].rm_so; + gsTextArgs[1][ matches[1].rm_eo ] = '\0'; + id = atoi( gsTextArgs[1] + matches[2].rm_so ); sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; - Dispense_ItemInfo(sock, type, id); + if( sock < 0 ) return RV_SOCKET_ERROR; + + ret = Dispense_ItemInfo(sock, type, id); close(sock); - return 0; + return ret; + } + // Set slot + else if( strcmp(gsTextArgs[0], "slot") == 0 ) + { + regmatch_t matches[3]; + char *item_type, *newname; + int item_id, price; + + // Check arguments + if( giTextArgc != 4 ) { + fprintf(stderr, "Error: `dispense slot` takes three arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + + // Parse arguments + if( RunRegex(&gUserItemIdentRegex, gsTextArgs[1], 3, matches, NULL) != 0 ) { + fprintf(stderr, "Error: Invalid item ID passed (: expected)\n"); + return RV_ARGUMENTS; + } + item_type = gsTextArgs[1] + matches[1].rm_so; + gsTextArgs[1][ matches[1].rm_eo ] = '\0'; + item_id = atoi( gsTextArgs[1] + matches[2].rm_so ); + + // - Price + price = atoi( gsTextArgs[2] ); + if( price <= 0 && gsTextArgs[2][0] != '0' ) { + fprintf(stderr, "Error: Invalid price passed (must be >= 0)\n"); + return RV_ARGUMENTS; + } + + // - New name + newname = gsTextArgs[3]; + // -- Sanity + { + char *pos; + for( pos = newname; *pos; pos ++ ) + { + if( !isalnum(*pos) && *pos != ' ' ) { + fprintf(stderr, "Error: You should only have letters, numbers and spaces in an item name\n"); + return RV_ARGUMENTS; + } + } + } + + // Connect & Authenticate + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + ret = Authenticate(sock); + if(ret) return ret; + // Update the slot + ret = Dispense_SetItem(sock, item_type, item_id, price, newname); + + close(sock); + return ret; } // Item name / pattern - else { - gsItemPattern = text_args[0]; + else + { + gsItemPattern = gsTextArgs[0]; } // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + if( sock < 0 ) return RV_SOCKET_ERROR; // Get the user's balance - GetUserBalance(sock); + ret = GetUserBalance(sock); + if(ret) return ret; // Get items PopulateItemList(sock); @@ -416,11 +667,12 @@ int main(int argc, char *argv[]) { // Connect, Authenticate, dispense and close sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; - Authenticate(sock); - DispenseItem(sock, "door", 0); + if( sock < 0 ) return RV_SOCKET_ERROR; + ret = Authenticate(sock); + if(ret) return ret; + ret = DispenseItem(sock, "door", 0); close(sock); - return 0; + return ret; } // Item id (:) else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 ) @@ -436,14 +688,15 @@ int main(int argc, char *argv[]) // Connect, Authenticate, dispense and close sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + if( sock < 0 ) return RV_SOCKET_ERROR; Dispense_ItemInfo(sock, ident, id); - Authenticate(sock); - DispenseItem(sock, ident, id); + ret = Authenticate(sock); + if(ret) return ret; + ret = DispenseItem(sock, ident, id); close(sock); - return 0; + return ret; } // Item number (6 = coke) else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 ) @@ -484,7 +737,7 @@ int main(int argc, char *argv[]) // TODO: Allow ambiguous matches? // or just print a wanrning printf("Warning - Ambiguous pattern, stopping\n"); - return 1; + return RV_BAD_ITEM; } } @@ -492,7 +745,7 @@ int main(int argc, char *argv[]) if( best == -1 ) { fprintf(stderr, "No item matches the passed string\n"); - return 1; + return RV_BAD_ITEM; } i = best; @@ -543,61 +796,30 @@ int main(int argc, char *argv[]) // Check for a valid item ID if( i >= 0 ) { + int j; // Connect, Authenticate, dispense and close sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + if( sock < 0 ) return RV_SOCKET_ERROR; - Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID); + ret = Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID); + if(ret) return ret; + + ret = Authenticate(sock); + if(ret) return ret; - Authenticate(sock); - ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID); + for( j = 0; j < giDispenseCount; j ++ ) { + ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID); + if( ret ) break; + } + if( j > 1 ) { + printf("%i items dispensed\n", j); + } close(sock); } - return ret; -} + Dispense_ShowUser(sock, gsUserName); -void ShowUsage(void) -{ - printf( - "Usage:\n" - " == Everyone ==\n" - " dispense\n" - " Show interactive list\n" - " dispense ||\n" - " Dispense named item ( matches if it is a unique prefix)\n" - " dispense give \"\"\n" - " Give money to another user\n" - " dispense donate \"\"\n" - " Donate to the club\n" - " dispense iteminfo :\n" - " Get the name and price for an item\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" - " -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" - ); + return ret; } // ------------------- @@ -608,9 +830,6 @@ void ShowUsage(void) */ int ShowNCursesUI(void) { - // TODO: ncurses interface (with separation between item classes) - // - Hmm... that would require standardising the item ID to be : - // Oh, why not :) int ch; int i, times; int xBase, yBase; @@ -636,11 +855,11 @@ int ShowNCursesUI(void) username = pwd->pw_name; } // Get balance - snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, giUserBalance%100); + snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100); // Enter curses mode initscr(); - raw(); noecho(); + cbreak(); noecho(); // Get max index maxItemIndex = ShowItemAt(0, 0, 0, -1, 0); @@ -783,6 +1002,7 @@ int ShowNCursesUI(void) case '\n': ret = ShowItemAt(0, 0, 0, currentItem, 0); break; + case 0x1b: // Escape case 'q': ret = -1; // -1: Return with no dispense break; @@ -860,6 +1080,8 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) // Width = 0, don't print if( Width > 0 ) { + // 4 preceding, 5 price + int nameWidth = Width - 4 - 5; move( Row, Col ); if( Index >= 0 ) @@ -869,26 +1091,26 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) { case 0: if( bHilighted ) - printw("-> "); + printw("-> "); else - printw(" "); + printw(" "); break; case 1: - printw("SLD"); + printw("SLD "); break; default: case -1: - printw("ERR"); + printw("ERR "); break; } - printw(" %s", name); + printw("%-*.*s", nameWidth, nameWidth, name); - getyx(stdscr, _y, _x); +// getyx(stdscr, _y, _x); // Assumes max 4 digit prices - times = Width - 5 - (_x - Col); // TODO: Better handling for large prices - while(times--) addch(' '); +// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices +// while(times--) addch(' '); printw(" %4i", price); } @@ -903,7 +1125,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) } // If the item isn't availiable for sale, return -1 (so it's skipped) - if( status ) + if( status || price > giUserBalance ) Index = -1; return Index; @@ -1026,6 +1248,9 @@ int OpenConnection(const char *Host, int Port) fprintf(stderr, "Failed to connect to server\n"); return -1; } + + // We're not authenticated if the connection has just opened + gbIsAuthenticated = 0; return sock; } @@ -1039,9 +1264,11 @@ int Authenticate(int Socket) struct passwd *pwd; char *buf; int responseCode; + #if ATTEMPT_PASSWORD_AUTH char salt[32]; int i; regmatch_t matches[4]; + #endif if( gbIsAuthenticated ) return 0; @@ -1063,7 +1290,8 @@ int Authenticate(int Socket) case 401: // Untrusted, attempt password authentication free(buf); - + + #if ATTEMPT_PASSWORD_AUTH sendf(Socket, "USER %s\n", pwd->pw_name); printf("Using username %s\n", pwd->pw_name); @@ -1077,7 +1305,7 @@ int Authenticate(int Socket) if( responseCode != 100 ) { fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); free(buf); - return -1; // ERROR + return RV_UNKNOWN_ERROR; // ERROR } // Check for salt @@ -1123,23 +1351,28 @@ int Authenticate(int Socket) fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); free(buf); - return -1; + return RV_UNKNOWN_ERROR; } free(buf); if( i == 3 ) - return 2; // 2 = Bad Password + return RV_INVALID_USER; // 2 = Bad Password + + #else + fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n"); + return RV_INVALID_USER; + #endif break; case 404: // Bad Username fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); free(buf); - return 1; + return RV_INVALID_USER; default: fprintf(stderr, "Unkown response code %i from server\n", responseCode); printf("%s\n", buf); free(buf); - return -1; + return RV_UNKNOWN_ERROR; } // Set effective user @@ -1158,18 +1391,18 @@ int Authenticate(int Socket) case 403: printf("Only coke members can use `dispense -u`\n"); free(buf); - return -1; + return RV_PERMISSIONS; case 404: printf("Invalid user selected\n"); free(buf); - return -1; + return RV_INVALID_USER; default: fprintf(stderr, "Unkown response code %i from server\n", responseCode); printf("%s\n", buf); free(buf); - exit(-1); + return RV_UNKNOWN_ERROR; } free(buf); @@ -1208,13 +1441,13 @@ int GetUserBalance(int Socket) case 404: printf("Invalid user? (USER_INFO failed)\n"); free(buf); - return -1; + return RV_INVALID_USER; default: fprintf(stderr, "Unkown response code %i from server\n", responseCode); printf("%s\n", buf); free(buf); - exit(-1); + return RV_UNKNOWN_ERROR; } RunRegex(&gUserInfoRegex, buf, 6, matches, "Malformed server response"); @@ -1250,11 +1483,12 @@ int ReadItemInfo(int Socket, tItem *Dest) case 406: printf("Bad item name\n"); free(buf); - return 1; + return RV_BAD_ITEM; default: fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n%s", responseCode, buf); - exit(-1); + free(buf); + return RV_UNKNOWN_ERROR; } RunRegex(&gItemRegex, buf, 8, matches, "Malformed server response"); @@ -1276,7 +1510,7 @@ int ReadItemInfo(int Socket, tItem *Dest) else { fprintf(stderr, "Unknown response from dispense server (status '%s')\n", statusStr); - return 1; + return RV_UNKNOWN_ERROR; } Dest->Price = atoi( buf + matches[6].rm_so ); @@ -1303,7 +1537,7 @@ void PopulateItemList(int Socket) char *buf; int responseCode; - char *itemType, *itemStart; + char *arrayType; int count, i; regmatch_t matches[4]; @@ -1316,7 +1550,7 @@ void PopulateItemList(int Socket) responseCode = atoi(buf); if( responseCode != 201 ) { fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - exit(-1); + exit(RV_UNKNOWN_ERROR); } // - Get item list - @@ -1326,19 +1560,16 @@ void PopulateItemList(int Socket) // 202 Item RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response"); - itemType = &buf[ matches[2].rm_so ]; buf[ matches[2].rm_eo ] = '\0'; + arrayType = &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 ) { + if( strcmp(arrayType, "Items") != 0 ) { // What the?! fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n", - itemType); - exit(-1); + arrayType); + exit(RV_UNKNOWN_ERROR); } - - itemStart = &buf[ matches[3].rm_eo ]; - free(buf); giNumItems = count; @@ -1372,14 +1603,13 @@ void PopulateItemList(int Socket) int Dispense_ItemInfo(int Socket, const char *Type, int ID) { tItem item; + int ret; // Query sendf(Socket, "ITEM_INFO %s:%i\n", Type, ID); - if( ReadItemInfo(Socket, &item) ) - { - return -1; - } + ret = ReadItemInfo(Socket, &item); + if(ret) return ret; printf("%8s:%-2i %2i.%02i %s\n", item.Type, item.ID, @@ -1420,27 +1650,27 @@ int DispenseItem(int Socket, const char *Type, int ID) break; case 401: printf("Not authenticated\n"); - ret = 1; + ret = RV_PERMISSIONS; break; case 402: printf("Insufficient balance\n"); - ret = 1; + ret = RV_BALANCE; break; case 406: printf("Bad item name\n"); - ret = 1; + ret = RV_BAD_ITEM; break; case 500: printf("Item failed to dispense, is the slot empty?\n"); - ret = 1; + ret = RV_SERVER_ERROR; break; case 501: printf("Dispense not possible (slot empty/permissions)\n"); - ret = 1; + ret = RV_SERVER_ERROR; break; default: printf("Unknown response code %i ('%s')\n", responseCode, buf); - ret = -2; + ret = RV_UNKNOWN_ERROR; break; } @@ -1454,38 +1684,50 @@ int DispenseItem(int Socket, const char *Type, int ID) int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason) { char *buf; - int responseCode; + int responseCode, rv = -1; // Check for a dry run if( gbDryRun ) { printf("Dry Run - No action\n"); return 0; } + + // Sanity + if( Ammount == 0 ) { + printf("An ammount would be nice\n"); + return RV_ARGUMENTS; + } sendf(Socket, "ADD %s %i %s\n", Username, Ammount, Reason); buf = ReadLine(Socket); responseCode = atoi(buf); - free(buf); switch(responseCode) { - case 200: return 0; // OK + case 200: + rv = 0; // OK + break; case 402: fprintf(stderr, "Insufficient balance\n"); - return 1; + rv = RV_BAD_ITEM; + break; case 403: // Not in coke fprintf(stderr, "You are not in coke (sucker)\n"); - return 1; + rv = RV_PERMISSIONS; + break; case 404: // Unknown user fprintf(stderr, "Unknown user '%s'\n", Username); - return 2; + rv = RV_INVALID_USER; + break; default: - fprintf(stderr, "Unknown response code %i\n", responseCode); - return -1; + fprintf(stderr, "Unknown response code %i\n'%s'\n", responseCode, buf); + rv = RV_UNKNOWN_RESPONSE; + break; } + free(buf); - return -1; + return rv; } /** @@ -1514,13 +1756,13 @@ int Dispense_SetBalance(int Socket, const char *Username, int Balance, const cha case 200: return 0; // OK case 403: // Not in coke fprintf(stderr, "You are not an admin\n"); - return 1; + return RV_PERMISSIONS; case 404: // Unknown user fprintf(stderr, "Unknown user '%s'\n", Username); - return 2; + return RV_INVALID_USER; default: fprintf(stderr, "Unknown response code %i\n", responseCode); - return -1; + return RV_UNKNOWN_RESPONSE; } return -1; @@ -1536,13 +1778,13 @@ int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Rea if( Ammount < 0 ) { printf("Sorry, you can only give, you can't take.\n"); - return -1; + return RV_ARGUMENTS; } // Fast return on zero if( Ammount == 0 ) { printf("Are you actually going to give any?\n"); - return 0; + return RV_ARGUMENTS; } // Check for a dry run @@ -1552,33 +1794,82 @@ int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Rea } sendf(Socket, "GIVE %s %i %s\n", Username, Ammount, Reason); + buf = ReadLine(Socket); - responseCode = atoi(buf); - free(buf); - + free(buf); switch(responseCode) { case 200: printf("Give succeeded\n"); - return 0; // OK + return RV_SUCCESS; // OK case 402: fprintf(stderr, "Insufficient balance\n"); - return 1; + return RV_BALANCE; case 404: // Unknown user fprintf(stderr, "Unknown user '%s'\n", Username); - return 2; + return RV_INVALID_USER; default: fprintf(stderr, "Unknown response code %i\n", responseCode); - return -1; + return RV_UNKNOWN_RESPONSE; } return -1; } +int Dispense_Refund(int Socket, const char *Username, const char *Item, int PriceOverride) +{ + char *buf; + int responseCode, ret = -1; + + // Check item id + if( RunRegex(&gUserItemIdentRegex, Item, 0, NULL, NULL) != 0 ) + { + fprintf(stderr, "Error: Invalid item ID passed (should be :)\n"); + return RV_ARGUMENTS; + } + + // Check username (quick) + if( strchr(Username, ' ') || strchr(Username, '\n') ) + { + fprintf(stderr, "Error: Username is invalid (no spaces or newlines please)\n"); + return RV_ARGUMENTS; + } + + // Send the query + sendf(Socket, "REFUND %s %s %i\n", Username, Item, PriceOverride); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + switch(responseCode) + { + case 200: + Dispense_ShowUser(Socket, Username); // Show destination account + ret = 0; + break; + case 403: + fprintf(stderr, "Refund access is only avaliable to coke members\n"); + ret = RV_PERMISSIONS; + break; + case 404: + fprintf(stderr, "Unknown user '%s' passed\n", Username); + ret = RV_INVALID_USER; + break; + case 406: + fprintf(stderr, "Invalid item '%s' passed\n", Item); + ret = RV_BAD_ITEM; + break; + default: + fprintf(stderr, "Unknown response from server %i\n%s\n", responseCode, buf); + ret = -1; + break; + } + free(buf); + return ret; +} /** * \brief Donate money to the club @@ -1596,7 +1887,7 @@ int Dispense_Donate(int Socket, int Ammount, const char *Reason) // Fast return on zero if( Ammount == 0 ) { printf("Are you actually going to give any?\n"); - return 0; + return 1; } // Check for a dry run @@ -1751,7 +2042,7 @@ void _PrintUserLine(const char *Line) flags[flagsLen] = '\0'; bal = atoi(Line + matches[4].rm_so); - printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, abs(bal)%100, flags); + printf("%-15s: $%8.02f (%s)\n", username, ((float)bal)/100, flags); } } @@ -1799,7 +2090,7 @@ int Dispense_AddUser(int Socket, const char *Username) return ret; } -int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString) +int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString, const char *Reason) { char *buf; int responseCode, ret; @@ -1812,7 +2103,7 @@ int Dispense_SetUserType(int Socket, const char *Username, const char *TypeStrin // TODO: Pre-validate the string - sendf(Socket, "USER_FLAGS %s %s\n", Username, TypeString); + sendf(Socket, "USER_FLAGS %s %s %s\n", Username, TypeString, Reason); buf = ReadLine(Socket); responseCode = atoi(buf); @@ -1825,19 +2116,63 @@ int Dispense_SetUserType(int Socket, const char *Username, const char *TypeStrin break; case 403: - printf("Only wheel can modify users\n"); - ret = 1; + printf("Only dispense admins can modify users\n"); + ret = RV_PERMISSIONS; break; case 404: printf("User '%s' does not exist\n", Username); - ret = 0; + ret = RV_INVALID_USER; break; case 407: printf("Flag string is invalid\n"); + ret = RV_ARGUMENTS; + break; + + default: + fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); + ret = RV_UNKNOWN_RESPONSE; + break; + } + + free(buf); + + return ret; +} + +int Dispense_SetItem(int Socket, const char *Type, int ID, int NewPrice, const char *NewName) +{ + char *buf; + int responseCode, ret; + + // Check for a dry run + if( gbDryRun ) { + printf("Dry Run - No action\n"); + return 0; + } + + sendf(Socket, "UPDATE_ITEM %s:%i %i %s\n", Type, ID, NewPrice, NewName); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("Item %s:%i updated\n", Type, ID); ret = 0; break; + + case 403: + printf("Only coke members can modify the slots\n"); + ret = RV_PERMISSIONS; + break; + + case 406: + printf("Invalid item passed\n"); + ret = RV_BAD_ITEM; + break; default: fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); @@ -1865,8 +2200,8 @@ char *ReadLine(int Socket) #if DEBUG_TRACE_SERVER printf("ReadLine: "); - #endif fflush(stdout); + #endif ret[0] = '\0'; @@ -1877,8 +2212,12 @@ char *ReadLine(int Socket) } else { len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0); - buf[bufPos+len] = '\0'; + if( len < 0 ) { + free(ret); + return strdup("599 Client Connection Error\n"); + } } + buf[bufPos+len] = '\0'; newline = strchr( buf+bufPos, '\n' ); if( newline ) {