Implemented `dispense acct <name> =`
[tpg/opendispense2.git] / src / client / main.c
index ed7d1a2..72dffdf 100644 (file)
@@ -15,6 +15,7 @@
 #include <stdarg.h>
 #include <regex.h>
 #include <ncurses.h>
+#include <limits.h>
 
 #include <unistd.h>    // close
 #include <netdb.h>     // gethostbyname
 #include <openssl/sha.h>       // SHA1
 
 #define        USE_NCURSES_INTERFACE   0
+#define DEBUG_TRACE_SERVER     0
 
 // === TYPES ===
 typedef struct sItem {
-       char    *Ident;
+       char    *Type;
+        int    ID;
        char    *Desc;
         int    Price;
 }      tItem;
 
 // === PROTOTYPES ===
+ int   main(int argc, char *argv[]);
+void   ShowUsage(void);
+// --- GUI ---
  int   ShowNCursesUI(void);
+void   ShowItemAt(int Row, int Col, int Width, int Index);
 void   PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...);
-
- int   sendf(int Socket, const char *Format, ...);
+// --- Coke Server Communication ---
  int   OpenConnection(const char *Host, int Port);
-void   Authenticate(int Socket);
+ int   Authenticate(int Socket);
+void   PopulateItemList(int Socket);
+ int   DispenseItem(int Socket, int ItemID);
+ int   Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason);
+ int   Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason);
+ int   Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason);
+ int   Dispense_Donate(int Socket, int Ammount, const char *Reason);
+ 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, ...);
 char   *trim(char *string);
  int   RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage);
 void   CompileRegex(regex_t *regex, const char *pattern, int flags);
@@ -47,212 +67,339 @@ void      CompileRegex(regex_t *regex, const char *pattern, int flags);
 // === GLOBALS ===
 char   *gsDispenseServer = "localhost";
  int   giDispensePort = 11020;
+
 tItem  *gaItems;
  int   giNumItems;
-regex_t        gArrayRegex, gItemRegex, gSaltRegex;
+regex_t        gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex;
+ int   gbIsAuthenticated = 0;
+
+char   *gsItemPattern; //!< Item pattern
+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`
 
 // === CODE ===
 int main(int argc, char *argv[])
 {
         int    sock;
-        int    i, responseCode, len;
+        int    i;
        char    buffer[BUFSIZ];
        
        // -- Create regular expressions
        // > Code Type Count ...
        CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED);     //
        // > Code Type Ident Price Desc
-       CompileRegex(&gItemRegex, "^([0-9]{3})\\s+(.+?)\\s+(.+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
+       CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
        // > Code 'SALT' salt
-       CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+(.+)\\s+(.+)$", REG_EXTENDED);
-       
-       // Connect to server
-       sock = OpenConnection(gsDispenseServer, giDispensePort);
-       if( sock < 0 )  return -1;
+       CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED);
+       // > Code 'User' Username Balance Flags
+       CompileRegex(&gUserInfoRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([^ ]+)\\s+(-?[0-9]+)\\s+(.+)$", REG_EXTENDED);
 
-       // Determine what to do
-       if( argc > 1 )
+       // Parse Arguments
+       for( i = 1; i < argc; i ++ )
        {
-               if( strcmp(argv[1], "acct") == 0 )
+               char    *arg = argv[i];
+               
+               if( arg[0] == '-' )
+               {                       
+                       switch(arg[1])
+                       {
+                       case 'h':
+                       case '?':
+                               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
+                               gsEffectiveUser = argv[++i];
+                               break;
+                       
+                       case 'G':       // Use GUI
+                               gbUseNCurses = 1;
+                               break;
+                       }
+
+                       continue;
+               }
+               
+               //
+               // `dispense acct`
+               // - 
+               if( strcmp(arg, "acct") == 0 )
                {
-                       // Alter account
-                       // List accounts
+                       // Connect to server
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return -1;
+
+                       // List accounts?
+                       if( i + 1 == argc ) {
+                               Dispense_EnumUsers(sock);
+                               return 0;
+                       }
+                       
+                       // argv[i+1]: Username
+                       
+                       // Alter account?
+                       if( i + 2 < argc )
+                       {
+                               if( i + 3 >= argc ) {
+                                       fprintf(stderr, "Error: `dispense acct' needs a reason\n");
+                                       exit(1);
+                               }
+                               
+                               // Authentication required
+                               if( Authenticate(sock) )
+                                       return -1;
+                               
+                               // argv[i+1]: Username
+                               // argv[i+2]: Ammount
+                               // argv[i+3]: Reason
+                               
+                               if( argv[i+2][0] == '=' ) {
+                                       // Set balance
+                                       if( argv[i+2][1] != '0' && atoi(&argv[i+2][1]) == 0 ) {
+                                               fprintf(stderr, "Error: Invalid balance to be set\n");
+                                               exit(1);
+                                       }
+                                       
+                                       Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2]+1), argv[i+3]);
+                               }
+                               else {
+                                       // Alter balance
+                                       Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
+                               }
+                       }
+                       
+                       // Show user information
+                       Dispense_ShowUser(sock, argv[i+1]);
+                       
+                       close(sock);
                        return 0;
                }
-       }
-
-       // Ask server for stock list
-       send(sock, "ENUM_ITEMS\n", 11, 0);
-       len = recv(sock, buffer, BUFSIZ-1, 0);
-       buffer[len] = '\0';
-       
-       trim(buffer);
-       
-       printf("Output: %s\n", buffer);
-       
-       responseCode = atoi(buffer);
-       if( responseCode != 201 )
-       {
-               fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
-               return -1;
-       }
-       
-       // Get item list
-       {
-               char    *itemType, *itemStart;
-                int    count;
-               regmatch_t      matches[4];
-               
-               // Expected format: 201 Items <count> <item1> <item2> ...
-               RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response");
-               
-               itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0';
-               count = atoi( &buffer[ matches[3].rm_so ] );
-               
-               // Check array type
-               if( strcmp(itemType, "Items") != 0 ) {
-                       // What the?!
-                       fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
-                               itemType);
-                       return -1;
+               //
+               // `dispense give`
+               // - "Here, have some money."
+               if( strcmp(arg, "give") == 0 )
+               {
+                       if( i + 3 >= argc ) {
+                               fprintf(stderr, "`dispense give` takes three arguments\n");
+                               ShowUsage();
+                               return -1;
+                       }
+                       // TODO: `dispense give`
+                       
+                       // argv[i+1]: Destination
+                       // argv[i+2]: Ammount
+                       // argv[i+3]: Reason
+                       
+                       // Connect to server
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return -1;
+                       
+                       // Authenticate
+                       if( Authenticate(sock) )
+                               return -1;
+                       
+                       Dispense_Give(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
+                       return 0;
                }
-               
-               itemStart = &buffer[ matches[3].rm_eo ];
-               
-               gaItems = malloc( count * sizeof(tItem) );
-               
-               for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ )
+               // 
+               // `dispense user`
+               // - User administration (Admin Only)
+               if( strcmp(arg, "user") == 0 )
                {
-                       char    *next = strchr( ++itemStart, ' ' );
-                       if( next )      *next = '\0';
-                       gaItems[giNumItems].Ident = strdup(itemStart);
-                       itemStart = next;
+                       // 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;
                }
-       }
-       
-       // Get item information
-       for( i = 0; i < giNumItems; i ++ )
-       {
-               regmatch_t      matches[6];
-               
-               // Print item Ident
-               printf("%2i %s\t", i, gaItems[i].Ident);
                
-               // Get item info
-               sendf(sock, "ITEM_INFO %s\n", gaItems[i].Ident);
-               len = recv(sock, buffer, BUFSIZ-1, 0);
-               buffer[len] = '\0';
-               trim(buffer);
-               
-               responseCode = atoi(buffer);
-               if( responseCode != 202 ) {
-                       fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
-                       return -1;
+               // Donation!
+               if( strcmp(arg, "donate") == 0 )
+               {
+                       // Check argument count
+                       if( i + 2 >= argc ) {
+                               fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+                               ShowUsage();
+                               exit(1);
+                       }
+                       
+                       // Connect to server
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return -1;
+                       
+                       // Attempt authentication
+                       if( Authenticate(sock) )
+                               return -1;
+                       
+                       // Do donation
+                       Dispense_Donate(sock, atoi(argv[i+1]), argv[i+1]);
+                       
+                       return 0;
                }
                
-               RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response");
-               
-               buffer[ matches[3].rm_eo ] = '\0';
-               
-               gaItems[i].Price = atoi( buffer + matches[4].rm_so );
-               gaItems[i].Desc = strdup( buffer + matches[5].rm_so );
-               
-               printf("%3i %s\n", gaItems[i].Price, gaItems[i].Desc);
+               else {
+                       // Item name / pattern
+                       gsItemPattern = arg;
+                       break;
+               }
        }
        
-       // and choose what to dispense
+       // Connect to server
+       sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return -1;
        
-       #if USE_NCURSES_INTERFACE
-       i = ShowNCursesUI();
-       #else
+       // Authenticate
+       Authenticate(sock);
+
+       // Get items
+       PopulateItemList(sock);
        
-       for(;;)
+       if( gsItemPattern )
        {
-               char    *buf;
-               
-               fgets(buffer, BUFSIZ, stdin);
-               
-               buf = trim(buffer);
-               
-               if( buf[0] == 'q' )     break;
-               
-               i = atoi(buf);
-               
-               printf("buf = '%s', atoi(buf) = %i\n", buf, i);
-               
-               if( i != 0 || buf[0] == '0' )
+               // TODO: Implement `dispense <name>`
+               printf("TODO: Implement `dispense <name>`\n");
+               i = -1;
+       }
+       else if( gbUseNCurses )
+       {
+               i = ShowNCursesUI();
+       }
+       else
+       {
+               // Very basic dispense interface
+               for( i = 0; i < giNumItems; i ++ ) {            
+                       printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID,
+                               gaItems[i].Price, gaItems[i].Desc);
+               }
+               printf(" q Quit\n");
+               for(;;)
                {
-                       printf("i = %i\n", i);
+                       char    *buf;
+                       
+                       i = -1;
+                       
+                       fgets(buffer, BUFSIZ, stdin);
                        
-                       if( i < 0 || i >= giNumItems ) {
-                               printf("Bad item (should be between 0 and %i)\n", giNumItems);
-                               continue;
+                       buf = trim(buffer);
+                       
+                       if( buf[0] == 'q' )     break;
+                       
+                       i = atoi(buf);
+                       
+                       if( i != 0 || buf[0] == '0' )
+                       {
+                               if( i < 0 || i >= giNumItems ) {
+                                       printf("Bad item %i (should be between 0 and %i)\n", i, giNumItems);
+                                       continue;
+                               }
+                               break;
                        }
-                       break;
                }
        }
-       #endif
-       
-       Authenticate(sock);
        
+       // Check for a valid item ID
        if( i >= 0 )
-       {       
-               // Dispense!
-               sendf(sock, "DISPENSE %s\n", gaItems[i].Ident);
-               
-               len = recv(sock, buffer, BUFSIZ-1, 0);
-               buffer[len] = '\0';
-               trim(buffer);
-               
-               responseCode = atoi(buffer);
-               switch( responseCode )
-               {
-               case 200:
-                       printf("Dispense OK\n");
-                       break;
-               case 401:
-                       printf("Not authenticated\n");
-                       break;
-               case 402:
-                       printf("Insufficient balance\n");
-                       break;
-               case 406:
-                       printf("Bad item name, bug report\n");
-                       break;
-               case 500:
-                       printf("Item failed to dispense, is the slot empty?\n");
-                       break;
-               default:
-                       printf("Unknown response code %i ('%s')\n", responseCode, buffer);
-                       break;
-               }
-       }
+               DispenseItem(sock, i);
 
        close(sock);
 
        return 0;
 }
 
-void ShowItemAt(int Row, int Col, int Width, int Index)
+void ShowUsage(void)
 {
-        int    _x, _y, times;
-       
-       move( Row, Col );
-       
-       if( Index < 0 || Index >= giNumItems ) {
-               printw("%02i OOR", Index);
-               return ;
-       }
-       printw("%02i %s", Index, gaItems[Index].Desc);
-       
-       getyx(stdscr, _y, _x);
-       // Assumes max 4 digit prices
-       times = Width - 4 - (_x - Col); // TODO: Better handling for large prices
-       while(times--)  addch(' ');
-       printw("%4i", gaItems[Index].Price);
+       printf(
+               "Usage:\n"
+               "  == Everyone ==\n"
+               "    dispense\n"
+               "        Show interactive list\n"
+               "    dispense <item>\n"
+               "        Dispense named item\n"
+               "    dispense give <user> <ammount> \"<reason>\"\n"
+               "        Give money to another user\n"
+               "    dispense donate <ammount> \"<reason>\"\n"
+               "        Donate to the club\n"
+               "  == Coke members == \n"
+               "    dispense acct [<user>]\n"
+               "        Show user balances\n"
+               "    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+               "        Alter a account value\n"
+               "  == Dispense administrators ==\n"
+               "    dispense acct <user> =<ammount> \"<reason>\"\n"
+               "        Set an account balance\n"
+               "    dispense user add <user>\n"
+               "        Create new coke account (Admins only)\n"
+               "    dispense user type <user> <flags>\n"
+               "        Alter a user's flags\n"
+               "        <flags> is a comma-separated list of user, coke, admin or disabled\n"
+               "        Flags are removed by preceding the name with '-' or '!'\n"
+               "\n"
+               "General Options:\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"
+               );
 }
 
+// -------------------
+// --- NCurses GUI ---
+// -------------------
 /**
+ * \brief Render the NCurses UI
  */
 int ShowNCursesUI(void)
 {
@@ -262,19 +409,31 @@ int ShowNCursesUI(void)
         int    ch;
         int    i, times;
         int    xBase, yBase;
-       const int       displayMinWidth = 34;
+       const int       displayMinWidth = 40;
        const int       displayMinItems = 8;
        char    *titleString = "Dispense";
         int    itemCount = displayMinItems;
         int    itemBase = 0;
+        int    currentItem = 0;
+        int    ret = -2;       // -2: Used for marking "no return yet"
         
-        int    height = itemCount + 3;
-        int    width = displayMinWidth;
+        int    height, width;
         
        // Enter curses mode
        initscr();
        raw(); noecho();
        
+       // Get item count
+       // - 6: randomly chosen (Need at least 3)
+       itemCount = LINES - 6;
+       if( itemCount > giNumItems )
+               itemCount = giNumItems;
+       
+       // Get dimensions
+       height = itemCount + 3;
+       width = displayMinWidth;
+       
+       // Get positions
        xBase = COLS/2 - width/2;
        yBase = LINES/2 - height/2;
        
@@ -287,23 +446,29 @@ int ShowNCursesUI(void)
                for( i = 0; i < itemCount; i ++ )
                {
                        move( yBase + 1 + i, xBase );
-                       addch('|');
-                       addch(' ');
+                       
+                       if( currentItem == itemBase + i ) {
+                               printw("| -> ");
+                       }
+                       else {
+                               printw("|    ");
+                       }
                        
                        // Check for ... row
+                       // - Oh god, magic numbers!
                        if( i == 0 && itemBase > 0 ) {
                                printw("   ...");
-                               times = width - 1 - 8;
+                               times = width-1 - 8 - 3;
                                while(times--)  addch(' ');
                        }
                        else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) {
                                printw("   ...");
-                               times = width - 1 - 8;
+                               times = width-1 - 8 - 3;
                                while(times--)  addch(' ');
                        }
                        // Show an item
                        else {
-                               ShowItemAt( yBase + 1 + i, xBase + 2, width - 4, itemBase + i);
+                               ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i);
                                addch(' ');
                        }
                        
@@ -344,11 +509,19 @@ int ShowNCursesUI(void)
                                switch(ch)
                                {
                                case 'B':
-                                       if( itemBase < giNumItems - (itemCount) )
+                                       //if( itemBase < giNumItems - (itemCount) )
+                                       //      itemBase ++;
+                                       if( currentItem < giNumItems - 1 )
+                                               currentItem ++;
+                                       if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems )
                                                itemBase ++;
                                        break;
                                case 'A':
-                                       if( itemBase > 0 )
+                                       //if( itemBase > 0 )
+                                       //      itemBase --;
+                                       if( currentItem > 0 )
+                                               currentItem --;
+                                       if( itemBase + 1 > currentItem && itemBase > 0 )
                                                itemBase --;
                                        break;
                                }
@@ -358,7 +531,18 @@ int ShowNCursesUI(void)
                        }
                }
                else {
-                       break;
+                       switch(ch)
+                       {
+                       case '\n':
+                               ret = currentItem;
+                               break;
+                       case 'q':
+                               ret = -1;       // -1: Return with no dispense
+                               break;
+                       }
+                       
+                       // Check if the return value was changed
+                       if( ret != -2 ) break;
                }
                
        }
@@ -366,10 +550,52 @@ int ShowNCursesUI(void)
        
        // Leave
        endwin();
-       return -1;
+       return ret;
+}
+
+/**
+ * \brief Show item \a Index at (\a Col, \a Row)
+ * \note Part of the NCurses UI
+ */
+void ShowItemAt(int Row, int Col, int Width, int Index)
+{
+        int    _x, _y, times;
+       char    *name;
+        int    price;
+       
+       move( Row, Col );
+       
+       if( Index < 0 || Index >= giNumItems ) {
+               name = "OOR";
+               price = 0;
+       }
+       else {
+               name = gaItems[Index].Desc;
+               price = gaItems[Index].Price;
+       }
+
+       printw("%02i %s", Index, name);
+       
+       getyx(stdscr, _y, _x);
+       // Assumes max 4 digit prices
+       times = Width - 4 - (_x - Col); // TODO: Better handling for large prices
+       while(times--)  addch(' ');
+       printw("%4i", price);
 }
 
-void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...)
+/**
+ * \brief Print a three-part string at the specified position (formatted)
+ * \note NCurses UI Helper
+ * 
+ * Prints \a Left on the left of the area, \a Right on the righthand side
+ * and \a Mid in the middle of the area. These are padded with \a Pad1
+ * between \a Left and \a Mid, and \a Pad2 between \a Mid and \a Right.
+ * 
+ * ::printf style format codes are allowed in \a Left, \a Mid and \a Right,
+ * and the arguments to these are read in that order.
+ */
+void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1,
+       const char *Mid, char Pad2, const char *Right, ...)
 {
         int    lLen, mLen, rLen;
         int    times;
@@ -418,26 +644,9 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const
        }
 }
 
-// === HELPERS ===
-int sendf(int Socket, const char *Format, ...)
-{
-       va_list args;
-        int    len;
-       
-       va_start(args, Format);
-       len = vsnprintf(NULL, 0, Format, args);
-       va_end(args);
-       
-       {
-               char    buf[len+1];
-               va_start(args, Format);
-               vsnprintf(buf, len+1, Format, args);
-               va_end(args);
-               
-               return send(Socket, buf, len, 0);
-       }
-}
-
+// ---------------------
+// --- Coke Protocol ---
+// ---------------------
 int OpenConnection(const char *Host, int Port)
 {
        struct hostent  *host;
@@ -482,14 +691,21 @@ int OpenConnection(const char *Host, int Port)
        return sock;
 }
 
-void Authenticate(int Socket)
+/**
+ * \brief Authenticate with the server
+ * \return Boolean Failure
+ */
+int Authenticate(int Socket)
 {
        struct passwd   *pwd;
-       char    buf[512];
+       char    *buf;
         int    responseCode;
        char    salt[32];
+        int    i;
        regmatch_t      matches[4];
        
+       if( gbIsAuthenticated ) return 0;
+       
        // Get user name
        pwd = getpwuid( getuid() );
        
@@ -497,41 +713,53 @@ void Authenticate(int Socket)
        sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name);
        
        // Check if it worked
-       recv(Socket, buf, 511, 0);
-       trim(buf);
+       buf = ReadLine(Socket);
        
        responseCode = atoi(buf);
        switch( responseCode )
        {
-       case 200:       // Authenticated, return :)
-               return ;
+       case 200:       // Autoauth succeeded, return
+               free(buf);
+               break;
+       
        case 401:       // Untrusted, attempt password authentication
+               free(buf);
+               
                sendf(Socket, "USER %s\n", pwd->pw_name);
                printf("Using username %s\n", pwd->pw_name);
                
-               recv(Socket, buf, 511, 0);
-               trim(buf);
+               buf = ReadLine(Socket);
+               
                // TODO: Get Salt
                // Expected format: 100 SALT <something> ...
                // OR             : 100 User Set
                RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response");
-               if( atoi(buf) != 100 ) {
-                       exit(-1);       // ERROR
+               responseCode = atoi(buf);
+               if( responseCode != 100 ) {
+                       fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
+                       free(buf);
+                       return -1;      // ERROR
                }
+               
+               // Check for salt
                if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) {
-                       // Set salt
+                       // 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;
-//                     printf("Salt: '%s'\n", salt);
                }
+               free(buf);
                
-               fflush(stdout);
+               // 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
+                       // <username><salt><hash>
                        strcpy(tmp, pwd->pw_name);
                        strcat(tmp, salt);
                        SHA1( (unsigned char*)pass, strlen(pass), h );
@@ -539,27 +767,662 @@ void Authenticate(int Socket)
                        
                        // Hash all that
                        SHA1( (unsigned char*)tmp, ofs+20, h );
-                       sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                       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]
                                );
-//                     printf("Final hash: '%s'\n", buf);
-                       fflush(stdout); // Debug
-               }
                
-               sendf(Socket, "PASS %s\n", buf);
-               recv(Socket, buf, 511, 0);
+                       // 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 2;       // 2 = Bad Password
                break;
+       
        case 404:       // Bad Username
                fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
-               exit(-1);
+               free(buf);
+               return 1;
+       
        default:
                fprintf(stderr, "Unkown response code %i from server\n", responseCode);
                printf("%s\n", buf);
+               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;
+}
+
+
+/**
+ * \brief Fill the item information structure
+ * \return Boolean Failure
+ */
+void PopulateItemList(int Socket)
+{
+       char    *buf;
+        int    responseCode;
+       
+       char    *itemType, *itemStart;
+        int    count, i;
+       regmatch_t      matches[4];
+       
+       // Ask server for stock list
+       send(Socket, "ENUM_ITEMS\n", 11, 0);
+       buf = ReadLine(Socket);
+       
+       //printf("Output: %s\n", buf);
+       
+       responseCode = atoi(buf);
+       if( responseCode != 201 ) {
+               fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
                exit(-1);
        }
        
-       printf("%s\n", buf);
+       // - Get item list -
+       
+       // Expected format:
+       //  201 Items <count>
+       //  202 Item <count>
+       RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
+               
+       itemType = &buf[ matches[2].rm_so ];    buf[ matches[2].rm_eo ] = '\0';
+       count = atoi( &buf[ matches[3].rm_so ] );
+               
+       // Check array type
+       if( strcmp(itemType, "Items") != 0 ) {
+               // What the?!
+               fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
+                       itemType);
+               exit(-1);
+       }
+               
+       itemStart = &buf[ matches[3].rm_eo ];
+       
+       free(buf);
+       
+       giNumItems = count;
+       gaItems = malloc( giNumItems * sizeof(tItem) );
+       
+       // Fetch item information
+       for( i = 0; i < giNumItems; i ++ )
+       {
+               regmatch_t      matches[7];
+               
+               // Get item info
+               buf = ReadLine(Socket);
+               responseCode = atoi(buf);
+               
+               if( responseCode != 202 ) {
+                       fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
+                       exit(-1);
+               }
+               
+               RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response");
+               
+               buf[ matches[3].rm_eo ] = '\0';
+               
+               gaItems[i].Type = strdup( buf + matches[3].rm_so );
+               gaItems[i].ID = atoi( buf + matches[4].rm_so );
+               gaItems[i].Price = atoi( buf + matches[5].rm_so );
+               gaItems[i].Desc = strdup( buf + matches[6].rm_so );
+               
+               free(buf);
+       }
+       
+       // Read end of list
+       buf = ReadLine(Socket);
+       responseCode = atoi(buf);
+               
+       if( responseCode != 200 ) {
+               fprintf(stderr, "Unknown response from dispense server %i\n'%s'",
+                       responseCode, buf
+                       );
+               exit(-1);
+       }
+       
+       free(buf);
+}
+
+/**
+ * \brief Dispense an item
+ * \return Boolean Failure
+ */
+int DispenseItem(int Socket, int ItemID)
+{
+        int    ret, responseCode;
+       char    *buf;
+       
+       if( ItemID < 0 || ItemID > giNumItems ) return -1;
+       
+       // Dispense!
+       sendf(Socket, "DISPENSE %s:%i\n", gaItems[ItemID].Type, gaItems[ItemID].ID);
+       buf = ReadLine(Socket);
+       
+       responseCode = atoi(buf);
+       switch( responseCode )
+       {
+       case 200:
+               printf("Dispense OK\n");
+               ret = 0;
+               break;
+       case 401:
+               printf("Not authenticated\n");
+               ret = 1;
+               break;
+       case 402:
+               printf("Insufficient balance\n");
+               ret = 1;
+               break;
+       case 406:
+               printf("Bad item name, bug report\n");
+               ret = 1;
+               break;
+       case 500:
+               printf("Item failed to dispense, is the slot empty?\n");
+               ret = 1;
+               break;
+       case 501:
+               printf("Dispense not possible (slot empty/permissions)\n");
+               ret = 1;
+               break;
+       default:
+               printf("Unknown response code %i ('%s')\n", responseCode, buf);
+               ret = -2;
+               break;
+       }
+       
+       free(buf);
+       return ret;
+}
+
+/**
+ * \brief Alter a user's balance
+ */
+int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason)
+{
+       char    *buf;
+        int    responseCode;
+       
+       sendf(Socket, "ADD %s %i %s\n", Username, Ammount, Reason);
+       buf = ReadLine(Socket);
+       
+       responseCode = atoi(buf);
+       free(buf);
+       
+       switch(responseCode)
+       {
+       case 200:       return 0;       // OK
+       case 402:
+               fprintf(stderr, "Insufficient balance\n");
+               return 1;
+       case 403:       // Not in coke
+               fprintf(stderr, "You are not in coke (sucker)\n");
+               return 1;
+       case 404:       // Unknown user
+               fprintf(stderr, "Unknown user '%s'\n", Username);
+               return 2;
+       default:
+               fprintf(stderr, "Unknown response code %i\n", responseCode);
+               return -1;
+       }
+       
+       return -1;
+}
+
+/**
+ * \brief Set a user's balance
+ * \note Only avaliable to dispense admins
+ */
+int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason)
+{
+       char    *buf;
+        int    responseCode;
+       
+       sendf(Socket, "SET %s %i %s\n", Username, Balance, Reason);
+       buf = ReadLine(Socket);
+       
+       responseCode = atoi(buf);
+       free(buf);
+       
+       switch(responseCode)
+       {
+       case 200:       return 0;       // OK
+       case 403:       // Not in coke
+               fprintf(stderr, "You are not an admin\n");
+               return 1;
+       case 404:       // Unknown user
+               fprintf(stderr, "Unknown user '%s'\n", Username);
+               return 2;
+       default:
+               fprintf(stderr, "Unknown response code %i\n", responseCode);
+               return -1;
+       }
+       
+       return -1;
+}
+
+/**
+ * \brief Give money to another user
+ */
+int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason)
+{
+       char    *buf;
+        int    responseCode;
+       
+       if( Ammount < 0 ) {
+               printf("Sorry, you can only give, you can't take.\n");
+               return -1;
+       }
+       
+       // Fast return on zero
+       if( Ammount == 0 ) {
+               printf("Are you actually going to give any?\n");
+               return 0;
+       }
+       
+       sendf(Socket, "GIVE %s %i %s\n", Username, Ammount, Reason);
+       buf = ReadLine(Socket);
+       
+       responseCode = atoi(buf);
+       free(buf);
+       
+       switch(responseCode)
+       {
+       case 200:       return 0;       // OK
+       
+       case 402:       
+               fprintf(stderr, "Insufficient balance\n");
+               return 1;
+       
+       case 404:       // Unknown user
+               fprintf(stderr, "Unknown user '%s'\n", Username);
+               return 2;
+       
+       default:
+               fprintf(stderr, "Unknown response code %i\n", responseCode);
+               return -1;
+       }
+       
+       return -1;
+}
+
+
+/**
+ * \brief Donate money to the club
+ */
+int Dispense_Donate(int Socket, int Ammount, const char *Reason)
+{
+       char    *buf;
+        int    responseCode;
+       
+       if( Ammount < 0 ) {
+               printf("Sorry, you can only give, you can't take.\n");
+               return -1;
+       }
+       
+       // Fast return on zero
+       if( Ammount == 0 ) {
+               printf("Are you actually going to give any?\n");
+               return 0;
+       }
+       
+       sendf(Socket, "DONATE %i %s\n", Ammount, Reason);
+       buf = ReadLine(Socket);
+       
+       responseCode = atoi(buf);
+       free(buf);
+       
+       switch(responseCode)
+       {
+       case 200:       return 0;       // OK
+       
+       case 402:       
+               fprintf(stderr, "Insufficient balance\n");
+               return 1;
+       
+       default:
+               fprintf(stderr, "Unknown response code %i\n", responseCode);
+               return -1;
+       }
+       
+       return -1;
+}
+
+/**
+ * \brief Enumerate users
+ */
+int Dispense_EnumUsers(int Socket)
+{
+       char    *buf;
+        int    responseCode;
+        int    nUsers;
+       regmatch_t      matches[4];
+       
+       if( giMinimumBalance != INT_MIN ) {
+               if( giMaximumBalance != INT_MAX ) {
+                       sendf(Socket, "ENUM_USERS min_balance:%i max_balance:%i\n", giMinimumBalance, giMaximumBalance);
+               }
+               else {
+                       sendf(Socket, "ENUM_USERS min_balance:%i\n", giMinimumBalance);
+               }
+       }
+       else {
+               if( giMaximumBalance != INT_MAX ) {
+                       sendf(Socket, "ENUM_USERS max_balance:%i\n", giMaximumBalance);
+               }
+               else {
+                       sendf(Socket, "ENUM_USERS\n");
+               }
+       }
+       buf = ReadLine(Socket);
+       responseCode = atoi(buf);
+       
+       switch(responseCode)
+       {
+       case 201:       break;  // Ok, length follows
+       
+       default:
+               fprintf(stderr, "Unknown response code %i\n%s\n", responseCode, buf);
+               free(buf);
+               return -1;
+       }
+       
+       // Get count (not actually used)
+       RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
+       nUsers = atoi( buf + matches[3].rm_so );
+       printf("%i users returned\n", nUsers);
+       
+       // Free string
+       free(buf);
+       
+       // Read returned users
+       do {
+               buf = ReadLine(Socket);
+               responseCode = atoi(buf);
+               
+               if( responseCode != 202 )       break;
+               
+               _PrintUserLine(buf);
+               free(buf);
+       } while(responseCode == 202);
+       
+       // Check final response
+       if( responseCode != 200 ) {
+               fprintf(stderr, "Unknown response code %i\n%s\n", responseCode, buf);
+               free(buf);
+               return -1;
+       }
+       
+       free(buf);
+       
+       return 0;
+}
+
+int Dispense_ShowUser(int Socket, const char *Username)
+{
+       char    *buf;
+        int    responseCode, ret;
+       
+       sendf(Socket, "USER_INFO %s\n", Username);
+       buf = ReadLine(Socket);
+       
+       responseCode = atoi(buf);
+       
+       switch(responseCode)
+       {
+       case 202:
+               _PrintUserLine(buf);
+               ret = 0;
+               break;
+       
+       case 404:
+               printf("Unknown user '%s'\n", Username);
+               ret = 1;
+               break;
+       
+       default:
+               fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf);
+               ret = -1;
+               break;
+       }
+       
+       free(buf);
+       
+       return ret;
+}
+
+void _PrintUserLine(const char *Line)
+{
+       regmatch_t      matches[6];
+        int    bal;
+       
+       RunRegex(&gUserInfoRegex, Line, 6, matches, "Malformed server response");
+       // 3: Username
+       // 4: Balance
+       // 5: Flags
+       {
+                int    usernameLen = matches[3].rm_eo - matches[3].rm_so;
+               char    username[usernameLen + 1];
+                int    flagsLen = matches[5].rm_eo - matches[5].rm_so;
+               char    flags[flagsLen + 1];
+               
+               memcpy(username, Line + matches[3].rm_so, usernameLen);
+               username[usernameLen] = '\0';
+               memcpy(flags, Line + matches[5].rm_so, flagsLen);
+               flags[flagsLen] = '\0';
+               
+               bal = atoi(Line + matches[4].rm_so);
+               printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, abs(bal)%100, flags);
+       }
+}
+
+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 ---
+// ---------------
+char *ReadLine(int Socket)
+{
+       static char     buf[BUFSIZ];
+       static int      bufPos = 0;
+       static int      bufValid = 0;
+        int    len;
+       char    *newline = NULL;
+        int    retLen = 0;
+       char    *ret = malloc(10);
+       
+       #if DEBUG_TRACE_SERVER
+       printf("ReadLine: ");
+       #endif
+       fflush(stdout);
+       
+       ret[0] = '\0';
+       
+       while( !newline )
+       {
+               if( bufValid ) {
+                       len = bufValid;
+               }
+               else {
+                       len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
+                       buf[bufPos+len] = '\0';
+               }
+               
+               newline = strchr( buf+bufPos, '\n' );
+               if( newline ) {
+                       *newline = '\0';
+               }
+               
+               retLen += strlen(buf+bufPos);
+               ret = realloc(ret, retLen + 1);
+               strcat( ret, buf+bufPos );
+               
+               if( newline ) {
+                        int    newLen = newline - (buf+bufPos) + 1;
+                       bufValid = len - newLen;
+                       bufPos += newLen;
+               }
+               if( len + bufPos == BUFSIZ - 1 )        bufPos = 0;
+       }
+       
+       #if DEBUG_TRACE_SERVER
+       printf("%i '%s'\n", retLen, ret);
+       #endif
+       
+       return ret;
+}
+
+int sendf(int Socket, const char *Format, ...)
+{
+       va_list args;
+        int    len;
+       
+       va_start(args, Format);
+       len = vsnprintf(NULL, 0, Format, args);
+       va_end(args);
+       
+       {
+               char    buf[len+1];
+               va_start(args, Format);
+               vsnprintf(buf, len+1, Format, args);
+               va_end(args);
+               
+               #if DEBUG_TRACE_SERVER
+               printf("sendf: %s", buf);
+               #endif
+               
+               return send(Socket, buf, len, 0);
+       }
 }
 
 char *trim(char *string)

UCC git Repository :: git.ucc.asn.au