X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=1f4485d6153430140ee2a268fbe6b5dd2e1d6499;hb=6ce2ae9922415d9f65ded1c468e45eed50758666;hp=ed7d1a22bbcf5fda3975fabf7548bb57174ea909;hpb=d40b4a892a6b06e2ef0cb72e90ebf7b023577d03;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index ed7d1a2..1f4485d 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -12,556 +12,872 @@ #include #include #include // isspace -#include -#include -#include - -#include // close -#include // gethostbyname #include // getpwuids -#include -#include -#include -#include // SHA1 +#include // close/getuid +#include // INT_MIN/INT_MAX +#include "common.h" #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 // === TYPES === -typedef struct sItem { - char *Ident; - char *Desc; - int Price; -} tItem; // === PROTOTYPES === - int ShowNCursesUI(void); -void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...); - - int sendf(int Socket, const char *Format, ...); - int OpenConnection(const char *Host, int Port); -void Authenticate(int Socket); +void ShowUsage(void); + int main(int argc, char *argv[]); +// --- Coke Server Communication --- +// --- Helpers --- char *trim(char *string); int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage); void CompileRegex(regex_t *regex, const char *pattern, int flags); // === GLOBALS === -char *gsDispenseServer = "localhost"; +char *gsDispenseServer = "merlo.ucc.gu.uwa.edu.au"; int giDispensePort = 11020; + tItem *gaItems; int giNumItems; -regex_t gArrayRegex, gItemRegex, gSaltRegex; +regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex; + int gbIsAuthenticated = 0; + +char *gsItemPattern; //!< Item pattern +char *gsEffectiveUser; //!< '-u' Dispense as another user + +enum eUI_Modes 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 *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" + " 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, responseCode, len; + 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+(.+?)\\s+(.+?)\\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+(.+)\\s+(.+)$", REG_EXTENDED); - - // Connect to server - sock = OpenConnection(gsDispenseServer, giDispensePort); - if( sock < 0 ) return -1; + CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED); + // > Code 'User' Username Balance Flags + CompileRegex(&gUserInfoRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([^ ]+)\\s+(-?[0-9]+)\\s+(.+)$", REG_EXTENDED); + // > Item Ident + CompileRegex(&gUserItemIdentRegex, "^([A-Za-z]+):([0-9]+)$", REG_EXTENDED); - // Determine what to do - if( argc > 1 ) + // Parse Arguments + for( i = 1; i < argc; i ++ ) { - if( strcmp(argv[1], "acct") == 0 ) - { - // Alter account - // List accounts - return 0; + char *arg = argv[i]; + + if( arg[0] == '-' ) + { + switch(arg[1]) + { + case 'h': + case '?': + ShowUsage(); + return 0; + + case 'c': + if( i > 2 && strcmp(argv[i-1], "type") == 0 ) + goto _default; + 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; + case 'M': // Maximum balance + if( i + 1 >= argc ) { + fprintf(stderr, "%s: -M takes an argument\n", argv[0]); + ShowUsage(); + return RV_ARGUMENTS; + } + giMaximumBalance = atoi(argv[++i]); + break; + + case 'u': // Override User + if( i + 1 >= argc ) { + fprintf(stderr, "%s: -u takes an argument\n", argv[0]); + ShowUsage(); + return RV_ARGUMENTS; + } + gsEffectiveUser = argv[++i]; + break; + + case 'H': // Override remote host + if( i + 1 >= argc ) { + fprintf(stderr, "%s: -H takes an argument\n", argv[0]); + ShowUsage(); + return RV_ARGUMENTS; + } + gsDispenseServer = argv[++i]; + break; + case 'P': // Override remote port + 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; + 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: _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; } - } - // Ask server for stock list - send(sock, "ENUM_ITEMS\n", 11, 0); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - - trim(buffer); + if( giTextArgc == MAX_TXT_ARGS ) + { + fprintf(stderr, "ERROR: Too many arguments\n"); + return RV_ARGUMENTS; + } - printf("Output: %s\n", buffer); + gsTextArgs[giTextArgc++] = argv[i]; - responseCode = atoi(buffer); - if( responseCode != 201 ) + } + + // + // `dispense finger` + // - + if( strcmp(gsTextArgs[0], "finger") == 0 ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - return -1; + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + + // Get items + PopulateItemList(sock); + + printf("The UCC Coke machine.\n\n"); + + // Only get coke slot statuses + for( i = 0; i <= 6; i ++ ) + { + const char *status; + switch(gaItems[i].Status) + { + 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); + } + + printf("\nMay your pink fish bing into the distance.\n"); + + return 0; } - - // Get item list + + // + // `dispense acct` + // - + if( strcmp(gsTextArgs[0], "acct") == 0 ) { - char *itemType, *itemStart; - int count; - regmatch_t matches[4]; + // 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 ret; + } + + // gsTextArgs[1]: Username - // Expected format: 201 Items ... - RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response"); + // Alter account? + if( giTextArgc != 2 ) + { + if( giTextArgc != 4 ) { + fprintf(stderr, "`dispense acct` requires a reason\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + + // Authentication required + ret = Authenticate(sock); + if(ret) return ret; + + // gsTextArgs[1]: Username + // gsTextArgs[2]: Ammount + // gsTextArgs[3]: Reason + char *tmp = NULL; + long int balance = strtol(gsTextArgs[2]+(gsTextArgs[2][0] == '='), &tmp, 10); + if(!tmp || *tmp != '\0') { + fprintf(stderr, "dispense acct: Value must be a decimal number of cents\n"); + return RV_ARGUMENTS; + } + + if( gsTextArgs[2][0] == '=' ) { + // Set balance + ret = Dispense_SetBalance(sock, gsTextArgs[1], balance, gsTextArgs[3]); + } + else { + // Alter balance + ret = Dispense_AlterBalance(sock, gsTextArgs[1], balance, gsTextArgs[3]); + } + } + // On error, quit + if( ret ) { + close(sock); + return ret; + } - itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0'; - count = atoi( &buffer[ matches[3].rm_so ] ); + // Show user information + ret = Dispense_ShowUser(sock, gsTextArgs[1]); - // Check array type - if( strcmp(itemType, "Items") != 0 ) { - // What the?! - fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n", - itemType); - return -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; } - itemStart = &buffer[ matches[3].rm_eo ]; + // gsTextArgs[1]: Destination + // gsTextArgs[2]: Ammount + // gsTextArgs[3]: Reason - gaItems = malloc( count * sizeof(tItem) ); + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; - for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ ) - { - char *next = strchr( ++itemStart, ' ' ); - if( next ) *next = '\0'; - gaItems[giNumItems].Ident = strdup(itemStart); - itemStart = next; + // Authenticate + ret = Authenticate(sock); + if(ret) return ret; + + char *tmp = NULL; + int amt = strtol(gsTextArgs[2], &tmp, 10); + if( !tmp || *tmp != '\0' ) { + fprintf(stderr, "dispense give: Balance is invalid, must be decimal number of cents"); + return RV_ARGUMENTS; } - } + ret = Dispense_Give(sock, gsTextArgs[1], amt, gsTextArgs[3]); + + close(sock); - // Get item information - for( i = 0; i < giNumItems; i ++ ) + return ret; + } + // + // `dispense user` + // - User administration (Admin Only) + if( strcmp(gsTextArgs[0], "user") == 0 ) { - regmatch_t matches[6]; + // Check argument count + if( giTextArgc == 1 ) { + fprintf(stderr, "Error: `dispense user` requires arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; + } - // Print item Ident - printf("%2i %s\t", i, gaItems[i].Ident); + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; - // Get item info - sendf(sock, "ITEM_INFO %s\n", gaItems[i].Ident); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); + // Attempt authentication + ret = Authenticate(sock); + if(ret) return ret; - responseCode = atoi(buffer); - if( responseCode != 202 ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - return -1; + // Add new user? + if( strcmp(gsTextArgs[1], "add") == 0 ) + { + if( giTextArgc != 3 ) { + fprintf(stderr, "Error: `dispense user add` requires an argument\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + + 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; + } + + 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; } - RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response"); - - buffer[ matches[3].rm_eo ] = '\0'; + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; - gaItems[i].Price = atoi( buffer + matches[4].rm_so ); - gaItems[i].Desc = strdup( buffer + matches[5].rm_so ); + // Attempt authentication + ret = Authenticate(sock); + if(ret) return ret; - printf("%3i %s\n", gaItems[i].Price, gaItems[i].Desc); + // 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; + } - // and choose what to dispense - - #if USE_NCURSES_INTERFACE - i = ShowNCursesUI(); - #else - - for(;;) + // 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 ) { - char *buf; - - fgets(buffer, BUFSIZ, stdin); - - buf = trim(buffer); + 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; - if( buf[0] == 'q' ) break; + 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; - i = atoi(buf); + // Check arguments + if( giTextArgc != 4 ) { + fprintf(stderr, "Error: `dispense slot` takes three arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; + } - printf("buf = '%s', atoi(buf) = %i\n", buf, i); + // 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; + } - if( i != 0 || buf[0] == '0' ) + // - New name + newname = gsTextArgs[3]; + // -- Sanity { - printf("i = %i\n", i); - - if( i < 0 || i >= giNumItems ) { - printf("Bad item (should be between 0 and %i)\n", giNumItems); - continue; + 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; + } } - break; } - } - #endif - - Authenticate(sock); - - if( i >= 0 ) - { - // Dispense! - sendf(sock, "DISPENSE %s\n", gaItems[i].Ident); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); + // 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); - responseCode = atoi(buffer); - switch( responseCode ) - { - case 200: - printf("Dispense OK\n"); - break; - case 401: - printf("Not authenticated\n"); - break; - case 402: - printf("Insufficient balance\n"); - break; - case 406: - printf("Bad item name, bug report\n"); - break; - case 500: - printf("Item failed to dispense, is the slot empty?\n"); - break; - default: - printf("Unknown response code %i ('%s')\n", responseCode, buffer); - break; - } + close(sock); + return ret; } + // Check a user's pin + else if(strcmp(gsTextArgs[0], "pincheck") == 0) + { + if( giTextArgc < 2 || giTextArgc > 3 ) { + fprintf(stderr, "Error: `dispense pincheck` takes one/two arguments\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + struct passwd *pwd = getpwuid( getuid() ); + gsUserName = strdup(pwd->pw_name); + + const char *pin = gsTextArgs[1]; + const char *user = gsUserName; + if( giTextArgc == 3 ) + user = gsTextArgs[2]; - close(sock); - - return 0; -} + + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + ret = Authenticate(sock); + if(ret) return ret; + + ret = DispenseCheckPin(sock, user, pin); + + close(sock); + return ret; + } + // Update 'your' pin + else if(strcmp(gsTextArgs[0], "pinset") == 0) + { + if( giTextArgc != 2 ) { + fprintf(stderr, "Error: `dispense pinset` takes one argument\n"); + ShowUsage(); + return RV_ARGUMENTS; + } + + const char *pin = gsTextArgs[1]; + + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + ret = Authenticate(sock); + if(ret) return ret; -void ShowItemAt(int Row, int Col, int Width, int Index) -{ - int _x, _y, times; - - move( Row, Col ); - - if( Index < 0 || Index >= giNumItems ) { - printw("%02i OOR", Index); - return ; + ret = DispenseSetPin(sock, pin); + + close(sock); + return ret; + } + // Item name / pattern + else + { + gsItemPattern = gsTextArgs[0]; } - printw("%02i %s", Index, gaItems[Index].Desc); - 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", gaItems[Index].Price); -} + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; -/** - */ -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 = 34; - const int displayMinItems = 8; - char *titleString = "Dispense"; - int itemCount = displayMinItems; - int itemBase = 0; - - int height = itemCount + 3; - int width = displayMinWidth; - - // Enter curses mode - initscr(); - raw(); noecho(); + // Get the user's balance + ret = GetUserBalance(sock); + if(ret) return ret; + + // Get items + PopulateItemList(sock); - xBase = COLS/2 - width/2; - yBase = LINES/2 - height/2; + // Disconnect from server + close(sock); - for( ;; ) + if( gsItemPattern && gsItemPattern[0] ) { - // Header - PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\"); - - // Items - for( i = 0; i < itemCount; i ++ ) + regmatch_t matches[3]; + // Door (hard coded) + if( strcmp(gsItemPattern, "door") == 0 ) + { + // Connect, Authenticate, dispense and close + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + ret = Authenticate(sock); + if(ret) return ret; + ret = DispenseItem(sock, "door", 0); + close(sock); + return ret; + } + // Item id (:) + else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 ) { - move( yBase + 1 + i, xBase ); - addch('|'); - addch(' '); + char *ident; + int id; - // Check for ... row - if( i == 0 && itemBase > 0 ) { - printw(" ..."); - times = width - 1 - 8; - while(times--) addch(' '); - } - else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) { - printw(" ..."); - times = width - 1 - 8; - while(times--) addch(' '); - } - // Show an item - else { - ShowItemAt( yBase + 1 + i, xBase + 2, width - 4, itemBase + i); - addch(' '); - } + // Get and finish ident + ident = gsItemPattern + matches[1].rm_so; + gsItemPattern[matches[1].rm_eo] = '\0'; + // Get ID + id = atoi( gsItemPattern + matches[2].rm_so ); - // Scrollbar (if needed) - if( giNumItems > itemCount ) { - if( i == 0 ) { - addch('A'); - } - else if( i == itemCount - 1 ) { - addch('V'); - } - else { - int percentage = itemBase * 100 / (giNumItems-itemCount); - if( i-1 == percentage*(itemCount-3)/100 ) { - addch('#'); - } - else { - addch('|'); - } - } - } - else { - addch('|'); - } + // Connect, Authenticate, dispense and close + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + + Dispense_ItemInfo(sock, ident, id); + + ret = Authenticate(sock); + if(ret) return ret; + ret = DispenseItem(sock, ident, id); + close(sock); + return ret; } - - // Footer - PrintAlign(yBase+height-2, xBase, width, "\\", '-', "", '-', "/"); - - // Get input - ch = getch(); - - if( ch == '\x1B' ) { - ch = getch(); - if( ch == '[' ) { - ch = getch(); - - switch(ch) + // Item number (6 = coke) + else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 ) + { + i = atoi(gsItemPattern); + } + // Item prefix + else + { + int j; + int best = -1; + for( i = 0; i < giNumItems; i ++ ) + { + // Prefix match (with case-insensitive match) + for( j = 0; gsItemPattern[j]; j ++ ) { - case 'B': - if( itemBase < giNumItems - (itemCount) ) - itemBase ++; + if( gaItems[i].Desc[j] == gsItemPattern[j] ) + continue; + if( tolower(gaItems[i].Desc[j]) == tolower(gsItemPattern[j]) ) + continue; break; - case 'A': - if( itemBase > 0 ) - itemBase --; + } + // Check if the prefix matched + if( gsItemPattern[j] != '\0' ) + continue; + + // Prefect match + if( gaItems[i].Desc[j] == '\0' ) { + best = i; break; } - } - else { + // Only one match allowed + if( best == -1 ) { + best = i; + } + else { + // TODO: Allow ambiguous matches? + // or just print a wanrning + printf("Warning - Ambiguous pattern, stopping\n"); + return RV_BAD_ITEM; + } } + + // Was a match found? + if( best == -1 ) + { + fprintf(stderr, "No item matches the passed string\n"); + return RV_BAD_ITEM; + } + + i = best; } - else { - break; - } - - } - - - // Leave - endwin(); - return -1; -} - -void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...) -{ - int lLen, mLen, rLen; - int times; - - va_list args; - - // Get the length of the strings - va_start(args, Right); - lLen = vsnprintf(NULL, 0, Left, args); - mLen = vsnprintf(NULL, 0, Mid, args); - rLen = vsnprintf(NULL, 0, Right, args); - va_end(args); - - // Sanity check - if( lLen + mLen/2 > Width/2 || mLen/2 + rLen > Width/2 ) { - return ; // TODO: What to do? } - - move(Row, Col); - - // Render strings - va_start(args, Right); - // - Left + else if( giUIMode != UI_MODE_BASIC ) { - char tmp[lLen+1]; - vsnprintf(tmp, lLen+1, Left, args); - addstr(tmp); + i = ShowNCursesUI(); } - // - Left padding - times = Width/2 - mLen/2 - lLen; - while(times--) addch(Pad1); - // - Middle + else { - char tmp[mLen+1]; - vsnprintf(tmp, mLen+1, Mid, args); - addstr(tmp); - } - // - Right Padding - times = Width/2 - mLen/2 - rLen; - while(times--) addch(Pad2); - // - Right - { - char tmp[rLen+1]; - vsnprintf(tmp, rLen+1, Right, args); - addstr(tmp); + // Very basic dispense interface + for( i = 0; i < giNumItems; i ++ ) { + // 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(;;) + { + char *buf; + + i = -1; + + fgets(buffer, BUFSIZ, stdin); + + buf = trim(buffer); + + if( buf[0] == 'q' ) break; + + i = atoi(buf); + + if( i != 0 || buf[0] == '0' ) + { + if( i < 0 || i >= giNumItems ) { + printf("Bad item %i (should be between 0 and %i)\n", i, giNumItems); + continue; + } + break; + } + } } -} - -// === HELPERS === -int sendf(int Socket, const char *Format, ...) -{ - va_list args; - int len; - va_start(args, Format); - len = vsnprintf(NULL, 0, Format, args); - va_end(args); + // Check for a valid item ID + if( i >= 0 ) { - char buf[len+1]; - va_start(args, Format); - vsnprintf(buf, len+1, Format, args); - va_end(args); + int j; + // Connect, Authenticate, dispense and close + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return RV_SOCKET_ERROR; + + ret = Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID); + if(ret) return ret; - return send(Socket, buf, len, 0); - } -} - -int OpenConnection(const char *Host, int Port) -{ - struct hostent *host; - struct sockaddr_in serverAddr; - int sock; - - host = gethostbyname(Host); - if( !host ) { - fprintf(stderr, "Unable to look up '%s'\n", Host); - return -1; - } - - memset(&serverAddr, 0, sizeof(serverAddr)); - - serverAddr.sin_family = AF_INET; // IPv4 - // NOTE: I have a suspicion that IPv6 will play sillybuggers with this :) - serverAddr.sin_addr.s_addr = *((unsigned long *) host->h_addr_list[0]); - serverAddr.sin_port = htons(Port); - - sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if( sock < 0 ) { - fprintf(stderr, "Failed to create socket\n"); - return -1; - } - - #if USE_AUTOAUTH - { - struct sockaddr_in localAddr; - memset(&localAddr, 0, sizeof(localAddr)); - localAddr.sin_family = AF_INET; // IPv4 - localAddr.sin_port = 1023; // IPv4 - // Attempt to bind to low port for autoauth - bind(sock, &localAddr, sizeof(localAddr)); - } - #endif - - if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) { - fprintf(stderr, "Failed to connect to server\n"); - return -1; - } - - return sock; -} - -void Authenticate(int Socket) -{ - struct passwd *pwd; - char buf[512]; - int responseCode; - char salt[32]; - regmatch_t matches[4]; - - // Get user name - pwd = getpwuid( getuid() ); - - // Attempt automatic authentication - sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name); - - // Check if it worked - recv(Socket, buf, 511, 0); - trim(buf); - - responseCode = atoi(buf); - switch( responseCode ) - { - case 200: // Authenticated, return :) - return ; - case 401: // Untrusted, attempt password authentication - sendf(Socket, "USER %s\n", pwd->pw_name); - printf("Using username %s\n", pwd->pw_name); + ret = Authenticate(sock); + if(ret) return ret; - recv(Socket, buf, 511, 0); - trim(buf); - // TODO: Get Salt - // Expected format: 100 SALT ... - // OR : 100 User Set - RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response"); - if( atoi(buf) != 100 ) { - exit(-1); // ERROR - } - if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) { - // Set salt - memcpy( salt, buf + matches[3].rm_so, matches[3].rm_eo - matches[3].rm_so ); - salt[ matches[3].rm_eo - matches[3].rm_so ] = 0; -// printf("Salt: '%s'\n", salt); + for( j = 0; j < giDispenseCount; j ++ ) { + ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID); + if( ret ) break; } - - fflush(stdout); - { - int ofs = strlen(pwd->pw_name)+strlen(salt); - char tmp[ofs+20]; - char *pass = getpass("Password: "); - uint8_t h[20]; - - strcpy(tmp, pwd->pw_name); - strcat(tmp, salt); - SHA1( (unsigned char*)pass, strlen(pass), h ); - memcpy(tmp+ofs, h, 20); - - // Hash all that - SHA1( (unsigned char*)tmp, ofs+20, h ); - sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9], - h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19] - ); -// printf("Final hash: '%s'\n", buf); - fflush(stdout); // Debug + if( j > 1 ) { + printf("%i items dispensed\n", j); } - - sendf(Socket, "PASS %s\n", buf); - recv(Socket, buf, 511, 0); - break; - case 404: // Bad Username - fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); - exit(-1); - default: - fprintf(stderr, "Unkown response code %i from server\n", responseCode); - printf("%s\n", buf); - exit(-1); + Dispense_ShowUser(sock, gsUserName); + close(sock); + } - - printf("%s\n", buf); + + return ret; } +// --------------- +// --- Helpers --- +// --------------- char *trim(char *string) { int i; @@ -585,7 +901,7 @@ int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *match int ret; ret = regexec(regex, string, nMatches, matches, 0); - if( ret ) { + if( ret && errorMessage ) { size_t len = regerror(ret, regex, NULL, 0); char errorStr[len]; regerror(ret, regex, errorStr, len);