X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=c1883b4f14bf86eb619e46edc9b2e52b0361a8bf;hb=2f6ba83a4dbe0c6c9cfdd991f0f72f2a4f018b27;hp=bf044436ab55574a5cf19a1ee59ff8b436b9eb32;hpb=3432da85567f41563026c4ae9ef1edf958f57715;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index bf04443..c1883b4 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -134,16 +134,18 @@ void ShowUsage(void) " 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" + " dispense give \"\"\n" " Give money to another user\n" ); if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 ) printf( - " dispense donate \"\"\n" + " dispense donate \"\"\n" " Donate to the club\n" ); if( giTextArgc == 0 || strcmp(gsTextArgs[0], "iteminfo") == 0 ) @@ -162,9 +164,9 @@ void ShowUsage(void) printf( " dispense acct []\n" " Show user balances\n" - " dispense acct [+-] \"\"\n" + " dispense acct [+-] \"\"\n" " Alter a account value\n" - " dispense acct = \"\"\n" + " dispense acct = \"\"\n" " Set an account balance\n" ); if( giTextArgc == 0 || strcmp(gsTextArgs[0], "refund") == 0 ) @@ -375,6 +377,41 @@ int main(int argc, char *argv[]) } + // + // `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` // - @@ -867,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; @@ -980,53 +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 { } - - // 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; - } - } } else { switch(ch) @@ -1034,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 @@ -1044,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; + } + } } @@ -1277,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); @@ -1307,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); @@ -1716,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; }