// Statistics
#define MAX_CONNECTION_QUEUE 5
#define INPUT_BUFFER_SIZE 256
+#define CLIENT_TIMEOUT 10 // Seconds
#define HASH_TYPE SHA1
#define HASH_LENGTH 20
void Server_Cmd_USERADD(tClient *Client, char *Args);
void Server_Cmd_USERFLAGS(tClient *Client, char *Args);
// --- Helpers ---
- int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
+void Debug(tClient *Client, const char *Format, ...);
int sendf(int Socket, const char *Format, ...);
+ int Server_int_ParseArgs(int bUseLongArg, char *ArgStr, ...);
+ int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
// === CONSTANTS ===
// - Commands
uint len = sizeof(client_addr);
int bTrusted = 0;
+ // Accept a connection
client_socket = accept(giServer_Socket, (struct sockaddr *) &client_addr, &len);
if(client_socket < 0) {
fprintf(stderr, "ERROR: Unable to accept client connection\n");
return ;
}
+ // Set a timeout on the user conneciton
+ {
+ struct timeval tv;
+ tv.tv_sec = CLIENT_TIMEOUT;
+ tv.tv_usec = 0;
+ if( setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) )
+ {
+ perror("setsockopt");
+ return ;
+ }
+ }
+
+ // Debug: Print the connection string
if(giDebugLevel >= 2) {
char ipstr[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &client_addr.sin_addr, ipstr, INET_ADDRSTRLEN);
ipstr, ntohs(client_addr.sin_port));
}
+ // Doesn't matter what, localhost is trusted
+ if( ntohl( client_addr.sin_addr.s_addr ) == 0x7F000001 )
+ bTrusted = 1;
+
// Trusted Connections
if( ntohs(client_addr.sin_port) < 1024 )
{
switch( ntohl( client_addr.sin_addr.s_addr ) )
{
case 0x7F000001: // 127.0.0.1 localhost
- //case 0x825E0D00: // 130.95.13.0
+ // case 0x825E0D00: // 130.95.13.0
+ case 0x825E0D07: // 130.95.13.7 motsugo
+ case 0x825E0D11: // 130.95.13.17 mermaid
case 0x825E0D12: // 130.95.13.18 mussel
case 0x825E0D17: // 130.95.13.23 martello
bTrusted = 1;
* it is saved to the beginning of `inbuf` and `buf` is updated to
* the end of it.
*/
+ // TODO: Use select() instead (to give a timeout)
while( (bytes = recv(Socket, buf, remspace, 0)) > 0 )
{
char *eol, *start;
*/
void Server_ParseClientCommand(tClient *Client, char *CommandString)
{
- char *space, *args;
+ char *command, *args;
int i;
- #if 0
- char **argList;
- int numArgs = 0;
- #endif
- // Split at first space
- space = strchr(CommandString, ' ');
- if(space == NULL) {
- args = NULL;
- }
- else {
- *space = '\0';
- args = space + 1;
- while( *space == ' ' ) space ++;
-
- #if 0
- // Count arguments
- numArgs = 1;
- for( i = 0; args[i]; )
- {
- while( CommandString[i] != ' ' ) {
- if( CommandString[i] == '"' ) {
- while( !(CommandString[i] != '\\' CommandString[i+1] == '"' ) )
- i ++;
- i ++;
- }
- i ++;
- }
- numArgs ++;
- while( CommandString[i] == ' ' ) i ++;
- }
- #endif
+ if( giDebugLevel >= 2 )
+ Debug(Client, "Server_ParseClientCommand: (CommandString = '%s')", CommandString);
+
+ if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) )
+ {
+ // Is this an error? (just ignore for now)
+ //args = "";
}
// Find command
for( i = 0; i < NUM_COMMANDS; i++ )
{
- if(strcmp(CommandString, gaServer_Commands[i].Name) == 0) {
+ if(strcmp(command, gaServer_Commands[i].Name) == 0) {
+ if( giDebugLevel >= 2 )
+ Debug(Client, "CMD %s - \"%s\"", command, args);
gaServer_Commands[i].Function(Client, args);
return ;
}
*/
void Server_Cmd_USER(tClient *Client, char *Args)
{
- char *space = strchr(Args, ' ');
- if(space) *space = '\0'; // Remove characters after the ' '
+ char *username;
+
+ Server_int_ParseArgs(0, Args, &username, NULL);
// Debug!
if( giDebugLevel )
- printf("Client %i authenticating as '%s'\n", Client->ID, Args);
+ Debug(Client, "Authenticating as '%s'", username);
// Save username
if(Client->Username)
free(Client->Username);
- Client->Username = strdup(Args);
+ Client->Username = strdup(username);
#if USE_SALT
// Create a salt (that changes if the username is changed)
*/
void Server_Cmd_PASS(tClient *Client, char *Args)
{
- char *space = strchr(Args, ' ');
- if(space) *space = '\0'; // Remove characters after the ' '
+ char *passhash;
+
+ Server_int_ParseArgs(0, Args, &passhash, NULL);
// Pass on to cokebank
- Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, Args);
+ Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, passhash);
if( Client->UID != -1 ) {
Client->bIsAuthed = 1;
*/
void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
{
- char *space = strchr(Args, ' ');
- if(space) *space = '\0'; // Remove characters after the ' '
+ char *username;
+
+ if( Server_int_ParseArgs(0, Args, &username, NULL) )
+ {
+ sendf(Client->Socket, "407 AUTOAUTH takes 1 argument\n");
+ return ;
+ }
// Check if trusted
if( !Client->bIsTrusted ) {
if(giDebugLevel)
- printf("Client %i: Untrusted client attempting to AUTOAUTH\n", Client->ID);
+ Debug(Client, "Untrusted client attempting to AUTOAUTH");
sendf(Client->Socket, "401 Untrusted\n");
return ;
}
// Get UID
- Client->UID = Bank_GetAcctByName( Args );
+ Client->UID = Bank_GetAcctByName( username );
if( Client->UID < 0 ) {
if(giDebugLevel)
- printf("Client %i: Unknown user '%s'\n", Client->ID, Args);
+ Debug(Client, "Unknown user '%s'", username);
sendf(Client->Socket, "401 Auth Failure\n");
return ;
}
// You can't be an internal account
if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+ if(giDebugLevel)
+ Debug(Client, "Autoauth as '%s', not allowed", username);
Client->UID = -1;
sendf(Client->Socket, "401 Auth Failure\n");
return ;
}
+
+ Client->bIsAuthed = 1;
if(giDebugLevel)
- printf("Client %i: Authenticated as '%s' (%i)\n", Client->ID, Args, Client->UID);
+ Debug(Client, "Auto authenticated as '%s' (%i)", username, Client->UID);
sendf(Client->Socket, "200 Auth OK\n");
}
*/
void Server_Cmd_SETEUSER(tClient *Client, char *Args)
{
- char *space;
-
- space = strchr(Args, ' ');
+ char *username;
- if(space) *space = '\0';
+ Server_int_ParseArgs(0, Args, &username, NULL);
if( !strlen(Args) ) {
sendf(Client->Socket, "407 SETEUSER expects an argument\n");
}
// Check user permissions
- if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE) ) {
+ if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) {
sendf(Client->Socket, "403 Not in coke\n");
return ;
}
// Set id
- Client->EffectiveUID = Bank_GetAcctByName(Args);
+ Client->EffectiveUID = Bank_GetAcctByName(username);
if( Client->EffectiveUID == -1 ) {
sendf(Client->Socket, "404 User not found\n");
return ;
sendf(Client->Socket, "200 User set\n");
}
+/**
+ * \brief Send an item status to the client
+ * \param Client Who to?
+ * \param Item Item to send
+ */
+void Server_int_SendItem(tClient *Client, tItem *Item)
+{
+ char *status = "avail";
+
+ if( Item->Handler->CanDispense )
+ {
+ switch(Item->Handler->CanDispense(Item->ID, Client->UID))
+ {
+ case 0: status = "avail"; break;
+ case 1: status = "sold"; break;
+ default:
+ case -1: status = "error"; break;
+ }
+ }
+
+ sendf(Client->Socket,
+ "202 Item %s:%i %s %i %s\n",
+ Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
+ );
+}
+
/**
* \brief Enumerate the items that the server knows about
*/
void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
{
- int i;
+ int i, count;
if( Args != NULL && strlen(Args) ) {
sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n");
return ;
}
+
+ // Count shown items
+ count = 0;
+ for( i = 0; i < giNumItems; i ++ ) {
+ if( gaItems[i].bHidden ) continue;
+ count ++;
+ }
- sendf(Client->Socket, "201 Items %i\n", giNumItems);
+ sendf(Client->Socket, "201 Items %i\n", count);
for( i = 0; i < giNumItems; i ++ ) {
- sendf(Client->Socket,
- "202 Item %s:%i %i %s\n",
- gaItems[i].Handler->Name, gaItems[i].ID, gaItems[i].Price, gaItems[i].Name
- );
+ if( gaItems[i].bHidden ) continue;
+ Server_int_SendItem( Client, &gaItems[i] );
}
sendf(Client->Socket, "200 List end\n");
*/
void Server_Cmd_ITEMINFO(tClient *Client, char *Args)
{
- tItem *item = _GetItemFromString(Args);
+ tItem *item;
+ char *itemname;
+
+ if( Server_int_ParseArgs(0, Args, &itemname, NULL) ) {
+ sendf(Client->Socket, "407 ITEMINFO takes 1 argument\n");
+ return ;
+ }
+ item = _GetItemFromString(Args);
if( !item ) {
sendf(Client->Socket, "406 Bad Item ID\n");
return ;
}
- sendf(Client->Socket,
- "202 Item %s:%i %i %s\n",
- item->Handler->Name, item->ID, item->Price, item->Name
- );
+ Server_int_SendItem( Client, item );
}
void Server_Cmd_DISPENSE(tClient *Client, char *Args)
tItem *item;
int ret;
int uid;
+ char *itemname;
+
+ if( Server_int_ParseArgs(0, Args, &itemname, NULL) ) {
+ sendf(Client->Socket, "407 DISPENSE takes only 1 argument\n");
+ return ;
+ }
if( !Client->bIsAuthed ) {
sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- item = _GetItemFromString(Args);
+ item = _GetItemFromString(itemname);
if( !item ) {
sendf(Client->Socket, "406 Bad Item ID\n");
return ;
int uid, iAmmount;
int thisUid;
- if( !Client->bIsAuthed ) {
- sendf(Client->Socket, "401 Not Authenticated\n");
- return ;
- }
-
- recipient = Args;
-
- ammount = strchr(Args, ' ');
- if( !ammount ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+ // Parse arguments
+ if( Server_int_ParseArgs(1, Args, &recipient, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 GIVE takes only 3 arguments\n");
return ;
}
- *ammount = '\0';
- ammount ++;
-
- reason = strchr(ammount, ' ');
- if( !reason ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+ // Check for authed
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- *reason = '\0';
- reason ++;
// Get recipient
uid = Bank_GetAcctByName(recipient);
int iAmmount;
int thisUid;
- if( !Client->bIsAuthed ) {
- sendf(Client->Socket, "401 Not Authenticated\n");
- return ;
- }
-
- ammount = Args;
-
- // Get the start of the reason
- reason = strchr(Args, ' ');
- if( !ammount ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, 1 encountered\n");
+ // Parse arguments
+ if( Server_int_ParseArgs(1, Args, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 DONATE takes 2 arguments\n");
return ;
}
- *reason = '\0';
- reason ++;
- // Check the end of the reason
- if( strchr(reason, ' ') ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, more encountered\n");
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
char *user, *ammount, *reason;
int uid, iAmmount;
- if( !Client->bIsAuthed ) {
- sendf(Client->Socket, "401 Not Authenticated\n");
- return ;
- }
-
- user = Args;
-
- ammount = strchr(Args, ' ');
- if( !ammount ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+ // Parse arguments
+ if( Server_int_ParseArgs(1, Args, &user, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 ADD takes 3 arguments\n");
return ;
}
- *ammount = '\0';
- ammount ++;
-
- reason = strchr(ammount, ' ');
- if( !reason ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- *reason = '\0';
- reason ++;
// Check user permissions
- if( !(Bank_GetFlags(Client->UID) & USER_FLAG_COKE) ) {
+ if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) {
sendf(Client->Socket, "403 Not in coke\n");
return ;
}
char *user, *ammount, *reason;
int uid, iAmmount;
- if( !Client->bIsAuthed ) {
- sendf(Client->Socket, "401 Not Authenticated\n");
- return ;
- }
-
- user = Args;
-
- ammount = strchr(Args, ' ');
- if( !ammount ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+ // Parse arguments
+ if( Server_int_ParseArgs(1, Args, &user, &ammount, &reason, NULL) ) {
+ sendf(Client->Socket, "407 SET takes 3 arguments\n");
return ;
}
- *ammount = '\0';
- ammount ++;
-
- reason = strchr(ammount, ' ');
- if( !reason ) {
- sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
return ;
}
- *reason = '\0';
- reason ++;
// Check user permissions
if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
do
{
type = space;
+ while(*type == ' ') type ++;
// Get next space
space = strchr(space, ' ');
if(space) *space = '\0';
void Server_Cmd_USERINFO(tClient *Client, char *Args)
{
int uid;
- char *user = Args;
- char *space;
+ char *user;
+
+ // Parse arguments
+ if( Server_int_ParseArgs(0, Args, &user, NULL) ) {
+ sendf(Client->Socket, "407 USER_INFO takes 1 argument\n");
+ return ;
+ }
- space = strchr(user, ' ');
- if(space) *space = '\0';
+ if( giDebugLevel ) Debug(Client, "User Info '%s'", user);
// Get recipient
uid = Bank_GetAcctByName(user);
+
+ if( giDebugLevel >= 2 ) Debug(Client, "uid = %i", uid);
if( uid == -1 ) {
- sendf(Client->Socket, "404 Invalid user");
+ sendf(Client->Socket, "404 Invalid user\n");
return ;
}
// TODO: User flags/type
sendf(
- Client->Socket, "202 User %s %i %s%s\n",
+ Client->Socket, "202 User %s %i %s%s%s\n",
Bank_GetAcctName(UserID), Bank_GetBalance(UserID),
- type, disabled
+ type, disabled, door
);
}
void Server_Cmd_USERADD(tClient *Client, char *Args)
{
- char *username, *space;
+ char *username;
+
+ // Parse arguments
+ if( Server_int_ParseArgs(0, Args, &username, NULL) ) {
+ sendf(Client->Socket, "407 USER_ADD takes 1 argument\n");
+ return ;
+ }
// Check permissions
if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
return ;
}
- // Read arguments
- username = Args;
- while( *username == ' ' ) username ++;
- space = strchr(username, ' ');
- if(space) *space = '\0';
-
// Try to create user
if( Bank_CreateAcct(username) == -1 ) {
sendf(Client->Socket, "404 User exists\n");
void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
{
char *username, *flags;
- char *space;
int mask=0, value=0;
int uid;
- // Check permissions
- if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
- sendf(Client->Socket, "403 Not a coke admin\n");
+ // Parse arguments
+ if( Server_int_ParseArgs(0, Args, &username, &flags, NULL) ) {
+ sendf(Client->Socket, "407 USER_FLAGS takes 2 arguments\n");
return ;
}
- // Read arguments
- // - Username
- username = Args;
- while( *username == ' ' ) username ++;
- space = strchr(username, ' ');
- if(!space) {
- sendf(Client->Socket, "407 USER_FLAGS requires 2 arguments, 1 given\n");
+ // Check permissions
+ if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
+ sendf(Client->Socket, "403 Not a coke admin\n");
return ;
}
- *space = '\0';
- // - Flags
- flags = space + 1;
- while( *flags == ' ' ) flags ++;
- space = strchr(flags, ' ');
- if(space) *space = '\0';
// Get UID
uid = Bank_GetAcctByName(username);
if( Server_int_ParseFlags(Client, flags, &mask, &value) )
return ;
+ if( giDebugLevel )
+ Debug(Client, "Set %i(%s) flags to %x (masked %x)\n",
+ uid, username, mask, value);
+
// Apply flags
Bank_SetFlags(uid, mask, value);
}
// --- INTERNAL HELPERS ---
+void Debug(tClient *Client, const char *Format, ...)
+{
+ va_list args;
+ //printf("%010i [%i] ", (int)time(NULL), Client->ID);
+ printf("[%i] ", Client->ID);
+ va_start(args, Format);
+ vprintf(Format, args);
+ va_end(args);
+ printf("\n");
+}
+
int sendf(int Socket, const char *Format, ...)
{
va_list args;
}
}
+// Takes a series of char *'s in
+/**
+ * \brief Parse space-separated entries into
+ */
+int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
+{
+ va_list args;
+ char savedChar;
+ char **dest;
+ va_start(args, ArgStr);
+
+ // Check for null
+ if( !ArgStr )
+ {
+ while( (dest = va_arg(args, char **)) )
+ *dest = NULL;
+ va_end(args);
+ return 1;
+ }
+
+ savedChar = *ArgStr;
+
+ while( (dest = va_arg(args, char **)) )
+ {
+ // Trim leading spaces
+ while( *ArgStr == ' ' || *ArgStr == '\t' )
+ ArgStr ++;
+
+ // ... oops, not enough arguments
+ if( *ArgStr == '\0' )
+ {
+ // NULL unset arguments
+ do {
+ *dest = NULL;
+ } while( (dest = va_arg(args, char **)) );
+ va_end(args);
+ return -1;
+ }
+
+ if( *ArgStr == '"' )
+ {
+ ArgStr ++;
+ *dest = ArgStr;
+ // Read until quote
+ while( *ArgStr && *ArgStr != '"' )
+ ArgStr ++;
+ }
+ else
+ {
+ // Set destination
+ *dest = ArgStr;
+ // Read until a space
+ while( *ArgStr && *ArgStr != ' ' && *ArgStr != '\t' )
+ ArgStr ++;
+ }
+ savedChar = *ArgStr; // savedChar is used to un-mangle the last string
+ *ArgStr = '\0';
+ ArgStr ++;
+ }
+ va_end(args);
+
+ // Oops, extra arguments, and greedy not set
+ if( (savedChar == ' ' || savedChar == '\t') && !bUseLongLast ) {
+ return -1;
+ }
+
+ // Un-mangle last
+ if(bUseLongLast) {
+ ArgStr --;
+ *ArgStr = savedChar;
+ }
+
+ return 0; // Success!
+}
+
int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value)
{
struct {
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au