X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=c1883b4f14bf86eb619e46edc9b2e52b0361a8bf;hb=2f6ba83a4dbe0c6c9cfdd991f0f72f2a4f018b27;hp=71f58f90ba15795ae0ce2b6b4da08608eddf4707;hpb=4fef498619ca05876568c6bc5114fadd7c2496ee;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 71f58f9..c1883b4 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -23,7 +23,7 @@ #include #include #include -#include // SHA1 +//#include // SHA1 #define USE_NCURSES_INTERFACE 0 #define DEBUG_TRACE_SERVER 0 @@ -87,7 +87,8 @@ void PopulateItemList(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, ...); @@ -96,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; @@ -106,68 +107,113 @@ regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex char *gsItemPattern; //!< Item pattern char *gsEffectiveUser; //!< '-u' Dispense as another user + 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" - " == 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 refund []\n" - " Refund an item to a user (with optional price override)\n" - " == Dispense administrators ==\n" - " dispense acct = \"\"\n" - " Set an account balance\n" - " 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" - "\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 alternate GUI\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" - ); + 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[]) @@ -175,10 +221,8 @@ 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 ... @@ -263,6 +307,17 @@ int main(int argc, char *argv[]) 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; @@ -272,55 +327,112 @@ int main(int argc, char *argv[]) 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: - if( !isdigit(argv[i][0]) ) { + // 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( text_argc + 1 == MAX_TXT_ARGS ) + if( giTextArgc == MAX_TXT_ARGS ) { fprintf(stderr, "ERROR: Too many arguments\n"); 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 RV_ARGUMENTS; } - text_args[text_argc++] = argv[i]; + gsTextArgs[giTextArgc++] = argv[i]; } + // + // `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); + + 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; + } + // // `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 RV_SOCKET_ERROR; // List accounts? - if( text_argc == 1 ) { + if( giTextArgc == 1 ) { ret = Dispense_EnumUsers(sock); close(sock); return ret; } - // text_args[1]: Username + // gsTextArgs[1]: Username // Alter account? - if( text_argc != 2 ) + if( giTextArgc != 2 ) { - if( text_argc != 4 ) { + if( giTextArgc != 4 ) { fprintf(stderr, "`dispense acct` requires a reason\n"); ShowUsage(); return RV_ARGUMENTS; @@ -330,28 +442,32 @@ int main(int argc, char *argv[]) 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); } - ret = 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 - ret = Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]); + ret = Dispense_AlterBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]); } } - // TODO: Preserve ret if non-zero + // On error, quit + if( ret ) { + close(sock); + return ret; + } // Show user information - ret = Dispense_ShowUser(sock, text_args[1]); + ret = Dispense_ShowUser(sock, gsTextArgs[1]); close(sock); return ret; @@ -359,17 +475,17 @@ int main(int argc, char *argv[]) // // `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 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); @@ -379,7 +495,7 @@ int main(int argc, char *argv[]) ret = Authenticate(sock); if(ret) return ret; - 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); @@ -388,10 +504,10 @@ int main(int argc, char *argv[]) // // `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(); return RV_ARGUMENTS; @@ -406,26 +522,29 @@ int main(int argc, char *argv[]) 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(); return RV_ARGUMENTS; } - ret = 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(); return RV_ARGUMENTS; } - ret = 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 { @@ -437,10 +556,10 @@ int main(int argc, char *argv[]) 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(); return RV_ARGUMENTS; @@ -455,18 +574,18 @@ int main(int argc, char *argv[]) if(ret) return ret; // Do donation - ret = Dispense_Donate(sock, atoi(text_args[1]), text_args[2]); + ret = Dispense_Donate(sock, atoi(gsTextArgs[1]), gsTextArgs[2]); close(sock); return ret; } // Refund an item - else if( strcmp(text_args[0], "refund") == 0 ) + else if( strcmp(gsTextArgs[0], "refund") == 0 ) { int price = 0; // Check argument count - if( text_argc != 3 && text_argc != 4 ) { + if( giTextArgc != 3 && giTextArgc != 4 ) { fprintf(stderr, "Error: `dispense refund` takes 2 or 3 arguments\n"); ShowUsage(); return RV_ARGUMENTS; @@ -480,8 +599,8 @@ int main(int argc, char *argv[]) ret = Authenticate(sock); if(ret) return ret; - if( text_argc == 4 ) { - price = atoi(text_args[3]); + if( giTextArgc == 4 ) { + price = atoi(gsTextArgs[3]); if( price <= 0 ) { fprintf(stderr, "Error: Override price is invalid (should be > 0)\n"); return RV_ARGUMENTS; @@ -489,32 +608,32 @@ int main(int argc, char *argv[]) } // Username, Item, cost - ret = Dispense_Refund(sock, text_args[1], text_args[2], price); + ret = Dispense_Refund(sock, gsTextArgs[1], gsTextArgs[2], price); // TODO: More close(sock); - return RV_UNKNOWN_ERROR; + 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(); 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"); 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 RV_SOCKET_ERROR; @@ -523,9 +642,65 @@ int main(int argc, char *argv[]) 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 = text_args[0]; + else + { + gsItemPattern = gsTextArgs[0]; } // Connect to server @@ -697,7 +872,9 @@ int main(int argc, char *argv[]) if( j > 1 ) { printf("%i items dispensed\n", j); } + Dispense_ShowUser(sock, gsUserName); close(sock); + } return ret; @@ -714,9 +891,9 @@ int ShowNCursesUI(void) int ch; int i, times; int xBase, yBase; - const int displayMinWidth = 40; + const int displayMinWidth = 50; char *titleString = "Dispense"; - int itemCount; + int items_in_view; int maxItemIndex; int itemBase = 0; int currentItem; @@ -727,7 +904,37 @@ int ShowNCursesUI(void) struct passwd *pwd; int height, width; - + + void _ItemDown(void) + { + currentItem ++; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem ++; + + if( currentItem >= maxItemIndex ) { + currentItem = 0; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem ++; + } + } + + void _ItemUp(void) + { + currentItem --; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem --; + + if( currentItem < 0 ) { + currentItem = maxItemIndex - 1; + // Skip over spacers + while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) + currentItem --; + } + } + // Get Username if( gsEffectiveUser ) username = gsEffectiveUser; @@ -736,7 +943,7 @@ int ShowNCursesUI(void) username = pwd->pw_name; } // Get balance - snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100); + snprintf(balance_str, sizeof(balance_str), "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100); // Enter curses mode initscr(); @@ -746,9 +953,9 @@ int ShowNCursesUI(void) maxItemIndex = ShowItemAt(0, 0, 0, -1, 0); // Get item count per screen // - 6: randomly chosen (Need at least 3) - itemCount = LINES - 6; - if( itemCount > maxItemIndex ) - itemCount = maxItemIndex; + 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 ) @@ -756,7 +963,7 @@ int ShowNCursesUI(void) // Get dimensions - height = itemCount + 3; + height = items_in_view + 3; width = displayMinWidth; // Get positions @@ -769,7 +976,7 @@ 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; @@ -781,7 +988,7 @@ int ShowNCursesUI(void) // Check for the '...' row // - Oh god, magic numbers! if( (i == 0 && itemBase > 0) - || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) ) + || (i == items_in_view - 1 && itemBase < maxItemIndex - items_in_view) ) { printw(" ..."); pos += 8; times = (width - pos) - 1; @@ -799,16 +1006,16 @@ int ShowNCursesUI(void) } // Scrollbar (if needed) - if( maxItemIndex > 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 / (maxItemIndex-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 { @@ -840,42 +1047,13 @@ int ShowNCursesUI(void) switch(ch) { - case 'B': - currentItem ++; - // Skip over spacers - while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) - currentItem ++; - - if( currentItem >= maxItemIndex ) { - currentItem = 0; - // Skip over spacers - while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) - currentItem ++; - } - break; - case 'A': - currentItem --; - // Skip over spacers - while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) - currentItem --; - - if( currentItem < 0 ) { - currentItem = maxItemIndex - 1; - // Skip over spacers - while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 ) - currentItem --; - } - break; + case 'B': _ItemDown(); break; + case 'A': _ItemUp(); break; } } else { } - - if( itemCount > maxItemIndex && currentItem < itemBase + 2 && itemBase > 0 ) - itemBase = currentItem - 2; - if( itemCount > maxItemIndex && currentItem > itemBase + itemCount - 2 && itemBase < maxItemIndex-1 ) - itemBase = currentItem - itemCount + 2; } else { switch(ch) @@ -883,6 +1061,10 @@ int ShowNCursesUI(void) case '\n': ret = ShowItemAt(0, 0, 0, currentItem, 0); break; + case 'h': break; + case 'j': _ItemDown(); break; + case 'k': _ItemUp(); break; + case 'l': break; case 0x1b: // Escape case 'q': ret = -1; // -1: Return with no dispense @@ -893,6 +1075,21 @@ int ShowNCursesUI(void) if( ret != -2 ) break; } + // Scroll only if needed + if( items_in_view < maxItemIndex ) + { + // - 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; + } + } } @@ -908,7 +1105,6 @@ int ShowNCursesUI(void) */ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) { - int _x, _y, times; char *name = NULL; int price = 0; int status = -1; @@ -962,7 +1158,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) if( Width > 0 ) { // 4 preceding, 5 price - int nameWidth = Width - 4 - 5; + int nameWidth = Width - 4 - snprintf(NULL, 0, " %4i", price); move( Row, Col ); if( Index >= 0 ) @@ -988,25 +1184,16 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) printw("%-*.*s", nameWidth, nameWidth, name); -// getyx(stdscr, _y, _x); - // Assumes max 4 digit prices -// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices -// while(times--) addch(' '); - printw(" %4i", price); } else { - printw("-- %s", name); - getyx(stdscr, _y, _x); - times = Width - 4 - (_x - Col); - while(times--) addch(' '); - printw(" "); + printw("-- %-*.*s ", Width-4, Width-4, name); } } // If the item isn't availiable for sale, return -1 (so it's skipped) - if( status ) + if( status || (price > giUserBalance && gbDisallowSelectWithoutBalance) ) Index = -1; return Index; @@ -1136,28 +1323,53 @@ int OpenConnection(const char *Host, int Port) return sock; } -/** - * \brief Authenticate with the server - * \return Boolean Failure - */ -int Authenticate(int Socket) +int Authenticate_AutoAuth(int Socket, const char *Username) { - struct passwd *pwd; char *buf; int responseCode; - #if ATTEMPT_PASSWORD_AUTH - char salt[32]; - int i; - regmatch_t matches[4]; - #endif + int ret = -1; - if( gbIsAuthenticated ) return 0; + // Attempt automatic authentication + sendf(Socket, "AUTOAUTH %s\n", Username); - // Get user name - pwd = getpwuid( getuid() ); + // Check if it worked + buf = ReadLine(Socket); + + responseCode = atoi(buf); + switch( responseCode ) + { + case 200: // Autoauth succeeded, return + ret = 0; + break; + + case 401: // Untrusted +// fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n"); + ret = RV_PERMISSIONS; + break; + case 404: // Bad Username + fprintf(stderr, "Bad Username '%s'\n", Username); + ret = RV_INVALID_USER; + break; + + default: + fprintf(stderr, "Unkown response code %i from server\n", responseCode); + printf("%s\n", buf); + ret = RV_UNKNOWN_ERROR; + break;; + } + + free(buf); + return ret; +} + +int Authenticate_AuthIdent(int Socket) +{ + char *buf; + int responseCode; + int ret = -1; // Attempt automatic authentication - sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name); + sendf(Socket, "AUTHIDENT\n"); // Check if it worked buf = ReadLine(Socket); @@ -1166,98 +1378,131 @@ int Authenticate(int Socket) switch( responseCode ) { case 200: // Autoauth succeeded, return - free(buf); + ret = 0; break; - case 401: // Untrusted, attempt password authentication - free(buf); + case 401: // Untrusted +// fprintf(stderr, "Untrusted host, AUTHIDENT unavaliable\n"); + ret = RV_PERMISSIONS; + break; + + default: + fprintf(stderr, "Unkown response code %i from server\n", responseCode); + printf("%s\n", buf); + ret = RV_UNKNOWN_RESPONSE; + break; + } + + free(buf); - #if ATTEMPT_PASSWORD_AUTH - sendf(Socket, "USER %s\n", pwd->pw_name); - printf("Using username %s\n", pwd->pw_name); - - buf = ReadLine(Socket); - - // TODO: Get Salt - // Expected format: 100 SALT ... - // OR : 100 User Set - RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response"); - responseCode = atoi(buf); - if( responseCode != 100 ) { - fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); - free(buf); - return RV_UNKNOWN_ERROR; // ERROR - } - - // Check for salt - if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) { - // Store it for later - 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; - } + return ret; +} + +int Authenticate_Password(int Socket, const char *Username) +{ + #if USE_PASSWORD_AUTH + char *buf; + int responseCode; + char salt[32]; + int i; + regmatch_t matches[4]; + + sendf(Socket, "USER %s\n", Username); + printf("Using username %s\n", Username); + + buf = ReadLine(Socket); + + // TODO: Get Salt + // Expected format: 100 SALT ... + // OR : 100 User Set + RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response"); + responseCode = atoi(buf); + if( responseCode != 100 ) { + fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); free(buf); + return RV_UNKNOWN_ERROR; // ERROR + } + + // Check for salt + if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) { + // Store it for later + 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; + } + free(buf); + + // Give three attempts + for( i = 0; i < 3; i ++ ) + { + int ofs = strlen(Username)+strlen(salt); + char tmpBuf[42]; + char tmp[ofs+20]; + char *pass = getpass("Password: "); + uint8_t h[20]; - // Give three attempts - for( i = 0; i < 3; i ++ ) - { - int ofs = strlen(pwd->pw_name)+strlen(salt); - char tmpBuf[42]; - char tmp[ofs+20]; - char *pass = getpass("Password: "); - uint8_t h[20]; - - // Create hash string - // - 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(tmpBuf, "%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] - ); - - // Send password - sendf(Socket, "PASS %s\n", tmpBuf); - buf = ReadLine(Socket); - - responseCode = atoi(buf); - // Auth OK? - if( responseCode == 200 ) break; - // Bad username/password - if( responseCode == 401 ) continue; - - fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); - free(buf); - return RV_UNKNOWN_ERROR; - } - free(buf); - if( i == 3 ) - return RV_INVALID_USER; // 2 = Bad Password + // Create hash string + // + strcpy(tmp, Username); + strcat(tmp, salt); + SHA1( (unsigned char*)pass, strlen(pass), h ); + memcpy(tmp+ofs, h, 20); - #else - fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n"); - return RV_INVALID_USER; - #endif - break; + // Hash all that + SHA1( (unsigned char*)tmp, ofs+20, h ); + sprintf(tmpBuf, "%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] + ); - case 404: // Bad Username - fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); - free(buf); - return RV_INVALID_USER; + // Send password + sendf(Socket, "PASS %s\n", tmpBuf); + buf = ReadLine(Socket); - default: - fprintf(stderr, "Unkown response code %i from server\n", responseCode); - printf("%s\n", buf); + responseCode = atoi(buf); + // Auth OK? + if( responseCode == 200 ) break; + // Bad username/password + if( responseCode == 401 ) continue; + + fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); free(buf); - return RV_UNKNOWN_ERROR; + return -1; } + free(buf); + if( i == 3 ) + return RV_INVALID_USER; // 2 = Bad Password + + return 0; + #else + return RV_INVALID_USER; + #endif +} + +/** + * \brief Authenticate with the server + * \return Boolean Failure + */ +int Authenticate(int Socket) +{ + struct passwd *pwd; + if( gbIsAuthenticated ) return 0; + + // Get user name + pwd = getpwuid( getuid() ); + + // Attempt AUTOAUTH + if( Authenticate_AutoAuth(Socket, pwd->pw_name) == 0 ) + ; + else if( Authenticate_AuthIdent(Socket) == 0 ) + ; + else if( Authenticate_Password(Socket, pwd->pw_name) == 0 ) + return RV_INVALID_USER; + // Set effective user if( gsEffectiveUser ) { + char *buf; + int responseCode; sendf(Socket, "SETEUSER %s\n", gsEffectiveUser); buf = ReadLine(Socket); @@ -1418,7 +1663,7 @@ void PopulateItemList(int Socket) char *buf; int responseCode; - char *itemType, *itemStart; + char *arrayType; int count, i; regmatch_t matches[4]; @@ -1441,19 +1686,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); + arrayType); exit(RV_UNKNOWN_ERROR); } - - itemStart = &buf[ matches[3].rm_eo ]; - free(buf); giNumItems = count; @@ -1568,7 +1810,7 @@ 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 ) { @@ -1578,7 +1820,7 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c // Sanity if( Ammount == 0 ) { - printf("An ammount would be nice\n"); + printf("An amount would be nice\n"); return RV_ARGUMENTS; } @@ -1586,26 +1828,32 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c 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 RV_BAD_ITEM; + rv = RV_BAD_ITEM; + break; case 403: // Not in coke fprintf(stderr, "You are not in coke (sucker)\n"); - return RV_PERMISSIONS; + rv = RV_PERMISSIONS; + break; case 404: // Unknown user fprintf(stderr, "Unknown user '%s'\n", Username); - return RV_INVALID_USER; + rv = RV_INVALID_USER; + break; default: - fprintf(stderr, "Unknown response code %i\n", responseCode); - return RV_UNKNOWN_RESPONSE; + fprintf(stderr, "Unknown response code %i\n'%s'\n", responseCode, buf); + rv = RV_UNKNOWN_RESPONSE; + break; } + free(buf); - return -1; + return rv; } /** @@ -1920,7 +2168,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); } } @@ -1968,7 +2216,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; @@ -1981,7 +2229,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); @@ -1994,19 +2242,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); @@ -2034,8 +2326,8 @@ char *ReadLine(int Socket) #if DEBUG_TRACE_SERVER printf("ReadLine: "); - #endif fflush(stdout); + #endif ret[0] = '\0'; @@ -2046,8 +2338,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 ) { @@ -2061,9 +2357,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