#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 {
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);
+void PopulateItemList(int Socket);
+ int DispenseItem(int Socket, int ItemID);
+
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);
int giDispensePort = 11020;
tItem *gaItems;
int giNumItems;
-regex_t gArrayRegex;
-regex_t gItemRegex;
+regex_t gArrayRegex, gItemRegex, gSaltRegex;
+
+char *gsOverrideUser;
// === 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-z0-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;
- // Determine what to do
- if( argc > 1 )
- {
- if( strcmp(argv[1], "acct") == 0 )
- {
- // Alter account
- // List accounts
- return 0;
- }
- }
+ // Authenticate
+ Authenticate(sock);
- // 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
+ // Parse Arguments
+ for( i = 1; i < argc; i ++ )
{
- char *itemType, *itemStart;
- int count;
- regmatch_t matches[4];
+ char *arg = argv[i];
- // 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( arg[0] == '-' ) {
+
+ switch(arg[1])
+ {
+ case 'u': // Override User
+ gsOverrideUser = argv[++i];
+ break;
+ }
+
+ continue;
}
-
- itemStart = &buffer[ matches[3].rm_eo ];
-
- gaItems = malloc( count * sizeof(tItem) );
-
- for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ )
- {
- char *next = strchr( ++itemStart, ' ' );
- if( next ) *next = '\0';
- gaItems[giNumItems].Ident = strdup(itemStart);
- itemStart = next;
+ if( strcmp(argv[1], "acct") == 0 ) {
+ // Alter account
+ // List accounts
+ 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;
+ else {
+ // Item name / pattern
}
-
- 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);
}
+
+ // Get items
+ PopulateItemList(sock);
- 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 1
- i = ShowNCursesUI();
+ #if USE_NCURSES_INTERFACE
+ i = ShowNCursesUI();
#else
-
- 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' )
+ for( i = 0; i < giNumItems; i ++ ) {
+ printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, 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
+ // 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\n", responseCode);
- break;
- }
- }
+ DispenseItem(sock, i);
close(sock);
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;
}
/**
+ * \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 displayMinWidth = 40;
const int displayMinItems = 8;
char *titleString = "Dispense";
int itemCount = displayMinItems;
return -1;
}
-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;
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() );
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
+}
+
+void PopulateItemList(int Socket)
+{
+ char buffer[BUFSIZ];
+ int len;
+ int responseCode;
+
+ char *itemType, *itemStart;
+ int count, i;
+ regmatch_t matches[4];
+
+ // Ask server for stock list
+ send(Socket, "ENUM_ITEMS\n", 11, 0);
+ len = recv(Socket, 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);
+ exit(-1);
+ }
+
+ // - Get item list -
+
+ // 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);
+ exit(-1);
+ }
+
+ itemStart = &buffer[ matches[3].rm_eo ];
+
+ gaItems = malloc( count * sizeof(tItem) );
+
+ for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ )
+ {
+ char *next = strchr( ++itemStart, ' ' );
+ if( next ) *next = '\0';
+ gaItems[giNumItems].Ident = strdup(itemStart);
+ itemStart = next;
+ }
+
+ // Fetch item information
+ for( i = 0; i < giNumItems; i ++ )
+ {
+ regmatch_t matches[6];
+
+ // Get item info
+ sendf(Socket, "ITEM_INFO %s\n", gaItems[i].Ident);
+ len = recv(Socket, 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);
+ exit(-1);
+ }
+
+ 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 );
+ }
+}
+
+int DispenseItem(int Socket, int ItemID)
+{
+ int len, responseCode;
+ char buffer[BUFSIZ];
+
+ if( ItemID < 0 || ItemID > giNumItems ) return -1;
+
+ // Dispense!
+ sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident);
+ len = recv(Socket, buffer, BUFSIZ-1, 0);
+ buffer[len] = '\0';
+ trim(buffer);
+
+ responseCode = atoi(buffer);
+ switch( responseCode )
+ {
+ case 200:
+ printf("Dispense OK\n");
+ return 0;
+ case 401:
+ printf("Not authenticated\n");
+ return 1;
+ case 402:
+ printf("Insufficient balance\n");
+ return 1;
+ case 406:
+ printf("Bad item name, bug report\n");
+ return 1;
+ case 500:
+ printf("Item failed to dispense, is the slot empty?\n");
+ return 1;
+ case 501:
+ printf("Dispense not possible (slot empty/permissions)\n");
+ return 1;
+ default:
+ printf("Unknown response code %i ('%s')\n", responseCode, buffer);
+ return -2;
+ }
}
char *trim(char *string)
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au