X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=33f3fe41e5f53f2e9c520982bd24578552b5146b;hb=5df82cb2854e4f7c693c8a31e0c2d56682a93855;hp=3dd5e2f6b06328b3f1d46e8e09f6069a414fabc0;hpb=41582cb84bded83614e11b1c115deea13e1914cc;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 3dd5e2f..33f3fe4 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -34,16 +34,25 @@ typedef struct sItem { } tItem; // === PROTOTYPES === + int main(int argc, char *argv[]); +void ShowUsage(void); +// --- 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, ...); - - int sendf(int Socket, const char *Format, ...); - +// --- Coke Server Communication --- int OpenConnection(const char *Host, int Port); int Authenticate(int Socket); void PopulateItemList(int Socket); int DispenseItem(int Socket, int ItemID); - + int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason); + int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason); + int Dispense_EnumUsers(int Socket); + int Dispense_ShowUser(int Socket, const char *Username); +void _PrintUserLine(const char *Line); +// --- Helpers --- +char *ReadLine(int Socket); + 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); @@ -51,11 +60,15 @@ void CompileRegex(regex_t *regex, const char *pattern, int flags); // === GLOBALS === char *gsDispenseServer = "localhost"; int giDispensePort = 11020; + tItem *gaItems; int giNumItems; -regex_t gArrayRegex, gItemRegex, gSaltRegex; +regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex; + int gbIsAuthenticated = 0; -char *gsOverrideUser; +char *gsOverrideUser; //!< '-u' argument (dispense as another user) + int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? + int giSocket = -1; // === CODE === int main(int argc, char *argv[]) @@ -70,47 +83,103 @@ int main(int argc, char *argv[]) // > Code Type Ident Price Desc 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; - - // Authenticate - Authenticate(sock); + 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); // Parse Arguments for( i = 1; i < argc; i ++ ) { char *arg = argv[i]; - if( arg[0] == '-' ) { - + if( arg[0] == '-' ) + { switch(arg[1]) { + case 'h': + case '?': + ShowUsage(); + return 0; + 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 + + if( strcmp(arg, "acct") == 0 ) + { + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // List accounts? + if( i + 1 == argc ) { + Dispense_EnumUsers(sock); + return 0; + } + + // argv[i+1]: Username + + // Alter account? + if( i + 2 < argc ) { + + if( i + 3 >= argc ) { + fprintf(stderr, "Error: `dispense acct' needs a reason\n"); + exit(1); + } + + // Authentication required + Authenticate(sock); + + // argv[i+1]: Username + // argv[i+2]: Ammount + // argv[i+3]: Reason + + if( argv[i+2][0] == '=' ) { + // Set balance + 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]); + } + } + + Dispense_ShowUser(sock, argv[i+1]); + + close(sock); return 0; } else { // Item name / pattern + break; } } + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // Authenticate + Authenticate(sock); // Get items PopulateItemList(sock); - #if USE_NCURSES_INTERFACE + if( gbUseNCurses ) + { i = ShowNCursesUI(); - #else + } + else + { for( i = 0; i < giNumItems; i ++ ) { printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc); } @@ -138,7 +207,7 @@ int main(int argc, char *argv[]) break; } } - #endif + } // Check for a valid item ID if( i >= 0 ) @@ -149,29 +218,34 @@ int main(int argc, char *argv[]) return 0; } -/** - * \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) +void ShowUsage(void) { - int _x, _y, times; - - move( Row, Col ); - - if( Index < 0 || Index >= giNumItems ) { - printw("%02i OOR", Index); - return ; - } - 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); + printf( + "Usage:\n" + "\tdispense\n" + "\t\tShow interactive list\n" + "\tdispense \n" + "\t\tDispense named item\n" + "\tdispense give \"\"\n" + "\t\tGive some of your money away\n" + "\tdispense acct []\n" + "\t\tShow user balances\n" + "\tdispense acct [+-=] \"\"\n" + "\t\tAlter a account value (Coke members only)\n" + "\n" + "General Options:\n" + "\t-u \n" + "\t\tSet a different user (Coke members only)\n" + "\t-h / -?\n" + "\t\tShow help text\n" + "\t-G\n" + "\t\tUse alternate GUI\n" + ); } +// ------------------- +// --- NCurses GUI --- +// ------------------- /** * \brief Render the NCurses UI */ @@ -188,14 +262,26 @@ int ShowNCursesUI(void) char *titleString = "Dispense"; int itemCount = displayMinItems; int itemBase = 0; + int currentItem = 0; + int ret = -2; // -2: Used for marking "no return yet" - int height = itemCount + 3; - int width = displayMinWidth; + 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; @@ -208,23 +294,29 @@ int ShowNCursesUI(void) for( i = 0; i < itemCount; i ++ ) { move( yBase + 1 + i, xBase ); - addch('|'); - addch(' '); + + if( currentItem == itemBase + i ) { + printw("| -> "); + } + else { + printw("| "); + } // Check for ... row + // - Oh god, magic numbers! if( i == 0 && itemBase > 0 ) { printw(" ..."); - times = width - 1 - 8; + times = width-1 - 8 - 3; while(times--) addch(' '); } else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) { printw(" ..."); - times = width - 1 - 8; + times = width-1 - 8 - 3; while(times--) addch(' '); } // Show an item else { - ShowItemAt( yBase + 1 + i, xBase + 2, width - 4, itemBase + i); + ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i); addch(' '); } @@ -265,11 +357,19 @@ int ShowNCursesUI(void) switch(ch) { case 'B': - if( itemBase < giNumItems - (itemCount) ) + //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 ) + //if( itemBase > 0 ) + // itemBase --; + if( currentItem > 0 ) + currentItem --; + if( itemBase + 1 > currentItem && itemBase > 0 ) itemBase --; break; } @@ -279,7 +379,18 @@ int ShowNCursesUI(void) } } else { - break; + switch(ch) + { + case '\n': + ret = currentItem; + break; + case 'q': + ret = -1; // -1: Return with no dispense + break; + } + + // Check if the return value was changed + if( ret != -2 ) break; } } @@ -287,7 +398,37 @@ int ShowNCursesUI(void) // Leave endwin(); - return -1; + return ret; +} + +/** + * \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; + } + + 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); } /** @@ -351,26 +492,9 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, } } -// === 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); - } -} - +// --------------------- +// --- Coke Protocol --- +// --------------------- int OpenConnection(const char *Host, int Port) { struct hostent *host; @@ -422,12 +546,14 @@ int OpenConnection(const char *Host, int Port) int Authenticate(int Socket) { struct passwd *pwd; - char buf[512]; + char *buf; int responseCode; char salt[32]; int i; regmatch_t matches[4]; + if( gbIsAuthenticated ) return 0; + // Get user name pwd = getpwuid( getuid() ); @@ -435,43 +561,49 @@ int Authenticate(int Socket) sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name); // Check if it worked - recv(Socket, buf, 511, 0); - trim(buf); + buf = ReadLine(Socket); responseCode = atoi(buf); switch( responseCode ) { + case 200: // Authenticated, return :) + gbIsAuthenticated = 1; + free(buf); return 0; + case 401: // Untrusted, attempt password authentication + free(buf); + sendf(Socket, "USER %s\n", pwd->pw_name); printf("Using username %s\n", pwd->pw_name); - recv(Socket, buf, 511, 0); - trim(buf); + 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", responseCode); + fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); + free(buf); return -1; // 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; } - - // Get password - fflush(stdout); + free(buf); // 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]; @@ -485,15 +617,14 @@ int Authenticate(int Socket) // 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", + 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] ); - fflush(stdout); // Debug // Send password - sendf(Socket, "PASS %s\n", buf); - recv(Socket, buf, 511, 0); + sendf(Socket, "PASS %s\n", tmpBuf); + buf = ReadLine(Socket); responseCode = atoi(buf); // Auth OK? @@ -501,25 +632,36 @@ int Authenticate(int Socket) // Bad username/password if( responseCode == 401 ) continue; - fprintf(stderr, "Unknown repsonse code %i from server\n", responseCode); + fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf); + free(buf); return -1; } - return 2; // 2 = Bad Password + free(buf); + if( i < 3 ) { + gbIsAuthenticated = 1; + return 0; + } + else + return 2; // 2 = Bad Password case 404: // Bad Username fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); + free(buf); return 1; default: fprintf(stderr, "Unkown response code %i from server\n", responseCode); printf("%s\n", buf); + free(buf); return -1; } - - printf("%s\n", buf); - return 0; // Seems OK } + +/** + * \brief Fill the item information structure + * \return Boolean Failure + */ void PopulateItemList(int Socket) { char buffer[BUFSIZ]; @@ -599,43 +741,250 @@ void PopulateItemList(int Socket) } } +/** + * \brief Dispense an item + * \return Boolean Failure + */ int DispenseItem(int Socket, int ItemID) { - int len, responseCode; - char buffer[BUFSIZ]; + int ret, responseCode; + char *buf; 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); + buf = ReadLine(Socket); - responseCode = atoi(buffer); + responseCode = atoi(buf); switch( responseCode ) { case 200: printf("Dispense OK\n"); - return 0; + ret = 0; + break; case 401: printf("Not authenticated\n"); - return 1; + ret = 1; + break; case 402: printf("Insufficient balance\n"); - return 1; + ret = 1; + break; case 406: printf("Bad item name, bug report\n"); - return 1; + ret = 1; + break; case 500: printf("Item failed to dispense, is the slot empty?\n"); - return 1; + ret = 1; + break; case 501: printf("Dispense not possible (slot empty/permissions)\n"); + ret = 1; + break; + default: + printf("Unknown response code %i ('%s')\n", responseCode, buf); + ret = -2; + break; + } + + free(buf); + return ret; +} + +/** + * \brief Alter a user's balance + */ +int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason) +{ + char *buf; + int responseCode; + + 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 403: // Not in coke + fprintf(stderr, "You are not in coke (sucker)\n"); return 1; + case 404: // Unknown user + fprintf(stderr, "Unknown user '%s'\n", Username); + return 2; default: - printf("Unknown response code %i ('%s')\n", responseCode, buffer); - return -2; + fprintf(stderr, "Unknown response code %i\n", responseCode); + return -1; + } + + return -1; +} + +/** + * \brief Alter a user's balance + */ +int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason) +{ + char *buf; + int responseCode; + + sendf(Socket, "SET %s %i %s\n", Username, Ammount, Reason); + buf = ReadLine(Socket); + + responseCode = atoi(buf); + free(buf); + + switch(responseCode) + { + case 200: return 0; // OK + case 403: // Not in coke + fprintf(stderr, "You are not in coke (sucker)\n"); + return 1; + case 404: // Unknown user + fprintf(stderr, "Unknown user '%s'\n", Username); + return 2; + default: + fprintf(stderr, "Unknown response code %i\n", responseCode); + return -1; + } + + return -1; +} + +int Dispense_EnumUsers(int Socket) +{ + printf("TODO: Dispense_EnumUsers\n"); + return -1; +} + +int Dispense_ShowUser(int Socket, const char *Username) +{ + char *buf; + int responseCode, ret; + + sendf(Socket, "USER_INFO %s\n", Username); + buf = ReadLine(Socket); + + responseCode = atoi(buf); + + switch(responseCode) + { + case 202: + _PrintUserLine(buf); + ret = 0; + break; + + case 404: + printf("Unknown user '%s'\n", Username); + ret = 1; + break; + + default: + fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); + ret = -1; + break; + } + + free(buf); + + return ret; +} + +void _PrintUserLine(const char *Line) +{ + regmatch_t matches[6]; + int bal; + + RunRegex(&gUserInfoRegex, Line, 6, matches, "Malformed server response"); + // 3: Username + // 4: Balance + // 5: Flags + { + int usernameLen = matches[3].rm_eo - matches[3].rm_so; + char username[usernameLen + 1]; + int flagsLen = matches[5].rm_eo - matches[5].rm_so; + char flags[flagsLen + 1]; + + memcpy(username, Line + matches[3].rm_so, usernameLen); + username[usernameLen] = '\0'; + memcpy(flags, Line + matches[5].rm_so, flagsLen); + flags[flagsLen] = '\0'; + + bal = atoi(Line + matches[4].rm_so); + printf("%-15s: $%i.%02i (%s)\n", username, bal/100, bal%100, flags); + } +} + +// --------------- +// --- Helpers --- +// --------------- +char *ReadLine(int Socket) +{ + static char buf[BUFSIZ]; + static int bufPos = 0; + int len; + char *newline = NULL; + int retLen = 0; + char *ret = malloc(10); + + #if DBG_TRACE_SERVER + printf("ReadLine: "); + #endif + fflush(stdout); + + ret[0] = '\0'; + + while( !newline ) + { + len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0); + buf[bufPos+len] = '\0'; + + newline = strchr( buf+bufPos, '\n' ); + if( newline ) { + *newline = '\0'; + } + + retLen += strlen(buf+bufPos); + ret = realloc(ret, retLen + 1); + strcat( ret, buf+bufPos ); + + if( newline ) { + bufPos += newline - (buf+bufPos) + 1; + } + if( len + bufPos == BUFSIZ - 1 ) bufPos = 0; + } + + #if DBG_TRACE_SERVER + printf("%i '%s'\n", retLen, ret); + #endif + + return ret; +} + +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); + + #if DBG_TRACE_SERVER + printf("sendf: %s", buf); + #endif + + return send(Socket, buf, len, 0); } }