Cleaning up client code and server responses
[tpg/opendispense2.git] / src / client / main.c
index ee93227..361d62d 100644 (file)
@@ -14,6 +14,7 @@
 #include <ctype.h>     // isspace
 #include <stdarg.h>
 #include <regex.h>
+#include <ncurses.h>
 
 #include <unistd.h>    // close
 #include <netdb.h>     // gethostbyname
@@ -21,6 +22,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <openssl/sha.h>       // SHA1
+
+#define        USE_NCURSES_INTERFACE   0
 
 // === TYPES ===
 typedef struct sItem {
@@ -30,9 +34,12 @@ typedef struct sItem {
 }      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);
+ int   Authenticate(int Socket);
 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);
@@ -42,8 +49,7 @@ char  *gsDispenseServer = "localhost";
  int   giDispensePort = 11020;
 tItem  *gaItems;
  int   giNumItems;
-regex_t        gArrayRegex;
-regex_t        gItemRegex;
+regex_t        gArrayRegex, gItemRegex, gSaltRegex;
 
 // === CODE ===
 int main(int argc, char *argv[])
@@ -57,6 +63,8 @@ int main(int argc, char *argv[])
        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);
@@ -152,12 +160,11 @@ int main(int argc, char *argv[])
                printf("%3i %s\n", gaItems[i].Price, gaItems[i].Desc);
        }
        
-       Authenticate(sock);
-       
        // and choose what to dispense
-       // TODO: ncurses interface (with separation between item classes)
-       // - Hmm... that would require standardising the item ID to be <class>:<index>
-       // Oh, why not :)
+       
+       #if USE_NCURSES_INTERFACE
+       i = ShowNCursesUI();
+       #else
        
        for(;;)
        {
@@ -181,36 +188,44 @@ int main(int argc, char *argv[])
                                printf("Bad item (should be between 0 and %i)\n", giNumItems);
                                continue;
                        }
-                       
-                       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\n", responseCode);
-                               break;
-                       }
-                       
+                       break;
+               }
+       }
+       #endif
+       
+       // Check for a valid item ID and if so, authenticate
+       if( i >= 0 && Authenticate(sock) )
+       {       
+               // 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;
+               case 501:
+                       printf("Dispense not possible (slot empty/permissions)\n");
+                       break;
+               default:
+                       printf("Unknown response code %i ('%s')\n", responseCode, buffer);
                        break;
                }
        }
@@ -220,6 +235,208 @@ int main(int argc, char *argv[])
        return 0;
 }
 
+/**
+ * \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;
+       
+       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);
+}
+
+/**
+ * \brief Render the NCurses UI
+ */
+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( ;; )
+       {
+               // 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('|');
+                       }
+               }
+               
+               // 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;
+               }
+               
+       }
+       
+       
+       // Leave
+       endwin();
+       return -1;
+}
+
+/**
+ * \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;
+       
+       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);
+       
+       // Sanity check
+       if( lLen + mLen/2 > Width/2 || mLen/2 + rLen > Width/2 ) {
+               return ;        // TODO: What to do?
+       }
+       
+       move(Row, Col);
+       
+       // 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);
+       }
+}
+
 // === HELPERS ===
 int sendf(int Socket, const char *Format, ...)
 {
@@ -284,11 +501,18 @@ 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];
         int    responseCode;
+       char    salt[32];
+        int    i;
+       regmatch_t      matches[4];
        
        // Get user name
        pwd = getpwuid( getuid() );
@@ -304,19 +528,82 @@ void Authenticate(int Socket)
        switch( responseCode )
        {
        case 200:       // Authenticated, return :)
-               return ;
+               return 0;
        case 401:       // Untrusted, attempt password authentication
-               break;
+               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");
+               responseCode = atoi(buf);
+               if( responseCode != 100 ) {
+                       fprintf(stderr, "Unknown repsonse code %i from server\n", responseCode);
+                       return -1;      // ERROR
+               }
+               
+               // Check for salt
+               if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) {
+                       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;
+               }
+               
+               // Get password
+               fflush(stdout);
+               
+               // Give three attempts
+               for( i = 0; i < 3; i ++ )
+               {
+                        int    ofs = strlen(pwd->pw_name)+strlen(salt);
+                       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 );
+                       memcpy(tmp+ofs, h, 20);
+                       
+                       // 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]
+                               );
+                       fflush(stdout); // Debug
+               
+                       // Send password
+                       sendf(Socket, "PASS %s\n", buf);
+                       recv(Socket, buf, 511, 0);
+               
+                       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", responseCode);
+                       return -1;
+               }
+               return 2;       // 2 = Bad Password
+       
        case 404:       // Bad Username
                fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
-               exit(-1);
+               return 1;
+       
        default:
                fprintf(stderr, "Unkown response code %i from server\n", responseCode);
                printf("%s\n", buf);
-               exit(-1);
+               return -1;
        }
        
        printf("%s\n", buf);
+       return 0;       // Seems OK
 }
 
 char *trim(char *string)

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