X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=bb159059d1011df5ecffe8ff64552ee08762c36f;hb=4343d1b16536d868dce734fdf3a8debf6f7bf890;hp=ee93227ce39fec34540561ce2cb9dc2a39f93bd6;hpb=e8eeeea6601e87792db47236feaad02a5f36e62e;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index ee93227..bb15905 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -14,6 +14,7 @@ #include // isspace #include #include +#include #include // close #include // gethostbyname @@ -21,6 +22,9 @@ #include #include #include +#include // SHA1 + +#define USE_NCURSES_INTERFACE 0 // === TYPES === typedef struct sItem { @@ -30,9 +34,17 @@ typedef struct sItem { } tItem; // === PROTOTYPES === - int sendf(int Socket, const char *Format, ...); +// --- GUI --- + int ShowNCursesUI(void); +void ShowItemAt(int Row, int Col, int Width, int Index); +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); -void Authenticate(int Socket); + int Authenticate(int Socket); +void PopulateItemList(int Socket); + int DispenseItem(int Socket, int ItemID); +// --- Helpers --- + int sendf(int Socket, const char *Format, ...); 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); @@ -42,204 +54,363 @@ char *gsDispenseServer = "localhost"; int giDispensePort = 11020; tItem *gaItems; int giNumItems; -regex_t gArrayRegex; -regex_t gItemRegex; +regex_t gArrayRegex, gItemRegex, gSaltRegex; + +char *gsOverrideUser; //!< '-u' argument (dispense as another user) + int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? // === CODE === int main(int argc, char *argv[]) { int sock; - int i, responseCode, len; + int i; char buffer[BUFSIZ]; // -- 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); + CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\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; - // Determine what to do - if( argc > 1 ) + // Authenticate + Authenticate(sock); + + // Parse Arguments + for( i = 1; i < argc; i ++ ) { - if( strcmp(argv[1], "acct") == 0 ) - { + char *arg = argv[i]; + + if( arg[0] == '-' ) + { + switch(arg[1]) + { + case 'u': // Override User + gsOverrideUser = argv[++i]; + break; + + case 'G': // Use GUI + gbUseNCurses = 1; + break; + } + + continue; + } + + if( strcmp(argv[1], "acct") == 0 ) { // Alter account // List accounts return 0; } + else { + // Item name / pattern + } } - // Ask server for stock list - send(sock, "ENUM_ITEMS\n", 11, 0); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; + // Get items + PopulateItemList(sock); - trim(buffer); - - printf("Output: %s\n", buffer); - - responseCode = atoi(buffer); - if( responseCode != 201 ) + if( gbUseNCurses ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - return -1; + i = ShowNCursesUI(); } - - // Get item list + else { - char *itemType, *itemStart; - int count; - regmatch_t matches[4]; - - // Expected format: 201 Items ... - RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response"); - - itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0'; - count = atoi( &buffer[ matches[3].rm_so ] ); - - // Check array type - if( strcmp(itemType, "Items") != 0 ) { - // What the?! - fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n", - itemType); - return -1; + for( i = 0; i < giNumItems; i ++ ) { + printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc); } - - itemStart = &buffer[ matches[3].rm_eo ]; - - gaItems = malloc( count * sizeof(tItem) ); - - for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ ) + printf(" q Quit\n"); + for(;;) { - char *next = strchr( ++itemStart, ' ' ); - if( next ) *next = '\0'; - gaItems[giNumItems].Ident = strdup(itemStart); - itemStart = next; + 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; + } } } - // Get item information - for( i = 0; i < giNumItems; i ++ ) - { - regmatch_t matches[6]; - - // Print item Ident - printf("%2i %s\t", i, gaItems[i].Ident); - - // Get item info - sendf(sock, "ITEM_INFO %s\n", gaItems[i].Ident); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); - - responseCode = atoi(buffer); - if( responseCode != 202 ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - return -1; - } - - RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response"); - - buffer[ matches[3].rm_eo ] = '\0'; - - gaItems[i].Price = atoi( buffer + matches[4].rm_so ); - gaItems[i].Desc = strdup( buffer + matches[5].rm_so ); - - printf("%3i %s\n", gaItems[i].Price, gaItems[i].Desc); - } - - Authenticate(sock); - - // and choose what to dispense + // Check for a valid item ID + if( i >= 0 ) + DispenseItem(sock, i); + + close(sock); + + return 0; +} + +// ------------------- +// --- NCurses GUI --- +// ------------------- +/** + * \brief Render the NCurses UI + */ +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; + char *titleString = "Dispense"; + int itemCount = displayMinItems; + int itemBase = 0; + int currentItem = 0; + int ret = -2; // -2: Used for marking "no return yet" + + int height, width; + + // Enter curses mode + initscr(); + raw(); noecho(); + + // Get item count + // - 6: randomly chosen (Need at least 3) + itemCount = LINES - 6; + if( itemCount > giNumItems ) + itemCount = giNumItems; + + // Get dimensions + height = itemCount + 3; + width = displayMinWidth; + + // Get positions + xBase = COLS/2 - width/2; + yBase = LINES/2 - height/2; - for(;;) + for( ;; ) { - char *buf; - - fgets(buffer, BUFSIZ, stdin); - - buf = trim(buffer); - - if( buf[0] == 'q' ) break; - - i = atoi(buf); + // Header + PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\"); - printf("buf = '%s', atoi(buf) = %i\n", buf, i); - - if( i != 0 || buf[0] == '0' ) + // Items + for( i = 0; i < itemCount; i ++ ) { - printf("i = %i\n", i); + move( yBase + 1 + i, xBase ); - if( i < 0 || i >= giNumItems ) { - printf("Bad item (should be between 0 and %i)\n", giNumItems); - continue; + if( currentItem == itemBase + i ) { + printw("| -> "); + } + else { + printw("| "); } - sendf(sock, "DISPENSE %s\n", gaItems[i].Ident); - - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); + // Check for ... 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; + while(times--) addch(' '); + } + // Show an item + else { + ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i); + addch(' '); + } - responseCode = atoi(buffer); - switch( responseCode ) + // 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('|'); + } + } + + // Footer + PrintAlign(yBase+height-2, xBase, width, "\\", '-', "", '-', "/"); + + // Get input + ch = getch(); + + if( ch == '\x1B' ) { + ch = getch(); + if( ch == '[' ) { + ch = getch(); + + switch(ch) + { + case 'B': + //if( itemBase < giNumItems - (itemCount) ) + // itemBase ++; + if( currentItem < giNumItems - 1 ) + currentItem ++; + if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems ) + itemBase ++; + break; + case 'A': + //if( itemBase > 0 ) + // itemBase --; + if( currentItem > 0 ) + currentItem --; + if( itemBase + 1 > currentItem && itemBase > 0 ) + itemBase --; + break; + } + } + else { + + } + } + else { + switch(ch) { - case 200: - printf("Dispense OK\n"); + case '\n': + ret = currentItem; 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\n", responseCode); + case 'q': + ret = -1; // -1: Return with no dispense break; } - break; + // Check if the return value was changed + if( ret != -2 ) break; } + } + + + // Leave + endwin(); + return ret; +} - close(sock); +/** + * \brief Show item \a Index at (\a Col, \a Row) + * \note Part of the NCurses UI + */ +void ShowItemAt(int Row, int Col, int Width, int Index) +{ + int _x, _y, times; + char *name; + int price; + + move( Row, Col ); + + if( Index < 0 || Index >= giNumItems ) { + name = "OOR"; + price = 0; + } + else { + name = gaItems[Index].Desc; + price = gaItems[Index].Price; + } - return 0; + 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); } -// === HELPERS === -int sendf(int Socket, const char *Format, ...) +/** + * \brief Print a three-part string at the specified position (formatted) + * \note NCurses UI Helper + * + * Prints \a Left on the left of the area, \a Right on the righthand side + * and \a Mid in the middle of the area. These are padded with \a Pad1 + * between \a Left and \a Mid, and \a Pad2 between \a Mid and \a Right. + * + * ::printf style format codes are allowed in \a Left, \a Mid and \a Right, + * and the arguments to these are read in that order. + */ +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; - int len; - va_start(args, Format); - len = vsnprintf(NULL, 0, Format, 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 { - char buf[len+1]; - va_start(args, Format); - vsnprintf(buf, len+1, Format, args); - va_end(args); - - return send(Socket, buf, len, 0); + char tmp[lLen+1]; + vsnprintf(tmp, lLen+1, Left, args); + addstr(tmp); + } + // - Left padding + times = Width/2 - mLen/2 - lLen; + while(times--) addch(Pad1); + // - Middle + { + 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); } } +// --------------------- +// --- Coke Protocol --- +// --------------------- int OpenConnection(const char *Host, int Port) { struct hostent *host; @@ -284,11 +455,18 @@ int OpenConnection(const char *Host, int Port) return sock; } -void Authenticate(int Socket) +/** + * \brief Authenticate with the server + * \return Boolean Failure + */ +int Authenticate(int Socket) { struct passwd *pwd; char buf[512]; int responseCode; + char salt[32]; + int i; + regmatch_t matches[4]; // Get user name pwd = getpwuid( getuid() ); @@ -304,19 +482,223 @@ void Authenticate(int Socket) switch( responseCode ) { case 200: // Authenticated, return :) - return ; + return 0; case 401: // Untrusted, attempt password authentication - break; + sendf(Socket, "USER %s\n", pwd->pw_name); + printf("Using username %s\n", pwd->pw_name); + + 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"); + responseCode = atoi(buf); + if( responseCode != 100 ) { + fprintf(stderr, "Unknown repsonse code %i from server\n", responseCode); + return -1; // ERROR + } + + // Check for salt + if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) { + 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; + } + + // Get password + fflush(stdout); + + // Give three attempts + for( i = 0; i < 3; i ++ ) + { + int ofs = strlen(pwd->pw_name)+strlen(salt); + 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(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] + ); + fflush(stdout); // Debug + + // Send password + sendf(Socket, "PASS %s\n", buf); + recv(Socket, buf, 511, 0); + + 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", responseCode); + return -1; + } + return 2; // 2 = Bad Password + case 404: // Bad Username fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); - exit(-1); + return 1; + default: fprintf(stderr, "Unkown response code %i from server\n", responseCode); printf("%s\n", buf); - exit(-1); + return -1; } printf("%s\n", buf); + return 0; // Seems OK +} + +void PopulateItemList(int Socket) +{ + char buffer[BUFSIZ]; + int len; + int responseCode; + + char *itemType, *itemStart; + int count, i; + regmatch_t matches[4]; + + // Ask server for stock list + send(Socket, "ENUM_ITEMS\n", 11, 0); + len = recv(Socket, buffer, BUFSIZ-1, 0); + buffer[len] = '\0'; + + trim(buffer); + + //printf("Output: %s\n", buffer); + + responseCode = atoi(buffer); + if( responseCode != 201 ) { + fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); + exit(-1); + } + + // - Get item list - + + // Expected format: 201 Items ... + RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response"); + + itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0'; + count = atoi( &buffer[ matches[3].rm_so ] ); + + // Check array type + if( strcmp(itemType, "Items") != 0 ) { + // What the?! + fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n", + itemType); + exit(-1); + } + + itemStart = &buffer[ matches[3].rm_eo ]; + + gaItems = malloc( count * sizeof(tItem) ); + + for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ ) + { + char *next = strchr( ++itemStart, ' ' ); + if( next ) *next = '\0'; + gaItems[giNumItems].Ident = strdup(itemStart); + itemStart = next; + } + + // Fetch item information + for( i = 0; i < giNumItems; i ++ ) + { + regmatch_t matches[6]; + + // Get item info + sendf(Socket, "ITEM_INFO %s\n", gaItems[i].Ident); + len = recv(Socket, buffer, BUFSIZ-1, 0); + buffer[len] = '\0'; + trim(buffer); + + responseCode = atoi(buffer); + if( responseCode != 202 ) { + fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); + exit(-1); + } + + RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response"); + + buffer[ matches[3].rm_eo ] = '\0'; + + gaItems[i].Price = atoi( buffer + matches[4].rm_so ); + gaItems[i].Desc = strdup( buffer + matches[5].rm_so ); + } +} + +int DispenseItem(int Socket, int ItemID) +{ + int len, responseCode; + char buffer[BUFSIZ]; + + if( ItemID < 0 || ItemID > giNumItems ) return -1; + + // Dispense! + sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident); + len = recv(Socket, buffer, BUFSIZ-1, 0); + buffer[len] = '\0'; + trim(buffer); + + responseCode = atoi(buffer); + switch( responseCode ) + { + case 200: + printf("Dispense OK\n"); + return 0; + case 401: + printf("Not authenticated\n"); + return 1; + case 402: + printf("Insufficient balance\n"); + return 1; + case 406: + printf("Bad item name, bug report\n"); + return 1; + case 500: + printf("Item failed to dispense, is the slot empty?\n"); + return 1; + case 501: + printf("Dispense not possible (slot empty/permissions)\n"); + return 1; + default: + printf("Unknown response code %i ('%s')\n", responseCode, buffer); + return -2; + } +} + +// --------------- +// --- 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); + + { + char buf[len+1]; + va_start(args, Format); + vsnprintf(buf, len+1, Format, args); + va_end(args); + + return send(Socket, buf, len, 0); + } } char *trim(char *string)