Fix position of balance output with set
[tpg/opendispense2.git] / src / client / main.c
index ed7d1a2..2bd4312 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>     // isspace
-#include <stdarg.h>
-#include <regex.h>
-#include <ncurses.h>
-
-#include <unistd.h>    // close
-#include <netdb.h>     // gethostbyname
 #include <pwd.h>       // getpwuids
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <openssl/sha.h>       // SHA1
+#include <unistd.h>    // close/getuid
+#include <limits.h>    // INT_MIN/INT_MAX
+#include "common.h"
 
 #define        USE_NCURSES_INTERFACE   0
+#define DEBUG_TRACE_SERVER     0
+#define USE_AUTOAUTH   1
+
+#define MAX_TXT_ARGS   5       // Maximum number of textual arguments (including command)
+#define DISPENSE_MULTIPLE_MAX  20      // Maximum argument to -c
 
 // === TYPES ===
-typedef struct sItem {
-       char    *Ident;
-       char    *Desc;
-        int    Price;
-}      tItem;
 
 // === PROTOTYPES ===
- int   ShowNCursesUI(void);
-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, ...);
- int   OpenConnection(const char *Host, int Port);
-void   Authenticate(int Socket);
+void   ShowUsage(void);
+ int   main(int argc, char *argv[]);
+ int   ParseArguments(int argc, char *argv[]);
+// --- Coke Server Communication ---
+// --- Helpers ---
 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);
 
 // === GLOBALS ===
-char   *gsDispenseServer = "localhost";
+char   *gsDispenseServer = "merlo.ucc.gu.uwa.edu.au";
  int   giDispensePort = 11020;
+
 tItem  *gaItems;
  int   giNumItems;
-regex_t        gArrayRegex, gItemRegex, gSaltRegex;
+regex_t        gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex;
+ int   gbIsAuthenticated = 0;
+
+char   *gsItemPattern; //!< Item pattern
+char   *gsEffectiveUser;       //!< '-u' Dispense as another user
+
+enum eUI_Modes giUIMode = UI_MODE_STANDARD;
+ int   gbDryRun = 0;   //!< '-n' Read-only
+ int   gbDisallowSelectWithoutBalance = 1;     //!< Don't allow items to be hilighted if not affordable
+
+ int   giMinimumBalance = INT_MIN;     //!< '-m' Minumum balance for `dispense acct`
+ int   giMaximumBalance = INT_MAX;     //!< '-M' Maximum balance for `dispense acct`
+
+ char  *gsUserName;    //!< User that dispense will happen as
+char   *gsUserFlags;   //!< User's flag set
+ int   giUserBalance = -1;     //!< User balance (set by Authenticate)
+ int   giDispenseCount = 1;    //!< Number of dispenses to do
+
+char   *gsTextArgs[MAX_TXT_ARGS];
+ int   giTextArgc;
 
 // === CODE ===
-int main(int argc, char *argv[])
+void ShowUsage(void)
+{
+       printf( "Usage:\n" );
+       if( giTextArgc == 0 )
+               printf(
+                       "  == Everyone ==\n"
+                       "    dispense\n"
+                       "        Show interactive list\n"
+                       "    dispense <name>|<index>|<itemid>\n"
+                       "        Dispense named item (<name> 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 <user> <amount> \"<reason>\"\n"
+                       "        Give money to another user\n"
+                       );
+       
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 )
+               printf(
+                       "    dispense donate <amount> \"<reason>\"\n"
+                       "        Donate to the club\n"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "iteminfo") == 0 )
+               printf(
+                       "    dispense iteminfo <itemid>\n"
+                       "        Get the name and price for an item\n"
+                       );
+//     if( giTextArgc == 0 || strcmp(gsTextArgs[0], "enumitems") == 0 )
+//             printf(
+//                     "    dispense enumitems\n"
+//                     "        List avaliable items\n"
+//                     );
+       if( giTextArgc == 0 )
+               printf("  == Coke members == \n");
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
+               printf(
+                       "    dispense acct [<user>]\n"
+                       "        Show user balances\n"
+                       "    dispense acct <user> [+-]<amount> \"<reason>\"\n"
+                       "        Alter a account value\n"
+                       "    dispense acct <user> =<amount> \"<reason>\"\n"
+                       "        Set an account balance\n"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "refund") == 0 )
+               printf(
+                       "    dispense refund <user> <itemid> [<price>]\n"
+                       "        Refund an item to a user (with optional price override)\n"
+                       "        Item IDs can be seen in the cokelog (in the brackets after the item name)\n"
+                       "        e.g. coke:6 for a coke, snack:33 for slot 33 of the snack machine\n"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
+               printf(
+                       "    dispense slot <itemid> <price> <name>\n"
+                       "        Rename/Re-price a slot\n"
+                       );
+       if( giTextArgc == 0 )
+               printf("  == Dispense administrators ==\n");
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "user") == 0 )
+               printf(
+                       "    dispense user add <user>\n"
+                       "        Create new account\n"
+                       "    dispense user type <user> <flags> <reason>\n"
+                       "        Alter a user's flags\n"
+                       "        <flags> is a comma-separated list of user, coke, admin, internal or disabled\n"
+                       "        Flags are removed by preceding the name with '-' or '!'\n"
+                       );
+       if( giTextArgc == 0 )
+               printf( "\n"
+                       "General Options:\n"
+                       "    -c <count>\n"
+                       "        Dispense multiple times\n"
+                       "    -u <username>\n"
+                       "        Set a different user (Coke members only)\n"
+                       "    -h / -?\n"
+                       "        Show help text\n"
+                       "    -G\n"
+                       "        Use simple textual interface (instead of ncurses)\n"
+                       "    -n\n"
+                       "        Dry run - Do not actually do dispenses\n"
+                       "    -m <min balance>\n"
+                       "    -M <max balance>\n"
+                       "        Set the Maximum/Minimum balances shown in `dispense acct`\n"
+                       "Definitions:\n"
+                       "    <itemid>\n"
+                       "        Item ID of the form <type>:<num> where <type> is a non-empty string of alpha-numeric characters, and <num> is a non-negative integer\n"
+//                     "    <user>\n"
+//                     "        Account name\n"
+                       );
+}
+
+//
+// `dispense finger`
+// - Display [email protected] finger output
+//
+int subcommand_finger(void)
 {
-        int    sock;
-        int    i, responseCode, len;
-       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);
-       // > Code 'SALT' salt
-       CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+(.+)\\s+(.+)$", REG_EXTENDED);
-       
        // Connect to server
-       sock = OpenConnection(gsDispenseServer, giDispensePort);
-       if( sock < 0 )  return -1;
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
 
-       // Determine what to do
-       if( argc > 1 )
+       // Get items
+       PopulateItemList(sock);
+
+       printf("The UCC Coke machine.\n\n");
+
+       // Only get coke slot statuses
+       for( int i = 0; i <= 6; i ++ )
        {
-               if( strcmp(argv[1], "acct") == 0 )
+               const char *status;
+               switch(gaItems[i].Status)
                {
-                       // Alter account
-                       // List accounts
-                       return 0;
+               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);
        }
 
-       // 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;
+       printf("\nMay your pink fish bing into the distance.\n");
+
+       return 0;
+}
+
+//
+// `dispense acct`
+// - Display/manipulate account balances
+//
+int subcommand_acct(void)
+{
+       int ret = 0;
+
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       // List accounts?
+       if( giTextArgc == 1 ) {
+               ret = Dispense_EnumUsers(sock);
+               close(sock);
+               return ret;
        }
+               
+       // gsTextArgs[1]: Username
        
-       // Get item list
+       // Alter account?
+       if( giTextArgc != 2 )
        {
-               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;
+               if( giTextArgc != 4 ) {
+                       fprintf(stderr, "`dispense acct` requires a reason\n");
+                       ShowUsage();
+                       return RV_ARGUMENTS;
                }
                
-               itemStart = &buffer[ matches[3].rm_eo ];
-               
-               gaItems = malloc( count * sizeof(tItem) );
+               // Authentication required
+               ret = Authenticate(sock);
+               if(ret) return ret;
                
-               for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ )
-               {
-                       char    *next = strchr( ++itemStart, ' ' );
-                       if( next )      *next = '\0';
-                       gaItems[giNumItems].Ident = strdup(itemStart);
-                       itemStart = next;
+               // gsTextArgs[1]: Username
+               // gsTextArgs[2]: Ammount
+               // gsTextArgs[3]: Reason
+                char   *tmp = NULL;
+               long int balance = strtol(gsTextArgs[2]+(gsTextArgs[2][0] == '='), &tmp, 10);
+               if(!tmp || *tmp != '\0') {
+                       fprintf(stderr, "dispense acct: Value must be a decimal number of cents\n");
+                       return RV_ARGUMENTS;
                }
-       }
-       
-       // 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;
+               if( gsTextArgs[2][0] == '=' ) {
+                       // Set balance
+                       ret = Dispense_ShowUser(sock, gsTextArgs[1]);
+                       ret = Dispense_SetBalance(sock, gsTextArgs[1], balance, gsTextArgs[3]);
+               }
+               else {
+                       // Alter balance
+                       ret = Dispense_AlterBalance(sock, gsTextArgs[1], balance, gsTextArgs[3]);
                }
-               
-               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);
+       }
+       // On error, quit
+       if( ret ) {
+               close(sock);
+               return ret;
        }
        
-       // and choose what to dispense
+       // Show user information
+       ret = Dispense_ShowUser(sock, gsTextArgs[1]);
        
-       #if USE_NCURSES_INTERFACE
-       i = ShowNCursesUI();
-       #else
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense give`
+// - Transfer credit from the current user to another account
+//
+// "Here, have some money."
+//
+int subcommand_give(int argc, char *args[])
+{
+       int ret;
        
-       for(;;)
-       {
-               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' )
-               {
-                       printf("i = %i\n", i);
-                       
-                       if( i < 0 || i >= giNumItems ) {
-                               printf("Bad item (should be between 0 and %i)\n", giNumItems);
-                               continue;
-                       }
-                       break;
-               }
+       if( argc != 3 ) {
+               fprintf(stderr, "`dispense give` takes three arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
        }
-       #endif
        
-       Authenticate(sock);
+       const char *dst_acct = args[0];
+       const char *amt_str = args[1];
+       const char *message = args[2];
        
-       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;
-               }
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       // Authenticate
+       ret = Authenticate(sock);
+       if(ret) return ret;
+
+       char *end = NULL;
+       long amt = strtol(amt_str, &end, 10);
+       if( !end || *end != '\0' ) {
+               fprintf(stderr, "dispense give: Balance is invalid, must be decimal number of cents");
+               return RV_ARGUMENTS;
        }
+       ret = Dispense_Give(sock, dst_acct, amt, message);
 
        close(sock);
-
-       return 0;
+       return ret;
 }
 
-void ShowItemAt(int Row, int Col, int Width, int Index)
+// 
+// `dispense user`
+// - User administration (Admin Only)
+//
+int subcommand_user(int argc, char *args[])
 {
-        int    _x, _y, times;
-       
-       move( Row, Col );
+        int    ret;
        
-       if( Index < 0 || Index >= giNumItems ) {
-               printw("%02i OOR", Index);
-               return ;
+       // Check argument count
+       if( argc == 0 ) {
+               fprintf(stderr, "Error: `dispense user` requires arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
        }
-       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);
-}
-
-/**
- */
-int ShowNCursesUI(void)
-{
-       // TODO: ncurses interface (with separation between item classes)
-       // - Hmm... that would require standardising the item ID to be <class>:<index>
-       // Oh, why not :)
-        int    ch;
-        int    i, times;
-        int    xBase, yBase;
-       const int       displayMinWidth = 34;
-       const int       displayMinItems = 8;
-       char    *titleString = "Dispense";
-        int    itemCount = displayMinItems;
-        int    itemBase = 0;
-        
-        int    height = itemCount + 3;
-        int    width = displayMinWidth;
-        
-       // Enter curses mode
-       initscr();
-       raw(); noecho();
-       
-       xBase = COLS/2 - width/2;
-       yBase = LINES/2 - height/2;
-       
-       for( ;; )
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       // Attempt authentication
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       // Add new user?
+       if( strcmp(args[0], "add") == 0 )
        {
-               // Header
-               PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\");
-               
-               // Items
-               for( i = 0; i < itemCount; i ++ )
-               {
-                       move( yBase + 1 + i, xBase );
-                       addch('|');
-                       addch(' ');
-                       
-                       // Check for ... row
-                       if( i == 0 && itemBase > 0 ) {
-                               printw("   ...");
-                               times = width - 1 - 8;
-                               while(times--)  addch(' ');
-                       }
-                       else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) {
-                               printw("   ...");
-                               times = width - 1 - 8;
-                               while(times--)  addch(' ');
-                       }
-                       // Show an item
-                       else {
-                               ShowItemAt( yBase + 1 + i, xBase + 2, width - 4, itemBase + i);
-                               addch(' ');
-                       }
-                       
-                       // Scrollbar (if needed)
-                       if( giNumItems > itemCount ) {
-                               if( i == 0 ) {
-                                       addch('A');
-                               }
-                               else if( i == itemCount - 1 ) {
-                                       addch('V');
-                               }
-                               else {
-                                        int    percentage = itemBase * 100 / (giNumItems-itemCount);
-                                       if( i-1 == percentage*(itemCount-3)/100 ) {
-                                               addch('#');
-                                       }
-                                       else {
-                                               addch('|');
-                                       }
-                               }
-                       }
-                       else {
-                               addch('|');
-                       }
+               if( giTextArgc != 3 ) {
+                       fprintf(stderr, "Error: `dispense user add` requires an argument\n");
+                       ShowUsage();
+                       return RV_ARGUMENTS;
                }
                
-               // Footer
-               PrintAlign(yBase+height-2, xBase, width, "\\", '-', "", '-', "/");
-               
-               // Get input
-               ch = getch();
-               
-               if( ch == '\x1B' ) {
-                       ch = getch();
-                       if( ch == '[' ) {
-                               ch = getch();
-                               
-                               switch(ch)
-                               {
-                               case 'B':
-                                       if( itemBase < giNumItems - (itemCount) )
-                                               itemBase ++;
-                                       break;
-                               case 'A':
-                                       if( itemBase > 0 )
-                                               itemBase --;
-                                       break;
-                               }
-                       }
-                       else {
-                               
-                       }
-               }
-               else {
-                       break;
+               ret = Dispense_AddUser(sock, args[1]);
+       }
+       // Update a user
+       else if( strcmp(args[0], "type") == 0 || strcmp(args[0], "flags") == 0 )
+       {
+               if( argc < 3 || argc > 4 ) {
+                       fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
+                       ShowUsage();
+                       return RV_ARGUMENTS;
                }
                
+               ret = Dispense_SetUserType(sock, args[1], args[2], (argc == 3 ? "" : args[3]));
        }
-       
-       
-       // Leave
-       endwin();
-       return -1;
+       else
+       {
+               fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       close(sock);
+       return ret;
 }
 
-void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...)
+//
+// `dispense donate`
+// - Donate money to the club
+//
+int subcommand_donate(int argc, char *args[])
 {
-        int    lLen, mLen, rLen;
-        int    times;
-       
-       va_list args;
-       
-       // Get the length of the strings
-       va_start(args, Right);
-       lLen = vsnprintf(NULL, 0, Left, args);
-       mLen = vsnprintf(NULL, 0, Mid, args);
-       rLen = vsnprintf(NULL, 0, Right, args);
-       va_end(args);
+        int    ret;
        
-       // Sanity check
-       if( lLen + mLen/2 > Width/2 || mLen/2 + rLen > Width/2 ) {
-               return ;        // TODO: What to do?
+       // Check argument count
+       if( argc != 2 ) {
+               fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
        }
        
-       move(Row, Col);
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
        
-       // Render strings
-       va_start(args, Right);
-       // - Left
-       {
-               char    tmp[lLen+1];
-               vsnprintf(tmp, lLen+1, Left, args);
-               addstr(tmp);
-       }
-       // - Left padding
-       times = Width/2 - mLen/2 - lLen;
-       while(times--)  addch(Pad1);
-       // - Middle
-       {
-               char    tmp[mLen+1];
-               vsnprintf(tmp, mLen+1, Mid, args);
-               addstr(tmp);
-       }
-       // - Right Padding
-       times = Width/2 - mLen/2 - rLen;
-       while(times--)  addch(Pad2);
-       // - Right
-       {
-               char    tmp[rLen+1];
-               vsnprintf(tmp, rLen+1, Right, args);
-               addstr(tmp);
+       // Attempt authentication
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       // Do donation
+       ret = Dispense_Donate(sock, atoi(args[0]), args[1]);
+                       
+       close(sock);
+
+       return ret;
+}
+
+//
+// `dispense refund`
+// - Refund a purchased item
+//
+// "Well excuuuuse me, princess"
+//
+int subcommand_refund(int argc, char *args[])
+{
+        int    ret;
+
+       // Check argument count
+       if( argc != 2 && argc != 3 ) {
+              fprintf(stderr, "Error: `dispense refund` takes 2 or 3 arguments\n");
+              ShowUsage();
+              return RV_ARGUMENTS;
        }
+
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if(sock < 0)    return RV_SOCKET_ERROR; 
+
+       // Attempt authentication
+       ret = Authenticate(sock);
+       if(ret) return ret;
+
+        int     price = 0;
+       if( argc > 2 ) {
+              price = atoi(args[2]);
+              if( price <= 0 ) {
+                      fprintf(stderr, "Error: Override price is invalid (should be > 0)\n");
+                      return RV_ARGUMENTS;
+              }
+       }
+
+       // Username, Item, cost
+       ret = Dispense_Refund(sock, args[0], args[1], price);
+
+       // TODO: More
+       close(sock);
+       return ret;
 }
 
-// === HELPERS ===
-int sendf(int Socket, const char *Format, ...)
+//
+// `dispense iteminfo`
+// - Get the state of an item
+//
+int subcommand_iteminfo(int argc, char *args[])
 {
-       va_list args;
-        int    len;
+        int    ret;
+
+        // Check argument count
+       if( argc != 1 ) {
+               fprintf(stderr, "Error: `dispense iteminfo` takes one argument\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+
+       char *item_id = args[0];
+
+       regmatch_t matches[3];
+       // Parse item ID
+       if( RunRegex(&gUserItemIdentRegex, item_id, 3, matches, NULL) != 0 ) {
+               fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+               return RV_ARGUMENTS;
+       }
+       char    *type = item_id + matches[1].rm_so;
+       item_id[ matches[1].rm_eo ] = '\0';
+        int    id = atoi( item_id + matches[2].rm_so );
+
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       ret = Dispense_ItemInfo(sock, type, id);
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense slot`
+// - Update the name/price of an item
+//
+int subcommand_slot(int argc, char *args[])
+{
+        int    ret;
        
-       va_start(args, Format);
-       len = vsnprintf(NULL, 0, Format, args);
-       va_end(args);
+       // Check arguments
+       if( argc != 3 ) {
+               fprintf(stderr, "Error: `dispense slot` takes three arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       char *slot_id = args[0];
+       char *price_str = args[1];
+       char *newname = args[2];
+       
+       // Parse arguments
+       regmatch_t matches[3];
+       if( RunRegex(&gUserItemIdentRegex, slot_id, 3, matches, NULL) != 0 ) {
+               fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+               return RV_ARGUMENTS;
+       }
+       const char *item_type = slot_id + matches[1].rm_so;
+       slot_id[ matches[1].rm_eo ] = '\0';
+       int item_id = atoi( slot_id + matches[2].rm_so );
+
+       // - Price
+       char *end;
+       int price = strtol( price_str, &end, 0 );
+       if( price < 0 || *end != '\0' ) {
+               fprintf(stderr, "Error: Invalid price passed (must be >= 0)\n");
+               return RV_ARGUMENTS;
+       }
        
+       // -- Sanity
+       for( char *pos = newname; *pos; pos ++ )
        {
-               char    buf[len+1];
-               va_start(args, Format);
-               vsnprintf(buf, len+1, Format, args);
-               va_end(args);
-               
-               return send(Socket, buf, len, 0);
+               if( !isalnum(*pos) && *pos != ' ' ) {
+                       fprintf(stderr, "Error: You should only have letters, numbers and spaces in an item name\n");
+                       return RV_ARGUMENTS;
+               }
        }
+       
+       // Connect & Authenticate
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       // Update the slot
+       ret = Dispense_SetItem(sock, item_type, item_id, price, newname);
+       
+       close(sock);
+       return ret;
 }
 
-int OpenConnection(const char *Host, int Port)
+//
+// `dispense pincheck`
+// - Validate a user's pin (used by the snack machine)
+//
+int subcommand_pincheck(int argc, char *args[])
 {
-       struct hostent  *host;
-       struct sockaddr_in      serverAddr;
-        int    sock;
+        int    ret;
        
-       host = gethostbyname(Host);
-       if( !host ) {
-               fprintf(stderr, "Unable to look up '%s'\n", Host);
-               return -1;
+       if( argc < 1 || argc > 2 ) {
+               fprintf(stderr, "Error: `dispense pincheck` takes one/two arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
        }
+
+       struct passwd   *pwd = getpwuid( getuid() );
+       gsUserName = strdup(pwd->pw_name);
        
-       memset(&serverAddr, 0, sizeof(serverAddr));
+       const char *pin = args[0];
+       const char *user = (argc > 1 ? args[1] : gsUserName);
        
-       serverAddr.sin_family = AF_INET;        // IPv4
-       // NOTE: I have a suspicion that IPv6 will play sillybuggers with this :)
-       serverAddr.sin_addr.s_addr = *((unsigned long *) host->h_addr_list[0]);
-       serverAddr.sin_port = htons(Port);
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
        
-       sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if( sock < 0 ) {
-               fprintf(stderr, "Failed to create socket\n");
-               return -1;
-       }
+       ret = Authenticate(sock);
+       if(ret) return ret;
        
-       #if USE_AUTOAUTH
-       {
-               struct sockaddr_in      localAddr;
-               memset(&localAddr, 0, sizeof(localAddr));
-               localAddr.sin_family = AF_INET; // IPv4
-               localAddr.sin_port = 1023;      // IPv4
-               // Attempt to bind to low port for autoauth
-               bind(sock, &localAddr, sizeof(localAddr));
-       }
-       #endif
+       ret = DispenseCheckPin(sock, user, pin);
        
-       if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) {
-               fprintf(stderr, "Failed to connect to server\n");
-               return -1;
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense pinset`
+// - Set the pin of the current account
+//
+int subcommand_pinset(int argc, char *args[])
+{
+        int    ret;
+       
+       if( argc != 1 ) {
+               fprintf(stderr, "Error: `dispense pinset` takes one argument\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
        }
        
-       return sock;
+       const char *pin = args[0];
+       
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+
+       ret = Authenticate(sock);
+       if(ret) return ret;
+
+       ret = DispenseSetPin(sock, pin);
+       
+       close(sock);
+       return ret;
 }
 
-void Authenticate(int Socket)
+int main(int argc, char *argv[])
 {
-       struct passwd   *pwd;
-       char    buf[512];
-        int    responseCode;
-       char    salt[32];
-       regmatch_t      matches[4];
+        int    i, ret = 0;
+       char    buffer[BUFSIZ];
        
-       // Get user name
-       pwd = getpwuid( getuid() );
+       gsTextArgs[0] = "";
+
+       // -- Create regular expressions
+       // > Code Type Count ...
+       CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED);     //
+       // > Code Type Ident Status Price Desc
+       CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+(avail|sold|error)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
+       // > Code 'SALT' salt
+       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);
+       // > Item Ident
+       CompileRegex(&gUserItemIdentRegex, "^([A-Za-z]+):([0-9]+)$", REG_EXTENDED);
+
+       // Parse Arguments
+       ret = ParseArguments(argc, argv);
+       if( ret )
+               return ret;
+
+       // Sub-commands
+       if( strcmp(gsTextArgs[0], "finger") == 0 ) {
+               return subcommand_finger();
+       }
+       else if( strcmp(gsTextArgs[0], "acct") == 0 ) {
+               return subcommand_acct();
+       }
+       else if( strcmp(gsTextArgs[0], "give") == 0 ) {
+               return subcommand_give(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "user") == 0 ) {
+               return subcommand_user(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "donate") == 0 ) {
+               return subcommand_donate(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "refund") == 0 ) {
+               return subcommand_refund(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "iteminfo") == 0 ) {
+               return subcommand_iteminfo(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "slot") == 0 ) {
+               return subcommand_slot(giTextArgc-1, gsTextArgs+1);
+       }
+       else if(strcmp(gsTextArgs[0], "pincheck") == 0) {
+               return subcommand_pincheck(giTextArgc-1, gsTextArgs+1);
+       }
+       else if(strcmp(gsTextArgs[0], "pinset") == 0) {
+               return subcommand_pinset(giTextArgc-1, gsTextArgs+1);
+       }
+       else {
+               // Item name / pattern
+               gsItemPattern = gsTextArgs[0];
+       }
        
-       // Attempt automatic authentication
-       sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name);
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+
+       // Get the user's balance
+       ret = GetUserBalance(sock);
+       if(ret) return ret;
+
+       // Get items
+       PopulateItemList(sock);
        
-       // Check if it worked
-       recv(Socket, buf, 511, 0);
-       trim(buf);
+       // Disconnect from server
+       close(sock);
        
-       responseCode = atoi(buf);
-       switch( responseCode )
+       if( gsItemPattern && gsItemPattern[0] )
        {
-       case 200:       // Authenticated, return :)
-               return ;
-       case 401:       // Untrusted, attempt password authentication
-               sendf(Socket, "USER %s\n", pwd->pw_name);
-               printf("Using username %s\n", pwd->pw_name);
-               
-               recv(Socket, buf, 511, 0);
-               trim(buf);
-               // 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
+               regmatch_t matches[3];
+               // Door (hard coded)
+               if( strcmp(gsItemPattern, "door") == 0 )
+               {
+                       // Connect, Authenticate, dispense and close
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return RV_SOCKET_ERROR;
+                       ret = Authenticate(sock);
+                       if(ret) return ret;
+                       ret = DispenseItem(sock, "door", 0);
+                       close(sock);
+                       return ret;
                }
-               if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) {
-                       // Set salt
-                       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);
+               // Item id (<type>:<num>)
+               else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
+               {
+                       char    *ident;
+                        int    id;
+                       
+                       // Get and finish ident
+                       ident = gsItemPattern + matches[1].rm_so;
+                       gsItemPattern[matches[1].rm_eo] = '\0';
+                       // Get ID
+                       id = atoi( gsItemPattern + matches[2].rm_so );
+                       
+                       // Connect, Authenticate, dispense and close
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return RV_SOCKET_ERROR;
+                       
+                       Dispense_ItemInfo(sock, ident, id);
+                       
+                       ret = Authenticate(sock);
+                       if(ret) return ret;
+                       ret = DispenseItem(sock, ident, id);
+                       close(sock);
+                       return ret;
                }
-               
-               fflush(stdout);
+               // Item number (6 = coke)
+               else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
                {
-                        int    ofs = strlen(pwd->pw_name)+strlen(salt);
-                       char    tmp[ofs+20];
-                       char    *pass = getpass("Password: ");
-                       uint8_t h[20];
+                       i = atoi(gsItemPattern);
+               }
+               // Item prefix
+               else
+               {
+                        int    j;
+                        int    best = -1;
+                       for( i = 0; i < giNumItems; i ++ )
+                       {
+                               // Prefix match (with case-insensitive match)
+                               for( j = 0; gsItemPattern[j]; j ++ )
+                               {
+                                       if( gaItems[i].Desc[j] == gsItemPattern[j] )
+                                               continue;
+                                       if( tolower(gaItems[i].Desc[j]) == tolower(gsItemPattern[j]) )
+                                               continue;
+                                       break;
+                               }
+                               // Check if the prefix matched
+                               if( gsItemPattern[j] != '\0' )
+                                       continue;
+                               
+                               // Prefect match
+                               if( gaItems[i].Desc[j] == '\0' ) {
+                                       best = i;
+                                       break;
+                               }
+                               
+                               // Only one match allowed
+                               if( best == -1 ) {
+                                       best = i;
+                               }
+                               else {
+                                       // TODO: Allow ambiguous matches?
+                                       // or just print a wanrning
+                                       printf("Warning - Ambiguous pattern, stopping\n");
+                                       return RV_BAD_ITEM;
+                               }
+                       }
+                       
+                       // Was a match found?
+                       if( best == -1 )
+                       {
+                               fprintf(stderr, "No item matches the passed string\n");
+                               return RV_BAD_ITEM;
+                       }
                        
-                       strcpy(tmp, pwd->pw_name);
-                       strcat(tmp, salt);
-                       SHA1( (unsigned char*)pass, strlen(pass), h );
-                       memcpy(tmp+ofs, h, 20);
+                       i = best;
+               }
+       }
+       else if( giUIMode != UI_MODE_BASIC )
+       {
+               i = ShowNCursesUI();
+       }
+       else
+       {
+               // Very basic dispense interface
+               for( i = 0; i < giNumItems; i ++ ) {
+                       // Add a separator
+                       if( i && strcmp(gaItems[i].Type, gaItems[i-1].Type) != 0 )
+                               printf("   ---\n");
                        
-                       // 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",
-                               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
+                       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(;;)
+               {
+                       char    *buf;
+                       
+                       i = -1;
+                       
+                       fgets(buffer, BUFSIZ, stdin);
+                       
+                       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;
+                       }
+               }
+       }
+       
+       
+       // Check for a valid item ID
+       if( i >= 0 )
+       {
+                int j;
+               // Connect, Authenticate, dispense and close
+               sock = OpenConnection(gsDispenseServer, giDispensePort);
+               if( sock < 0 )  return RV_SOCKET_ERROR;
+                       
+               ret = Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+               if(ret) return ret;
                
-               sendf(Socket, "PASS %s\n", buf);
-               recv(Socket, buf, 511, 0);
-               break;
-       case 404:       // Bad Username
-               fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
-               exit(-1);
-       default:
-               fprintf(stderr, "Unkown response code %i from server\n", responseCode);
-               printf("%s\n", buf);
-               exit(-1);
+               ret = Authenticate(sock);
+               if(ret) return ret;
+               
+               for( j = 0; j < giDispenseCount; j ++ ) {
+                       ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+                       if( ret )       break;
+               }
+               if( j > 1 ) {
+                       printf("%i items dispensed\n", j);
+               }
+               Dispense_ShowUser(sock, gsUserName);
+               close(sock);
+
        }
+
+       return ret;
+}
+
+int ParseArguments(int argc, char *argv[])
+{
+       for( int i = 1; i < argc; i ++ )
+       {
+               char    *arg = argv[i];
+               
+               if( arg[0] == '-' )
+               {                       
+                       switch(arg[1])
+                       {
+                       case 'h':
+                       case '?':
+                               ShowUsage();
+                               return 0;
+                                       
+                       case 'c':
+                               if( i > 2 && strcmp(argv[i-1], "type") == 0 )
+                                       goto _default;
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -c takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return -1;
+                               }
+                               giDispenseCount = atoi(argv[++i]);
+                               if( giDispenseCount < 1 || giDispenseCount > DISPENSE_MULTIPLE_MAX ) {
+                                       fprintf(stderr, "Sorry, only 1-20 can be passed to -c (safety)\n");
+                                       return -1;
+                               }
+                               
+                               break ;
        
-       printf("%s\n", buf);
+                       case 'm':       // Minimum balance
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -m takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               giMinimumBalance = atoi(argv[++i]);
+                               break;
+                       case 'M':       // Maximum balance
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -M takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               giMaximumBalance = atoi(argv[++i]);
+                               break;
+                       
+                       case 'u':       // Override User
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               gsEffectiveUser = argv[++i];
+                               break;
+                       
+                       case 'H':       // Override remote host
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -H takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               gsDispenseServer = argv[++i];
+                               break;
+                       case 'P':       // Override remote port
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -P takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               giDispensePort = atoi(argv[++i]);
+                               break;
+                       
+                       // Set slot name/price
+                       case 's':
+                               if( giTextArgc != 0 ) {
+                                       fprintf(stderr, "%s: -s must appear before other arguments\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               gsTextArgs[0] = "slot"; // HACK!!
+                               giTextArgc ++;
+                               break;
+                       
+                       case 'G':       // Don't use GUI
+                               giUIMode = UI_MODE_BASIC;
+                               break;
+                       case 'D':       // Drinks only
+                               giUIMode = UI_MODE_DRINKSONLY;
+                               break;
+                       case 'n':       // Dry Run / read-only
+                               gbDryRun = 1;
+                               break;
+                       case '-':
+                               if( strcmp(argv[i], "--help") == 0 ) {
+                                       ShowUsage();
+                                       return 0;
+                               }
+                               else if( strcmp(argv[i], "--dry-run") == 0 ) {
+                                       gbDryRun = 1;
+                               }
+                               else if( strcmp(argv[i], "--drinks-only") == 0 ) {
+                                       giUIMode = UI_MODE_DRINKSONLY;
+                               }
+                               else if( strcmp(argv[i], "--can-select-all") == 0 ) {
+                                       gbDisallowSelectWithoutBalance = 0;
+                               }
+                               else {
+                                       fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               break;
+                       default: _default:
+                               // The first argument is not allowed to begin with 'i'
+                               // (catches most bad flags)
+                               if( giTextArgc == 0 ) {
+                                       fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               if( giTextArgc == MAX_TXT_ARGS )
+                               {
+                                       fprintf(stderr, "ERROR: Too many arguments\n");
+                                       return RV_ARGUMENTS;
+                               }
+                               gsTextArgs[giTextArgc++] = argv[i];
+                               break;
+                       }
+
+                       continue;
+               }
+
+               if( giTextArgc == MAX_TXT_ARGS )
+               {
+                       fprintf(stderr, "ERROR: Too many arguments\n");
+                       return RV_ARGUMENTS;
+               }
+       
+               gsTextArgs[giTextArgc++] = argv[i];
+       
+       }
+       return 0;
 }
 
+// ---------------
+// --- Helpers ---
+// ---------------
 char *trim(char *string)
 {
         int    i;
@@ -585,7 +988,7 @@ int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *match
         int    ret;
        
        ret = regexec(regex, string, nMatches, matches, 0);
-       if( ret ) {
+       if( ret && errorMessage ) {
                size_t  len = regerror(ret, regex, NULL, 0);
                char    errorStr[len];
                regerror(ret, regex, errorStr, len);

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