X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=8d46af28b7a780b339966b8d48d372e6a2152dd9;hb=8fda01126c68844816bb53b615b11d29d61ca55e;hp=86b068c7a401b291430bcdb96d80b456f2e63c14;hpb=9ee11856849fa782af3b477d0d9172a7211d7f2e;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 86b068c..8d46af2 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -23,26 +23,53 @@ #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 +{ + UI_MODE_BASIC, // Non-NCurses + UI_MODE_STANDARD, + UI_MODE_DRINKSONLY, + UI_MODE_ALL, + 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; int ID; + int Status; // 0: Availiable, 1: Sold out, -1: Error char *Desc; int Price; } tItem; // === PROTOTYPES === - int main(int argc, char *argv[]); void ShowUsage(void); + int main(int argc, char *argv[]); // --- GUI --- int ShowNCursesUI(void); -void ShowItemAt(int Row, int Col, int Width, int Index); + int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted); void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...); // --- Coke Server Communication --- int OpenConnection(const char *Host, int Port); @@ -54,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, ...); @@ -68,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; @@ -78,26 +107,128 @@ regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex char *gsItemPattern; //!< Item pattern char *gsEffectiveUser; //!< '-u' Dispense as another user - int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? + + int giUIMode = UI_MODE_STANDARD; int gbDryRun = 0; //!< '-n' Read-only + int gbDisallowSelectWithoutBalance = 1; //!< Don't allow items to be hilighted if not affordable + int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct` int giMaximumBalance = INT_MAX; //!< '-M' Maximum balance for `dispense acct` -char *gsUserName; //!< User that dispense will happen as + + char *gsUserName; //!< User that dispense will happen as char *gsUserFlags; //!< User's flag set - int giUserBalance=-1; //!< User balance (set by Authenticate) + 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" + " dispense finger\n" + " Show the finger output\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 || strcmp(gsTextArgs[0], "enumitems") == 0 ) +// printf( +// " dispense enumitems\n" +// " List avaliable items\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" + " Item IDs can be seen in the cokelog (in the brackets after the item name)\n" + " e.g. coke:6 for a coke, snack:33 for slot 33 of the snack machine\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; + int i, ret = 0; char buffer[BUFSIZ]; + gsTextArgs[0] = ""; + // -- Create regular expressions // > 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-z]+):([0-9]+)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); + // > Code Type Ident Status Price Desc + CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+(avail|sold|error)\\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 @@ -118,11 +249,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; @@ -130,6 +276,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; @@ -138,6 +285,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; @@ -146,6 +294,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; @@ -153,189 +302,410 @@ 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; - case 'G': // Use GUI - gbUseNCurses = 1; + // 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; + case 'D': // Drinks only + giUIMode = UI_MODE_DRINKSONLY; break; case 'n': // Dry Run / read-only gbDryRun = 1; break; + case '-': + if( strcmp(argv[i], "--help") == 0 ) { + ShowUsage(); + return 0; + } + else if( strcmp(argv[i], "--dry-run") == 0 ) { + gbDryRun = 1; + } + else if( strcmp(argv[i], "--drinks-only") == 0 ) { + giUIMode = UI_MODE_DRINKSONLY; + } + else if( strcmp(argv[i], "--can-select-all") == 0 ) { + gbDisallowSelectWithoutBalance = 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 RV_ARGUMENTS; + } + gsTextArgs[giTextArgc++] = argv[i]; + break; } continue; } - - // - // `dispense acct` - // - - if( strcmp(arg, "acct") == 0 ) + + if( giTextArgc == MAX_TXT_ARGS ) { - // Connect to server - sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + fprintf(stderr, "ERROR: Too many arguments\n"); + return RV_ARGUMENTS; + } + + gsTextArgs[giTextArgc++] = argv[i]; + + } - // List accounts? - if( i + 1 == argc ) { - Dispense_EnumUsers(sock); - return 0; - } - - // argv[i+1]: Username - - // Alter account? - if( i + 2 < argc ) + // + // `dispense finger` + // - + if( strcmp(gsTextArgs[0], "finger") == 0 ) + { + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + + // Get items + PopulateItemList(sock); + + // Only get coke slot statuses + for( i = 0; i <= 6; i ++ ) + { + const char *status; + switch(gaItems[i].Status) { - if( i + 3 >= argc ) { - fprintf(stderr, "Error: `dispense acct' needs a reason\n"); - exit(1); - } - - // Authentication required - if( Authenticate(sock) ) - return -1; - - // argv[i+1]: Username - // argv[i+2]: Ammount - // argv[i+3]: Reason - - if( argv[i+2][0] == '=' ) { - // Set balance - 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 - Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]); - } + case 0: status = "Avail"; break; + case 1: status = "Sold "; break; + default: + status = "Error"; + break; } + printf("%i - %s %3i %s\n", gaItems[i].ID, status, gaItems[i].Price, gaItems[i].Desc); - // Show user information - Dispense_ShowUser(sock, argv[i+1]); - + } + + return 0; + } + + // + // `dispense acct` + // - + if( strcmp(gsTextArgs[0], "acct") == 0 ) + { + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + // List accounts? + if( giTextArgc == 1 ) { + ret = Dispense_EnumUsers(sock); close(sock); - return 0; + return ret; } - // - // `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; - } - // 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 ) + // gsTextArgs[1]: Username + + // Alter account? + if( giTextArgc != 2 ) { - // Check argument count - if( i + 1 >= argc ) { - fprintf(stderr, "Error: `dispense user` requires arguments\n"); + if( giTextArgc != 4 ) { + fprintf(stderr, "`dispense acct` requires a reason\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } - // Connect to server - sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + // Authentication required + ret = Authenticate(sock); + if(ret) return ret; - // Attempt authentication - if( Authenticate(sock) ) - return -1; + // gsTextArgs[1]: Username + // gsTextArgs[2]: Ammount + // gsTextArgs[3]: Reason - // 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(); + if( gsTextArgs[2][0] == '=' ) { + // Set balance + if( gsTextArgs[2][1] != '0' && atoi(gsTextArgs[2]+1) == 0 ) { + fprintf(stderr, "Error: Invalid balance to be set\n"); exit(1); } - Dispense_SetUserType(sock, argv[i+2], argv[i+3]); + ret = Dispense_SetBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]+1), gsTextArgs[3]); } - else - { - fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n"); - ShowUsage(); - exit(1); + else { + // Alter balance + ret = Dispense_AlterBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]); } - return 0; + } + // On error, quit + if( ret ) { + close(sock); + return ret; + } + + // Show user information + ret = Dispense_ShowUser(sock, gsTextArgs[1]); + + close(sock); + return ret; + } + // + // `dispense give` + // - "Here, have some money." + else if( strcmp(gsTextArgs[0], "give") == 0 ) + { + if( giTextArgc != 4 ) { + fprintf(stderr, "`dispense give` takes three arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; } - // Donation! - if( strcmp(arg, "donate") == 0 ) + // gsTextArgs[1]: Destination + // gsTextArgs[2]: Ammount + // gsTextArgs[3]: Reason + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + + // Authenticate + ret = Authenticate(sock); + if(ret) return ret; + + ret = Dispense_Give(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]); + + close(sock); + + return ret; + } + // + // `dispense user` + // - User administration (Admin Only) + if( strcmp(gsTextArgs[0], "user") == 0 ) + { + // Check argument count + if( giTextArgc == 1 ) { + fprintf(stderr, "Error: `dispense user` requires 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; + + // Add new user? + if( strcmp(gsTextArgs[1], "add") == 0 ) { - // Check argument count - if( i + 2 >= argc ) { - fprintf(stderr, "Error: `dispense donate` requires two arguments\n"); + if( giTextArgc != 3 ) { + fprintf(stderr, "Error: `dispense user add` requires an argument\n"); ShowUsage(); - exit(1); + return RV_ARGUMENTS; } - // 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]); + ret = Dispense_AddUser(sock, gsTextArgs[2]); + } + // Update a user + else if( strcmp(gsTextArgs[1], "type") == 0 || strcmp(gsTextArgs[1], "flags") == 0 ) + { + if( giTextArgc < 4 || giTextArgc > 5 ) { + fprintf(stderr, "Error: `dispense user type` requires two arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; + } - return 0; + 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(); + return RV_ARGUMENTS; + } + close(sock); + return ret; + } + // Donation! + else if( strcmp(gsTextArgs[0], "donate") == 0 ) + { + // Check argument count + if( giTextArgc != 3 ) { + fprintf(stderr, "Error: `dispense donate` requires two arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; } - else { - // Item name / pattern - gsItemPattern = arg; - break; + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + + // Attempt authentication + ret = Authenticate(sock); + if(ret) return ret; + + // Do donation + ret = Dispense_Donate(sock, atoi(gsTextArgs[1]), gsTextArgs[2]); + + close(sock); + + 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(gsTextArgs[0], "iteminfo") == 0 ) + { + regmatch_t matches[3]; + char *type; + int id; + // Check argument count + if( giTextArgc != 2 ) { + fprintf(stderr, "Error: `dispense iteminfo` requires an argument\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + // Parse item ID + if( RunRegex(&gUserItemIdentRegex, gsTextArgs[1], 3, matches, NULL) != 0 ) { + fprintf(stderr, "Error: Invalid item ID passed (: expected)\n"); + return RV_ARGUMENTS; } + 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 RV_SOCKET_ERROR; + + ret = Dispense_ItemInfo(sock, type, id); + close(sock); + 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 = 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); @@ -343,7 +713,7 @@ int main(int argc, char *argv[]) // Disconnect from server close(sock); - if( gsItemPattern ) + if( gsItemPattern && gsItemPattern[0] ) { regmatch_t matches[3]; // Door (hard coded) @@ -351,11 +721,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 ) @@ -371,14 +742,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 ) @@ -419,7 +791,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; } } @@ -427,13 +799,13 @@ 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; } } - else if( gbUseNCurses ) + else if( giUIMode != UI_MODE_BASIC ) { i = ShowNCursesUI(); } @@ -441,11 +813,12 @@ int main(int argc, char *argv[]) { // Very basic dispense interface for( i = 0; i < giNumItems; i ++ ) { - if( strcmp(gaItems[i].Desc, "-") == 0 ) - printf("\n"); - else - printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID, - gaItems[i].Price, gaItems[i].Desc); + // Add a separator + if( i && strcmp(gaItems[i].Type, gaItems[i-1].Type) != 0 ) + printf(" ---\n"); + + 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(;;) @@ -477,59 +850,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); - 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); + } + Dispense_ShowUser(sock, gsUserName); close(sock); - } - return 0; -} + } -void ShowUsage(void) -{ - printf( - "Usage:\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" - " -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; } // ------------------- @@ -540,18 +884,15 @@ 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; - const int displayMinWidth = 40; - const int displayMinItems = 8; + const int displayMinWidth = 50; char *titleString = "Dispense"; - int itemCount = displayMinItems; + int items_in_view; + int maxItemIndex; int itemBase = 0; - int currentItem = 0; + int currentItem; int ret = -2; // -2: Used for marking "no return yet" char balance_str[5+1+2+1]; // If $9999.99 is too little, something's wrong @@ -568,20 +909,27 @@ 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 item count + // Get max index + maxItemIndex = ShowItemAt(0, 0, 0, -1, 0); + // Get item count per screen // - 6: randomly chosen (Need at least 3) - itemCount = LINES - 6; - if( itemCount > giNumItems ) - itemCount = giNumItems; + items_in_view = LINES - 6; + if( items_in_view > maxItemIndex ) + items_in_view = maxItemIndex; + // Get first index + currentItem = 0; + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem ++; + // Get dimensions - height = itemCount + 3; + height = items_in_view + 3; width = displayMinWidth; // Get positions @@ -594,46 +942,46 @@ int ShowNCursesUI(void) PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\"); // Items - for( i = 0; i < itemCount; i ++ ) + for( i = 0; i < items_in_view; i ++ ) { + int pos = 0; + move( yBase + 1 + i, xBase ); + printw("| "); - if( currentItem == itemBase + i ) { - printw("| -> "); - } - else { - printw("| "); - } + pos += 2; // Check for the '...' row // - Oh god, magic numbers! - if( i == 0 && itemBase > 0 ) { - printw(" ..."); - times = width-1 - 8 - 3; - while(times--) addch(' '); - } - else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) { - printw(" ..."); - times = width-1 - 8 - 3; + if( (i == 0 && itemBase > 0) + || (i == items_in_view - 1 && itemBase < maxItemIndex - items_in_view) ) + { + printw(" ..."); pos += 8; + times = (width - pos) - 1; while(times--) addch(' '); } // Show an item else { - ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i); - addch(' '); + ShowItemAt( + yBase + 1 + i, xBase + pos, // Position + (width - pos) - 3, // Width + itemBase + i, // Index + !!(currentItem == itemBase + i) // Hilighted + ); + printw(" "); } // Scrollbar (if needed) - if( giNumItems > itemCount ) { + if( maxItemIndex > items_in_view ) { if( i == 0 ) { addch('A'); } - else if( i == itemCount - 1 ) { + else if( i == items_in_view - 1 ) { addch('V'); } else { - int percentage = itemBase * 100 / (giNumItems-itemCount); - if( i-1 == percentage*(itemCount-3)/100 ) { + int percentage = itemBase * 100 / (maxItemIndex-items_in_view); + if( i-1 == percentage*(items_in_view-3)/100 ) { addch('#'); } else { @@ -666,21 +1014,29 @@ int ShowNCursesUI(void) switch(ch) { case 'B': - //if( itemBase < giNumItems - (itemCount) ) - // itemBase ++; - if( currentItem < giNumItems - 1 ) + currentItem ++; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) currentItem ++; - else { + + if( currentItem >= maxItemIndex ) { currentItem = 0; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem ++; } break; case 'A': - //if( itemBase > 0 ) - // itemBase --; - if( currentItem > 0 ) + currentItem --; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) currentItem --; - else { - currentItem = giNumItems - 1; + + if( currentItem < 0 ) { + currentItem = maxItemIndex - 1; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem --; } break; } @@ -688,27 +1044,30 @@ int ShowNCursesUI(void) else { } - - if( currentItem < itemBase + 1 && itemBase > 0 ) - itemBase = currentItem - 1; - if( currentItem > itemBase + itemCount - 1 && itemBase < itemCount-1 ) - itemBase = currentItem - itemCount + 1; - - #if 0 - if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems ) + + // Scroll only if needed + if( items_in_view < maxItemIndex ) { - itemBase += ; + // - If the current item is above the second item shown, and we're not at the top + if( currentItem < itemBase + 2 && itemBase > 0 ) { + itemBase = currentItem - 2; + if(itemBase < 0) itemBase = 0; + } + // - If the current item is below the second item show, and we're not at the bottom + if( currentItem > itemBase + items_in_view - 2 && itemBase + items_in_view < maxItemIndex ) { + itemBase = currentItem - items_in_view + 2; + if( itemBase > maxItemIndex - items_in_view ) + itemBase = maxItemIndex - items_in_view; + } } - if( itemBase + 1 > currentItem && itemBase > 0 ) - itemBase --; - #endif } else { switch(ch) { case '\n': - ret = currentItem; + ret = ShowItemAt(0, 0, 0, currentItem, 0); break; + case 0x1b: // Escape case 'q': ret = -1; // -1: Return with no dispense break; @@ -728,38 +1087,103 @@ int ShowNCursesUI(void) /** * \brief Show item \a Index at (\a Col, \a Row) + * \return Dispense index of item * \note Part of the NCurses UI */ -void ShowItemAt(int Row, int Col, int Width, int Index) +int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) { - int _x, _y, times; - char *name; - int price; + char *name = NULL; + int price = 0; + int status = -1; - move( Row, Col ); - - if( Index < 0 || Index >= giNumItems ) { - name = "OOR"; - price = 0; - } - else { + switch(giUIMode) + { + // Standard UI + // - This assumes that + case UI_MODE_STANDARD: + // Bounds check + // Index = -1, request limit + if( Index < 0 || Index >= giNumItems+2 ) + return giNumItems+2; + // Drink label + if( Index == 0 ) + { + price = 0; + name = "Coke Machine"; + Index = -1; // -1 indicates a label + break; + } + Index --; + // Drinks 0 - 6 + if( Index <= 6 ) + { + name = gaItems[Index].Desc; + price = gaItems[Index].Price; + status = gaItems[Index].Status; + break; + } + Index -= 7; + // EPS label + if( Index == 0 ) + { + price = 0; + name = "Electronic Payment System"; + Index = -1; // -1 indicates a label + break; + } + Index --; + Index += 7; name = gaItems[Index].Desc; price = gaItems[Index].Price; + status = gaItems[Index].Status; + break; + default: + return -1; } - // Spacer hack (Desc = "-") - if( gaItems[Index].Desc[0] == '-' && gaItems[Index].Desc[1] == '\0' ) + // Width = 0, don't print + if( Width > 0 ) { - return; + // 4 preceding, 5 price + int nameWidth = Width - 4 - snprintf(NULL, 0, " %4i", price); + move( Row, Col ); + + if( Index >= 0 ) + { + // Show hilight and status + switch( status ) + { + case 0: + if( bHilighted ) + printw("-> "); + else + printw(" "); + break; + case 1: + printw("SLD "); + break; + + default: + case -1: + printw("ERR "); + break; + } + + printw("%-*.*s", nameWidth, nameWidth, name); + + printw(" %4i", price); + } + else + { + printw("-- %-*.*s ", Width-4, Width-4, name); + } } - - printw("%02i %s", Index, name); - getyx(stdscr, _y, _x); - // Assumes max 4 digit prices - times = Width - 4 - (_x - Col); // TODO: Better handling for large prices - while(times--) addch(' '); - printw("%4i", price); + // If the item isn't availiable for sale, return -1 (so it's skipped) + if( status || (price > giUserBalance && gbDisallowSelectWithoutBalance) ) + Index = -1; + + return Index; } /** @@ -851,8 +1275,10 @@ int OpenConnection(const char *Host, int Port) fprintf(stderr, "Failed to create socket\n"); return -1; } + +// printf("geteuid() = %i, getuid() = %i\n", geteuid(), getuid()); - if( geteuid() == 0 ) + if( geteuid() == 0 || getuid() == 0 ) { int i; struct sockaddr_in localAddr; @@ -860,7 +1286,7 @@ int OpenConnection(const char *Host, int Port) localAddr.sin_family = AF_INET; // IPv4 // Loop through all the top ports until one is avaliable - for( i = 1001; i < 1024; i ++) + for( i = 512; i < 1024; i ++) { localAddr.sin_port = htons(i); // IPv4 // Attempt to bind to low port for autoauth @@ -869,12 +1295,17 @@ int OpenConnection(const char *Host, int Port) } if( i == 1024 ) printf("Warning: AUTOAUTH unavaliable\n"); +// else +// printf("Bound to 0.0.0.0:%i\n", i); } if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) { fprintf(stderr, "Failed to connect to server\n"); return -1; } + + // We're not authenticated if the connection has just opened + gbIsAuthenticated = 0; return sock; } @@ -888,9 +1319,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; @@ -912,7 +1345,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); @@ -926,7 +1360,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 @@ -972,23 +1406,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 @@ -1007,18 +1446,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); @@ -1057,13 +1496,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"); @@ -1076,6 +1515,73 @@ int GetUserBalance(int Socket) return 0; } +/** + * \brief Read an item info response from the server + * \param Dest Destination for the read item (strings will be on the heap) + */ +int ReadItemInfo(int Socket, tItem *Dest) +{ + char *buf; + int responseCode; + + regmatch_t matches[8]; + char *statusStr; + + // Get item info + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 202: break; + + case 406: + printf("Bad item name\n"); + free(buf); + return RV_BAD_ITEM; + + default: + fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n%s", responseCode, buf); + free(buf); + return RV_UNKNOWN_ERROR; + } + + RunRegex(&gItemRegex, buf, 8, matches, "Malformed server response"); + + buf[ matches[3].rm_eo ] = '\0'; + buf[ matches[5].rm_eo ] = '\0'; + buf[ matches[7].rm_eo ] = '\0'; + + statusStr = &buf[ matches[5].rm_so ]; + + Dest->ID = atoi( buf + matches[4].rm_so ); + + if( strcmp(statusStr, "avail") == 0 ) + Dest->Status = 0; + else if( strcmp(statusStr, "sold") == 0 ) + Dest->Status = 1; + else if( strcmp(statusStr, "error") == 0 ) + Dest->Status = -1; + else { + fprintf(stderr, "Unknown response from dispense server (status '%s')\n", + statusStr); + return RV_UNKNOWN_ERROR; + } + Dest->Price = atoi( buf + matches[6].rm_so ); + + // Hack a little to reduce heap fragmentation + { + char tmpType[strlen(buf + matches[3].rm_so) + 1]; + char tmpDesc[strlen(buf + matches[7].rm_so) + 1]; + strcpy(tmpType, buf + matches[3].rm_so); + strcpy(tmpDesc, buf + matches[7].rm_so); + free(buf); + Dest->Type = strdup( tmpType ); + Dest->Desc = strdup( tmpDesc ); + } + + return 0; +} /** * \brief Fill the item information structure @@ -1086,7 +1592,7 @@ void PopulateItemList(int Socket) char *buf; int responseCode; - char *itemType, *itemStart; + char *arrayType; int count, i; regmatch_t matches[4]; @@ -1099,7 +1605,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 - @@ -1109,19 +1615,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; @@ -1130,27 +1633,7 @@ void PopulateItemList(int Socket) // Fetch item information for( i = 0; i < giNumItems; i ++ ) { - regmatch_t matches[7]; - - // Get item info - buf = ReadLine(Socket); - responseCode = atoi(buf); - - if( responseCode != 202 ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - exit(-1); - } - - RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response"); - - buf[ matches[3].rm_eo ] = '\0'; - - 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); + ReadItemInfo( Socket, &gaItems[i] ); } // Read end of list @@ -1174,46 +1657,22 @@ void PopulateItemList(int Socket) */ int Dispense_ItemInfo(int Socket, const char *Type, int ID) { - int responseCode; - char *buf; - regmatch_t matches[7]; - char *type, *desc; - int id, price; + tItem item; + int ret; - // Dispense! + // Query sendf(Socket, "ITEM_INFO %s:%i\n", Type, ID); - buf = ReadLine(Socket); - - responseCode = atoi(buf); - switch( responseCode ) - { - case 202: - break; - - case 406: - printf("Bad item name\n"); - free(buf); - return 1; - - default: - printf("Unknown response code %i ('%s')\n", responseCode, buf); - free(buf); - return -1; - } - - - RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response"); - buf[ matches[3].rm_eo ] = '\0'; - - type = buf + matches[3].rm_so; buf[matches[3].rm_eo] = '\0'; - id = atoi( buf + matches[4].rm_so ); - price = atoi( buf + matches[5].rm_so ); - desc = buf + matches[6].rm_so; buf[matches[6].rm_eo] = '\0'; + ret = ReadItemInfo(Socket, &item); + if(ret) return ret; - printf("%8s:%-2i %2i.%02i %s\n", type, id, price/100, price%100, desc); + printf("%8s:%-2i %2i.%02i %s\n", + item.Type, item.ID, + item.Price/100, item.Price%100, + item.Desc); - free(buf); + free(item.Type); + free(item.Desc); return 0; } @@ -1246,27 +1705,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; } @@ -1280,38 +1739,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 amount 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; } /** @@ -1340,13 +1811,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; @@ -1362,13 +1833,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 @@ -1378,31 +1849,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: return 0; // OK + case 200: + printf("Give succeeded\n"); + 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 @@ -1420,7 +1942,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 @@ -1575,7 +2097,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); } } @@ -1623,7 +2145,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; @@ -1636,7 +2158,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); @@ -1649,19 +2171,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); @@ -1689,8 +2255,8 @@ char *ReadLine(int Socket) #if DEBUG_TRACE_SERVER printf("ReadLine: "); - #endif fflush(stdout); + #endif ret[0] = '\0'; @@ -1701,8 +2267,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 ) { @@ -1716,9 +2286,10 @@ char *ReadLine(int Socket) if( newline ) { int newLen = newline - (buf+bufPos) + 1; bufValid = len - newLen; - bufPos += newLen; + len = newLen; } if( len + bufPos == BUFSIZ - 1 ) bufPos = 0; + else bufPos += len; } #if DEBUG_TRACE_SERVER