X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=f433cae503a0dc1edb39bbfa2fcec1b93b475f1d;hb=114f33e11226fbd4c2ad02a47829b4c44486efb5;hp=f0950963d93e4b6d98e2d579b5640df16d0dcda9;hpb=512c85b9aad68127e62244fdd8666779c053a50c;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index f095096..f433cae 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -52,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, ...); @@ -68,6 +70,7 @@ tItem *gaItems; regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex; int gbIsAuthenticated = 0; +char *gsItemPattern; //!< Item pattern char *gsOverrideUser; //!< '-u' Dispense as another user int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct` @@ -125,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; @@ -140,14 +142,15 @@ int main(int argc, char *argv[]) // 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); + if( Authenticate(sock) ) + return -1; // argv[i+1]: Username // argv[i+2]: Ammount @@ -168,8 +171,56 @@ int main(int argc, char *argv[]) close(sock); 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; } } @@ -184,7 +235,11 @@ int main(int argc, char *argv[]) // Get items PopulateItemList(sock); - if( gbUseNCurses ) + if( gsItemPattern ) + { + + } + else if( gbUseNCurses ) { i = ShowNCursesUI(); } @@ -232,27 +287,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" - "\t-m \n" - "\t-M \n" - "\t\tSet the Maximum/Minimum balances shown in `dispense acct`\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" ); } @@ -874,6 +935,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; @@ -999,6 +1063,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 --- // ---------------