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_Give(int Socket, const char *Username, 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' Dispense as another user
+char *gsItemPattern; //!< Item pattern
+char *gsEffectiveUser; //!< '-u' Dispense as another user
int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI?
int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct`
int giMaximumBalance = INT_MAX; //!< '-M' Maximum balance for `dispense acct`
break;
case 'u': // Override User
- gsOverrideUser = argv[++i];
+ gsEffectiveUser = argv[++i];
break;
case 'G': // Use GUI
if( strcmp(arg, "acct") == 0 )
{
-
// Connect to server
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
// Alter account?
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
// argv[i+3]: Reason
- if( argv[i+2][0] == '=' ) {
- // Set balance
- Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2] + 1), argv[i+3]);
- }
- else {
- // Alter balance
- Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
- }
+ // Alter balance
+ Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
}
+ // Show user information
Dispense_ShowUser(sock, argv[i+1]);
close(sock);
return 0;
}
+ //
+ // `dispense give`
+ // - "Here, have some money."
+ else 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 (Wheel Only)
+ else 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;
+ }
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();
}
{
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"
+ " dispense\n"
+ " Show interactive list\n"
+ " dispense <item>\n"
+ " Dispense named item\n"
+ " dispense give <user> <ammount> \"<reason>\"\n"
+ " Give some of your money away\n"
+ " dispense acct [<user>]\n"
+ " Show user balances\n"
+ " dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+ " Alter a account value (Coke members only)\n"
+ " dispense user add <user>\n"
+ " Create new coke account (Wheel members only)\n"
+ " dispense user type <flags>\n"
+ " Alter a user's flags\n"
+ " <flags> is a comma-separated list of user,coke,wheel,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"
- "\t-m <min balance>\n"
- "\t-M <max balance>\n"
- "\t\tSet the Maximum/Minimum balances shown in `dispense acct`\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"
);
}
{
case 200: // Authenticated, return :)
- gbIsAuthenticated = 1;
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;
}
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
*/
-int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason)
+int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason)
{
char *buf;
int responseCode;
- sendf(Socket, "SET %s %i %s\n", Username, Ammount, Reason);
+ 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);
switch(responseCode)
{
case 200: return 0; // OK
- case 403: // Not in coke
- fprintf(stderr, "You are not in coke (sucker)\n");
+
+ 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 Enumerate users
+ */
int Dispense_EnumUsers(int Socket)
{
char *buf;
}
}
+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 ---
// ---------------
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au