#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;
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 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, ...);
regex_t gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex;
int gbIsAuthenticated = 0;
-char *gsOverrideUser; //!< '-u' argument (dispense as another user)
+char *gsItemPattern; //!< Item pattern
+char *gsEffectiveUser; //!< '-u' Dispense as another user
int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI?
- int giSocket = -1;
+ 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[])
// > 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+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\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+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED);
// > Code 'User' Username Balance Flags
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
- gsOverrideUser = argv[++i];
+ gsEffectiveUser = argv[++i];
break;
case 'G': // Use GUI
continue;
}
+ //
+ // `dispense acct`
+ // -
if( strcmp(arg, "acct") == 0 )
{
-
// Connect to server
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
// argv[i+1]: Username
// Alter account?
- if( i + 2 < argc ) {
-
+ if( i + 2 < argc )
+ {
if( i + 3 >= argc ) {
fprintf(stderr, "Error: `dispense acct' needs a reason\n");
exit(1);
}
// Authentication required
- Authenticate(sock);
+ if( Authenticate(sock) )
+ return -1;
// argv[i+1]: Username
// argv[i+2]: Ammount
if( argv[i+2][0] == '=' ) {
// Set balance
- Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2] + 1), argv[i+3]);
+ 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
}
}
+ // Show user information
Dispense_ShowUser(sock, argv[i+1]);
close(sock);
return 0;
}
+ //
+ // `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;
+ }
+ //
+ // `dispense user`
+ // - User administration (Admin Only)
+ if( strcmp(arg, "user") == 0 )
+ {
+ // 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;
+ }
+
+ // 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;
+ }
+
else {
// Item name / pattern
+ gsItemPattern = arg;
break;
}
}
// Get items
PopulateItemList(sock);
- if( gbUseNCurses )
+ if( gsItemPattern )
+ {
+ // 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\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc);
+ 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(
"Usage:\n"
- "\tdispense\n"
- "\t\tShow interactive list\n"
- "\tdispense <item>\n"
- "\t\tDispense named item\n"
- "\tdispense give <user> <ammount> \"<reason>\"\n"
- "\t\tGive some of your money away\n"
- "\tdispense acct [<user>]\n"
- "\t\tShow user balances\n"
- "\tdispense acct <user> [+-=]<ammount> \"<reason>\"\n"
- "\t\tAlter a account value (Coke members only)\n"
+ " == 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"
- "\t-u <username>\n"
- "\t\tSet a different user (Coke members only)\n"
- "\t-h / -?\n"
- "\t\tShow help text\n"
- "\t-G\n"
- "\t\tUse alternate GUI\n"
+ " -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"
);
}
responseCode = atoi(buf);
switch( responseCode )
{
-
- case 200: // Authenticated, return :)
- gbIsAuthenticated = 1;
+ case 200: // Autoauth succeeded, return
free(buf);
- return 0;
+ break;
case 401: // Untrusted, attempt password authentication
free(buf);
return -1;
}
free(buf);
- if( i < 3 ) {
- gbIsAuthenticated = 1;
- return 0;
- }
- else
+ if( i == 3 )
return 2; // 2 = Bad Password
+ break;
case 404: // Bad Username
fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
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;
}
// - Get item list -
- // Expected format: 201 Items <count> <item1> <item2> ...
+ // 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';
}
itemStart = &buf[ 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;
- }
free(buf);
+ giNumItems = count;
+ gaItems = malloc( giNumItems * sizeof(tItem) );
+
// Fetch item information
for( i = 0; i < giNumItems; i ++ )
{
- regmatch_t matches[6];
+ regmatch_t matches[7];
// Get item info
- sendf(Socket, "ITEM_INFO %s\n", gaItems[i].Ident);
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, 6, matches, "Malformed server response");
+ RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response");
buf[ matches[3].rm_eo ] = '\0';
- gaItems[i].Price = atoi( buf + matches[4].rm_so );
- gaItems[i].Desc = strdup( buf + matches[5].rm_so );
+ 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);
}
/**
if( ItemID < 0 || ItemID > giNumItems ) return -1;
// Dispense!
- sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident);
+ sendf(Socket, "DISPENSE %s:%i\n", gaItems[ItemID].Type, gaItems[ItemID].ID);
buf = ReadLine(Socket);
responseCode = atoi(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;
}
/**
- * \brief Alter a user's balance
+ * \brief Set a user's balance
+ * \note Only avaliable to dispense admins
*/
-int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason)
+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, Ammount, Reason);
+ sendf(Socket, "SET %s %i %s\n", Username, Balance, Reason);
buf = ReadLine(Socket);
responseCode = atoi(buf);
{
case 200: return 0; // OK
case 403: // Not in coke
- fprintf(stderr, "You are not in coke (sucker)\n");
+ fprintf(stderr, "You are not an admin\n");
return 1;
case 404: // Unknown user
fprintf(stderr, "Unknown user '%s'\n", Username);
return -1;
}
-int Dispense_EnumUsers(int Socket)
+/**
+ * \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)
{
- printf("TODO: Dispense_EnumUsers\n");
+ 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;
flags[flagsLen] = '\0';
bal = atoi(Line + matches[4].rm_so);
- printf("%-15s: $%i.%02i (%s)\n", username, bal/100, bal%100, flags);
+ 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 ---
// ---------------
{
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 DBG_TRACE_SERVER
+ #if DEBUG_TRACE_SERVER
printf("ReadLine: ");
#endif
fflush(stdout);
while( !newline )
{
- len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
- buf[bufPos+len] = '\0';
+ 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 ) {
strcat( ret, buf+bufPos );
if( newline ) {
- bufPos += newline - (buf+bufPos) + 1;
+ int newLen = newline - (buf+bufPos) + 1;
+ bufValid = len - newLen;
+ bufPos += newLen;
}
if( len + bufPos == BUFSIZ - 1 ) bufPos = 0;
}
- #if DBG_TRACE_SERVER
+ #if DEBUG_TRACE_SERVER
printf("%i '%s'\n", retLen, ret);
#endif
vsnprintf(buf, len+1, Format, args);
va_end(args);
- #if DBG_TRACE_SERVER
+ #if DEBUG_TRACE_SERVER
printf("sendf: %s", buf);
#endif
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au