X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=595d3e6702f51839159dd2c6df859d2dea9180e1;hb=da639e3f13ee62627f4e7b29eccfcac70aad681d;hp=8c4237e072f8e9ed07376daa9441250d0ff8de53;hpb=6d296fbff71ecee2f73e3e5ba8bcf06e446dc39b;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 8c4237e..595d3e6 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` // - @@ -1112,7 +1149,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) if( Width > 0 ) { // 4 preceding, 5 price - int nameWidth = Width - 4 - 4 - snprintf(NULL, 0, "%i", price/100); + int nameWidth = Width - 4 - snprintf(NULL, 0, " %4i", price); move( Row, Col ); if( Index >= 0 ) @@ -1138,7 +1175,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) printw("%-*.*s", nameWidth, nameWidth, name); - printw(" %i.%02i", price/100, price%100); + printw(" %4i", price); } else { @@ -1277,28 +1314,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 +1369,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); - - #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; - } - 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]; - - // 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 - - #else + case 401: // Untrusted fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n"); - return RV_INVALID_USER; - #endif + ret = RV_PERMISSIONS; break; - case 404: // Bad Username - fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); - free(buf); - return RV_INVALID_USER; - default: fprintf(stderr, "Unkown response code %i from server\n", responseCode); printf("%s\n", buf); + ret = RV_UNKNOWN_RESPONSE; + break; + } + + free(buf); + + 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; + 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]; + + // Create hash string + // + strcpy(tmp, Username); + 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 -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 +1811,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; } @@ -2253,9 +2348,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