X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fmain.c;h=17971dc038dbc116247a60f7ccb5d0d092527f77;hb=36dc59549949567a7ed0113a6ad2e4cd90ae4975;hp=acef5b5021c2f1f4ff08787da8c74dadbb68f79a;hpb=1e3c14b4fe54108b8bebbc000a93f7eb30284c67;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index acef5b5..17971dc 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -15,6 +15,7 @@ #include #include #include +#include #include // close #include // gethostbyname @@ -51,6 +52,8 @@ void PopulateItemList(int Socket); int Dispense_EnumUsers(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); // --- Helpers --- char *ReadLine(int Socket); int sendf(int Socket, const char *Format, ...); @@ -67,9 +70,11 @@ tItem *gaItems; regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex; int gbIsAuthenticated = 0; -char *gsOverrideUser; //!< '-u' argument (dispense as another user) +char *gsItemPattern; //!< Item pattern +char *gsEffectiveUser; //!< '-u' Dispense as another user int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? - int giSocket = -1; + int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct` + int giMaximumBalance = INT_MAX; //!< '-M' Maximum balance for `dispense acct` // === CODE === int main(int argc, char *argv[]) @@ -102,8 +107,15 @@ int main(int argc, char *argv[]) ShowUsage(); return 0; + case 'm': // Minimum balance + giMinimumBalance = atoi(argv[++i]); + break; + case 'M': // Maximum balance + giMaximumBalance = atoi(argv[++i]); + break; + case 'u': // Override User - gsOverrideUser = argv[++i]; + gsEffectiveUser = argv[++i]; break; case 'G': // Use GUI @@ -116,7 +128,6 @@ int main(int argc, char *argv[]) if( strcmp(arg, "acct") == 0 ) { - // Connect to server sock = OpenConnection(gsDispenseServer, giDispensePort); if( sock < 0 ) return -1; @@ -130,15 +141,16 @@ int main(int argc, char *argv[]) // argv[i+1]: Username // Alter account? - if( i + 2 < argc ) { - + if( i + 2 < argc ) + { if( i + 3 >= argc ) { fprintf(stderr, "Error: `dispense acct' needs a reason\n"); exit(1); } // Authentication required - Authenticate(sock); + if( Authenticate(sock) ) + return -1; // argv[i+1]: Username // argv[i+2]: Ammount @@ -154,13 +166,68 @@ int main(int argc, char *argv[]) } } + // Show user information Dispense_ShowUser(sock, argv[i+1]); close(sock); return 0; } + else if( strcmp(arg, "give") == 0 ) + { + // TODO: `dispense give` + printf("TODO: Implement `dispense give`\n"); + return 0; + } + else if( strcmp(arg, "user") == 0 ) + { + // Check argument count + if( i + 1 >= argc ) { + fprintf(stderr, "Error: `dispense user` requires arguments\n"); + ShowUsage(); + exit(1); + } + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // Attempt authentication + if( Authenticate(sock) ) + return -1; + + // Add new user? + if( strcmp(argv[i+1], "add") == 0 ) + { + if( i + 2 >= argc ) { + fprintf(stderr, "Error: `dispense user add` requires an argument\n"); + ShowUsage(); + exit(1); + } + + Dispense_AddUser(sock, argv[i+2]); + } + // Update a user + else if( strcmp(argv[i+1], "type") == 0 ) + { + if( i + 3 >= argc ) { + fprintf(stderr, "Error: `dispense user type` requires two arguments\n"); + ShowUsage(); + exit(1); + } + + Dispense_SetUserType(sock, argv[i+2], argv[i+3]); + } + else + { + fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n"); + ShowUsage(); + exit(1); + } + return 0; + } else { // Item name / pattern + gsItemPattern = arg; break; } } @@ -175,7 +242,13 @@ int main(int argc, char *argv[]) // Get items PopulateItemList(sock); - if( gbUseNCurses ) + if( gsItemPattern ) + { + // TODO: Implement `dispense ` + printf("TODO: Implement `dispense `\n"); + i = -1; + } + else if( gbUseNCurses ) { i = ShowNCursesUI(); } @@ -223,24 +296,33 @@ void ShowUsage(void) { 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" + " dispense\n" + " Show interactive list\n" + " dispense \n" + " Dispense named item\n" + " dispense give \"\"\n" + " Give some of your money away\n" + " dispense acct []\n" + " Show user balances\n" + " dispense acct [+-] \"\"\n" + " Alter a account value (Coke members only)\n" + " dispense user add \n" + " Create new coke account (Wheel members only)\n" + " dispense user type \n" + " Alter a user's flags\n" + " is a comma-separated list of user,coke,wheel,disabled\n" + " Flags are removed by preceding the name with '-' or '!'\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" + " -u \n" + " Set a different user (Coke members only)\n" + " -h / -?\n" + " Show help text\n" + " -G\n" + " Use alternate GUI\n" + " -m \n" + " -M \n" + " Set the Maximum/Minimum balances shown in `dispense acct`\n" ); } @@ -569,9 +651,8 @@ int Authenticate(int Socket) { case 200: // Authenticated, return :) - gbIsAuthenticated = 1; free(buf); - return 0; + break; case 401: // Untrusted, attempt password authentication free(buf); @@ -638,12 +719,9 @@ int Authenticate(int Socket) return -1; } free(buf); - if( i < 3 ) { - gbIsAuthenticated = 1; - return 0; - } - else + if( i == 3 ) return 2; // 2 = Bad Password + break; case 404: // Bad Username fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name); @@ -656,6 +734,43 @@ int Authenticate(int Socket) free(buf); return -1; } + + // Set effective user + if( gsEffectiveUser ) { + sendf(Socket, "SETEUSER %s\n", gsEffectiveUser); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("Running as '%s' by '%s'\n", gsEffectiveUser, pwd->pw_name); + break; + + case 403: + printf("Only coke members can use `dispense -u`\n"); + free(buf); + return -1; + + case 404: + printf("Invalid user selected\n"); + free(buf); + return -1; + + default: + fprintf(stderr, "Unkown response code %i from server\n", responseCode); + printf("%s\n", buf); + free(buf); + exit(-1); + } + + free(buf); + } + + gbIsAuthenticated = 1; + + return 0; } @@ -862,6 +977,9 @@ int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const cha return -1; } +/** + * \brief Enumerate users + */ int Dispense_EnumUsers(int Socket) { char *buf; @@ -869,7 +987,22 @@ int Dispense_EnumUsers(int Socket) int nUsers; regmatch_t matches[4]; - sendf(Socket, "ENUM_USERS\n"); + if( giMinimumBalance != INT_MIN ) { + if( giMaximumBalance != INT_MAX ) { + sendf(Socket, "ENUM_USERS %i %i\n", giMinimumBalance, giMaximumBalance); + } + else { + sendf(Socket, "ENUM_USERS %i\n", giMinimumBalance); + } + } + else { + if( giMaximumBalance != INT_MAX ) { + sendf(Socket, "ENUM_USERS - %i\n", giMaximumBalance); + } + else { + sendf(Socket, "ENUM_USERS\n"); + } + } buf = ReadLine(Socket); responseCode = atoi(buf); @@ -972,6 +1105,89 @@ void _PrintUserLine(const char *Line) } } +int Dispense_AddUser(int Socket, const char *Username) +{ + char *buf; + int responseCode, ret; + + sendf(Socket, "USER_ADD %s\n", Username); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("User '%s' added\n", Username); + ret = 0; + break; + + case 403: + printf("Only wheel can add users\n"); + ret = 1; + break; + + case 404: + printf("User '%s' already exists\n", Username); + ret = 0; + break; + + default: + fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); + ret = -1; + break; + } + + free(buf); + + return ret; +} + +int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString) +{ + char *buf; + int responseCode, ret; + + // TODO: Pre-validate the string + + sendf(Socket, "USER_FLAGS %s %s\n", Username, TypeString); + + buf = ReadLine(Socket); + responseCode = atoi(buf); + + switch(responseCode) + { + case 200: + printf("User '%s' updated\n", Username); + ret = 0; + break; + + case 403: + printf("Only wheel can modify users\n"); + ret = 1; + break; + + case 404: + printf("User '%s' does not exist\n", Username); + ret = 0; + break; + + case 407: + printf("Flag string is invalid\n"); + ret = 0; + break; + + default: + fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf); + ret = -1; + break; + } + + free(buf); + + return ret; +} + // --------------- // --- Helpers --- // ---------------