Moved GetUserAuth out to Cokebank (removes potential duplication)

[tpg/opendispense2.git] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index d3adeee..17971dc 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -71,7 +71,7 @@ regex_t       gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex;
  int   gbIsAuthenticated = 0;
 
 char   *gsItemPattern; //!< Item pattern
-char   *gsOverrideUser;        //!< '-u' Dispense as another user
+char   *gsEffectiveUser;       //!< '-u' Dispense as another user
  int   gbUseNCurses = 0;       //!< '-G' Use the NCurses GUI?
  int   giMinimumBalance = INT_MIN;     //!< '-m' Minumum balance for `dispense acct`
  int   giMaximumBalance = INT_MAX;     //!< '-M' Maximum balance for `dispense acct`
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
                                break;
                        
                        case 'u':       // Override User
-                               gsOverrideUser = argv[++i];
+                               gsEffectiveUser = argv[++i];
                                break;
                        
                        case 'G':       // Use GUI
@@ -166,11 +166,18 @@ 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
@@ -237,7 +244,9 @@ int main(int argc, char *argv[])
        
        if( gsItemPattern )
        {
-               
+               // TODO: Implement `dispense <name>`
+               printf("TODO: Implement `dispense <name>`\n");
+               i = -1;
        }
        else if( gbUseNCurses )
        {
@@ -287,27 +296,33 @@ void ShowUsage(void)
 {
        printf(
                "Usage:\n"
-               "\tdispense\n"
-               "\t\tShow interactive list\n"
-               "\tdispense <item>\n"
-               "\t\tDispense named item\n"
-               "\tdispense give <user> <ammount> \"<reason>\"\n"
-               "\t\tGive some of your money away\n"
-               "\tdispense acct [<user>]\n"
-               "\t\tShow user balances\n"
-               "\tdispense acct <user> [+-=]<ammount> \"<reason>\"\n"
-               "\t\tAlter a account value (Coke members only)\n"
+               "    dispense\n"
+               "        Show interactive list\n"
+               "    dispense <item>\n"
+               "        Dispense named item\n"
+               "    dispense give <user> <ammount> \"<reason>\"\n"
+               "        Give some of your money away\n"
+               "    dispense acct [<user>]\n"
+               "        Show user balances\n"
+               "    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+               "        Alter a account value (Coke members only)\n"
+               "    dispense user add <user>\n"
+               "        Create new coke account (Wheel members only)\n"
+               "    dispense user type <flags>\n"
+               "        Alter a user's flags\n"
+               "        <flags> 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 <username>\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 <min balance>\n"
-               "\t-M <max balance>\n"
-               "\t\tSet the Maximum/Minimum balances shown in `dispense acct`\n"
+               "    -u <username>\n"
+               "        Set a different user (Coke members only)\n"
+               "    -h / -?\n"
+               "        Show help text\n"
+               "    -G\n"
+               "        Use alternate GUI\n"
+               "    -m <min balance>\n"
+               "    -M <max balance>\n"
+               "        Set the Maximum/Minimum balances shown in `dispense acct`\n"
                );
 }
 
@@ -636,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);
@@ -705,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);
@@ -723,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;
 }
 
 
@@ -929,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;