#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
+
enum eUI_Modes
{
UI_MODE_BASIC, // Non-NCurses
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
// === CODE ===
int main(int argc, char *argv[])
{
int sock;
- int i;
+ int i, ret = 0;
char buffer[BUFSIZ];
+ char *text_args[MAX_TXT_ARGS]; // Non-flag arguments
+ int text_argc = 0;
+ text_args[0] = "";
+
// -- Create regular expressions
// > Code Type Count ...
CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED); //
case '?':
ShowUsage();
return 0;
-
+
+ case 'c':
+ 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 ;
+
case 'm': // Minimum balance
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -m takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
giMinimumBalance = atoi(argv[++i]);
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -M takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
giMaximumBalance = atoi(argv[++i]);
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
gsEffectiveUser = argv[++i];
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -H takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
gsDispenseServer = argv[++i];
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -P takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
giDispensePort = atoi(argv[++i]);
break;
case 'n': // Dry Run / read-only
gbDryRun = 1;
break;
+ default:
+ if( text_argc + 1 == MAX_TXT_ARGS )
+ {
+ fprintf(stderr, "ERROR: Too many arguments\n");
+ return 1;
+ }
+ text_args[text_argc++] = argv[i];
+ break;
}
continue;
}
-
- //
- // `dispense acct`
- // -
- if( strcmp(arg, "acct") == 0 )
+
+ if( text_argc + 1 == MAX_TXT_ARGS )
{
- // Connect to server
- sock = OpenConnection(gsDispenseServer, giDispensePort);
- if( sock < 0 ) return -1;
+ fprintf(stderr, "ERROR: Too many arguments\n");
+ return 1;
+ }
+
+ text_args[text_argc++] = argv[i];
+
+ }
- // List accounts?
- if( i + 1 == argc ) {
- Dispense_EnumUsers(sock);
- return 0;
- }
-
- // argv[i+1]: Username
-
- // Alter account?
- if( i + 2 < argc )
- {
- if( i + 3 >= argc ) {
- fprintf(stderr, "Error: `dispense acct' needs a reason\n");
- exit(1);
- }
-
- // Authentication required
- if( Authenticate(sock) )
- return -1;
-
- // argv[i+1]: Username
- // argv[i+2]: Ammount
- // argv[i+3]: Reason
-
- if( argv[i+2][0] == '=' ) {
- // Set balance
- 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
- Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
- }
- }
-
- // Show user information
- Dispense_ShowUser(sock, argv[i+1]);
-
+ //
+ // `dispense acct`
+ // -
+ if( strcmp(text_args[0], "acct") == 0 )
+ {
+ // Connect to server
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return -1;
+ // List accounts?
+ if( text_argc == 1 ) {
+ ret = Dispense_EnumUsers(sock);
close(sock);
- return 0;
+ return ret;
}
- //
- // `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;
- }
-
- // 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 )
+ // text_args[1]: Username
+
+ // Alter account?
+ if( text_argc == 4 )
{
- // 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
+ // Authentication required
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();
+ // text_args[1]: Username
+ // text_args[2]: Ammount
+ // text_args[3]: Reason
+
+ if( text_args[2][0] == '=' ) {
+ // Set balance
+ if( text_args[2][1] != '0' && atoi(text_args[2]+1) == 0 ) {
+ fprintf(stderr, "Error: Invalid balance to be set\n");
exit(1);
}
- Dispense_AddUser(sock, argv[i+2]);
+ ret = Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
}
- // 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 {
+ // Alter balance
+ ret = Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
}
- else
- {
- fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
+ }
+ // TODO: Preserve ret if non-zero
+
+ // Show user information
+ ret = Dispense_ShowUser(sock, text_args[1]);
+
+ close(sock);
+ return ret;
+ }
+ //
+ // `dispense give`
+ // - "Here, have some money."
+ if( strcmp(text_args[0], "give") == 0 )
+ {
+ if( text_argc != 4 ) {
+ fprintf(stderr, "`dispense give` takes three arguments\n");
+ ShowUsage();
+ return -1;
+ }
+
+ // text_args[1]: Destination
+ // text_args[2]: Ammount
+ // text_args[3]: Reason
+
+ // Connect to server
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return -1;
+
+ // Authenticate
+ if( Authenticate(sock) )
+ return -1;
+
+ ret = Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+
+ close(sock);
+
+ return ret;
+ }
+ //
+ // `dispense user`
+ // - User administration (Admin Only)
+ if( strcmp(text_args[0], "user") == 0 )
+ {
+ // Check argument count
+ if( text_argc == 1 ) {
+ 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(text_args[1], "add") == 0 )
+ {
+ if( text_argc != 3 ) {
+ fprintf(stderr, "Error: `dispense user add` requires an argument\n");
ShowUsage();
exit(1);
}
- return 0;
+
+ ret = Dispense_AddUser(sock, text_args[2]);
}
-
- // Donation!
- if( strcmp(arg, "donate") == 0 )
+ // Update a user
+ else if( strcmp(text_args[1], "type") == 0 || strcmp(text_args[1], "flags") == 0 )
{
- // Check argument count
- if( i + 2 >= argc ) {
- fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+ if( text_argc != 4 ) {
+ fprintf(stderr, "Error: `dispense user flags` 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;
+ ret = Dispense_SetUserType(sock, text_args[2], text_args[3]);
+ }
+ else
+ {
+ fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
+ ShowUsage();
+ exit(1);
+ }
+ close(sock);
+ return ret;
+ }
+ // Donation!
+ else if( strcmp(text_args[0], "donate") == 0 )
+ {
+ // Check argument count
+ if( text_argc != 3 ) {
+ fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+ ShowUsage();
+ exit(1);
}
- else {
- // Item name / pattern
- gsItemPattern = arg;
- break;
+ // Connect to server
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return -1;
+
+ // Attempt authentication
+ if( Authenticate(sock) )
+ return -1;
+
+ // Do donation
+ ret = Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+
+ close(sock);
+
+ return ret;
+ }
+ // Query an item price
+ else if( strcmp(text_args[0], "iteminfo") == 0 )
+ {
+ regmatch_t matches[3];
+ char *type;
+ int id;
+ // Check argument count
+ if( text_argc != 2 ) {
+ fprintf(stderr, "Error: `dispense iteminfo` requires an argument\n");
+ ShowUsage();
+ exit(1);
+ }
+ // Parse item ID
+ if( RunRegex(&gUserItemIdentRegex, text_args[1], 3, matches, NULL) != 0 ) {
+ fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+ exit(1);
}
+ type = text_args[1] + matches[1].rm_so;
+ text_args[1][ matches[1].rm_eo ] = '\0';
+ id = atoi( text_args[1] + matches[2].rm_so );
+
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return -1;
+ ret = Dispense_ItemInfo(sock, type, id);
+ close(sock);
+ return ret;
+ }
+ // Item name / pattern
+ else {
+ gsItemPattern = text_args[0];
}
// Connect to server
// Disconnect from server
close(sock);
- if( gsItemPattern )
+ if( gsItemPattern && gsItemPattern[0] )
{
regmatch_t matches[3];
// Door (hard coded)
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
Authenticate(sock);
- DispenseItem(sock, "door", 0);
+ ret = DispenseItem(sock, "door", 0);
close(sock);
- return 0;
+ return ret;
}
// Item id (<type>:<num>)
else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
Dispense_ItemInfo(sock, ident, id);
Authenticate(sock);
- DispenseItem(sock, ident, id);
+ ret = DispenseItem(sock, ident, id);
close(sock);
- return 0;
+ return ret;
}
// Item number (6 = coke)
else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
// Check for a valid item ID
if( i >= 0 )
{
+ int j;
// Connect, Authenticate, dispense and close
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
Authenticate(sock);
- DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+ 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);
+ }
close(sock);
}
- return 0;
+ return ret;
}
void ShowUsage(void)
" == Everyone ==\n"
" dispense\n"
" Show interactive list\n"
- " dispense <item>\n"
- " Dispense named item\n"
+ " dispense <name>|<index>|<itemid>\n"
+ " Dispense named item (<name> matches if it is a unique prefix)\n"
" dispense give <user> <ammount> \"<reason>\"\n"
" Give money to another user\n"
" dispense donate <ammount> \"<reason>\"\n"
" Donate to the club\n"
+ " dispense iteminfo <type>:<id>\n"
+ " Get the name and price for an item\n"
" == Coke members == \n"
" dispense acct [<user>]\n"
" Show user balances\n"
username = pwd->pw_name;
}
// Get balance
- snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, giUserBalance%100);
+ snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
// Enter curses mode
initscr();
- raw(); noecho();
+ cbreak(); noecho();
// Get max index
maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
// Width = 0, don't print
if( Width > 0 )
{
+ // 4 preceding, 5 price
+ int nameWidth = Width - 4 - 5;
move( Row, Col );
if( Index >= 0 )
{
case 0:
if( bHilighted )
- printw("-> ");
+ printw("-> ");
else
- printw(" ");
+ printw(" ");
break;
case 1:
- printw("SLD");
+ printw("SLD ");
break;
default:
case -1:
- printw("ERR");
+ printw("ERR ");
break;
}
- printw(" %s", name);
+ printw("%-*.*s", nameWidth, nameWidth, name);
- getyx(stdscr, _y, _x);
+// getyx(stdscr, _y, _x);
// Assumes max 4 digit prices
- times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
- while(times--) addch(' ');
+// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
+// while(times--) addch(' ');
printw(" %4i", price);
}
fprintf(stderr, "Failed to create socket\n");
return -1;
}
+
+// printf("geteuid() = %i, getuid() = %i\n", geteuid(), getuid());
- if( geteuid() == 0 )
+ if( geteuid() == 0 || getuid() == 0 )
{
int i;
struct sockaddr_in localAddr;
localAddr.sin_family = AF_INET; // IPv4
// Loop through all the top ports until one is avaliable
- for( i = 1001; i < 1024; i ++)
+ for( i = 512; i < 1024; i ++)
{
localAddr.sin_port = htons(i); // IPv4
// Attempt to bind to low port for autoauth
}
if( i == 1024 )
printf("Warning: AUTOAUTH unavaliable\n");
+// else
+// printf("Bound to 0.0.0.0:%i\n", i);
}
if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) {
printf("Dry Run - No action\n");
return 0;
}
+
+ // Sanity
+ if( Ammount == 0 ) {
+ printf("An ammount would be nice\n");
+ return 1;
+ }
sendf(Socket, "ADD %s %i %s\n", Username, Ammount, Reason);
buf = ReadLine(Socket);
if( Ammount < 0 ) {
printf("Sorry, you can only give, you can't take.\n");
- return -1;
+ return 1;
}
// Fast return on zero
if( Ammount == 0 ) {
printf("Are you actually going to give any?\n");
- return 0;
+ return 1;
}
// Check for a dry run
switch(responseCode)
{
- case 200: return 0; // OK
+ case 200:
+ printf("Give succeeded\n");
+ return 0; // OK
case 402:
fprintf(stderr, "Insufficient balance\n");
// Fast return on zero
if( Ammount == 0 ) {
printf("Are you actually going to give any?\n");
- return 0;
+ return 1;
}
// Check for a dry run