X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=76b3b44dbde7e6f57f854705b30a9d647d0d474f;hp=a48b69a993d259f87e9747755ec2bfc88a204559;hb=HEAD;hpb=ee724c0360fac7840d032812b5ab677aa0d15074 diff --git a/src/server/server.c b/src/server/server.c index a48b69a..76b3b44 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -10,6 +10,7 @@ #include #include #include "common.h" +#include "../common/config.h" #include #include #include @@ -28,9 +29,6 @@ #define PIDFILE "/var/run/dispsrv.pid" -#define Debug_Notice(msg, v...) printf("%08llun: "msg"\n", (unsigned long long)time(NULL) ,##v) -#define Debug_Debug(msg, v...) printf("%08llud: "msg"\n", (unsigned long long)time(NULL) ,##v) - // Statistics #define MAX_CONNECTION_QUEUE 5 #define INPUT_BUFFER_SIZE 256 @@ -71,6 +69,7 @@ void Server_Cmd_USER(tClient *Client, char *Args); void Server_Cmd_PASS(tClient *Client, char *Args); void Server_Cmd_AUTOAUTH(tClient *Client, char *Args); void Server_Cmd_AUTHIDENT(tClient *Client, char *Args); +void Server_Cmd_AUTHCARD(tClient* Client, char *Args); void Server_Cmd_SETEUSER(tClient *Client, char *Args); void Server_Cmd_ENUMITEMS(tClient *Client, char *Args); void Server_Cmd_ITEMINFO(tClient *Client, char *Args); @@ -88,12 +87,16 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args); void Server_Cmd_UPDATEITEM(tClient *Client, char *Args); void Server_Cmd_PINCHECK(tClient *Client, char *Args); void Server_Cmd_PINSET(tClient *Client, char *Args); +void Server_Cmd_CARDADD(tClient *Client, char *Args); // --- Helpers --- 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); +#define CLIENT_DEBUG_LOW(Client, ...) do { if(giDebugLevel>1) Debug(Client, __VA_ARGS__); } while(0) +#define CLIENT_DEBUG(Client, ...) do { if(giDebugLevel) Debug(Client, __VA_ARGS__); } while(0) + // === CONSTANTS === // - Commands const struct sClientCommand { @@ -104,6 +107,7 @@ const struct sClientCommand { {"PASS", Server_Cmd_PASS}, {"AUTOAUTH", Server_Cmd_AUTOAUTH}, {"AUTHIDENT", Server_Cmd_AUTHIDENT}, + {"AUTHCARD", Server_Cmd_AUTHCARD}, {"SETEUSER", Server_Cmd_SETEUSER}, {"ENUM_ITEMS", Server_Cmd_ENUMITEMS}, {"ITEM_INFO", Server_Cmd_ITEMINFO}, @@ -119,7 +123,8 @@ const struct sClientCommand { {"USER_FLAGS", Server_Cmd_USERFLAGS}, {"UPDATE_ITEM", Server_Cmd_UPDATEITEM}, {"PIN_CHECK", Server_Cmd_PINCHECK}, - {"PIN_SET", Server_Cmd_PINSET} + {"PIN_SET", Server_Cmd_PINSET}, + {"CARD_ADD", Server_Cmd_CARDADD}, }; #define NUM_COMMANDS ((int)(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))) @@ -150,7 +155,7 @@ void Server_Start(void) gaServer_TrustedHosts = malloc(giServer_NumTrustedHosts * sizeof(*gaServer_TrustedHosts)); for( int i = 0; i < giServer_NumTrustedHosts; i ++ ) { - const char *addr = Config_GetValue("trusted_host", i); + const char *addr = Config_GetValue_Idx("trusted_host", i); if( inet_aton(addr, &gaServer_TrustedHosts[i]) == 0 ) { fprintf(stderr, "Invalid IP address '%s'\n", addr); @@ -478,6 +483,62 @@ void Server_Cmd_USER(tClient *Client, char *Args) #endif } +/// UID: User ID (must be valid) +/// username: Optional username +bool authenticate(tClient* Client, int UID, const char* username) +{ + Client->UID = UID; + + int flags = Bank_GetFlags(Client->UID); + if( flags & USER_FLAG_DISABLED ) { + Client->UID = -1; + sendf(Client->Socket, "403 Authentication failure: account disabled\n"); + return false; + } + // You can't be an internal account + if( flags & USER_FLAG_INTERNAL ) { + if(giDebugLevel) + Debug(Client, "IDENT auth as '%s', not allowed", username); + Client->UID = -1; + sendf(Client->Socket, "403 Authentication failure: that account is internal\n"); + return false; + } + + // Save username + if(Client->Username != username) + { + if(Client->Username) + { + free(Client->Username); + } + + // Fetch username (if not provided) + if( username ) + { + Client->Username = strdup(username); + } + else + { + Client->Username = Bank_GetAcctName(UID); + } + } + + Client->bIsAuthed = 1; + + if(giDebugLevel) + Debug(Client, "Auto authenticated as '%s' (%i)", Client->Username, Client->UID); + return true; +} +bool require_auth(tClient* Client) +{ + // Check authentication + if( !Client->bIsAuthed ) { + sendf(Client->Socket, "401 Not Authenticated\n"); + return false; + } + return true; +} + /** * \brief Authenticate as a user * @@ -486,7 +547,6 @@ void Server_Cmd_USER(tClient *Client, char *Args) void Server_Cmd_PASS(tClient *Client, char *Args) { char *passhash; - int flags; if( Server_int_ParseArgs(0, Args, &passhash, NULL) ) { @@ -495,26 +555,17 @@ void Server_Cmd_PASS(tClient *Client, char *Args) } // Pass on to cokebank - Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, passhash); - - if( Client->UID == -1 ) { - sendf(Client->Socket, "401 Auth Failure\n"); - return ; - } - - flags = Bank_GetFlags(Client->UID); - if( flags & USER_FLAG_DISABLED ) { - Client->UID = -1; - sendf(Client->Socket, "403 Account Disabled\n"); + int uid = Bank_GetUserAuth(Client->Salt, Client->Username, passhash); + if( uid < 0 ) { + if(giDebugLevel) + Debug(Client, "Unknown user '%s'", Client->Username); + sendf(Client->Socket, "403 Authentication failure: unknown account\n"); return ; } - if( flags & USER_FLAG_INTERNAL ) { - Client->UID = -1; - sendf(Client->Socket, "403 Internal account\n"); - return ; + if( ! authenticate(Client, uid, Client->Username) ) + { + return; } - - Client->bIsAuthed = 1; sendf(Client->Socket, "200 Auth OK\n"); } @@ -526,7 +577,6 @@ void Server_Cmd_PASS(tClient *Client, char *Args) void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) { char *username; - int userflags; if( Server_int_ParseArgs(0, Args, &username, NULL) ) { @@ -543,40 +593,17 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) } // Get UID - Client->UID = Bank_GetAcctByName( username, 0 ); - if( Client->UID < 0 ) { + int uid = Bank_GetAcctByName( username, /*bCreate=*/0 ); + if( uid < 0 ) { if(giDebugLevel) Debug(Client, "Unknown user '%s'", username); - sendf(Client->Socket, "403 Auth Failure\n"); - return ; - } - - userflags = Bank_GetFlags(Client->UID); - // You can't be an internal account - if( userflags & USER_FLAG_INTERNAL ) { - if(giDebugLevel) - Debug(Client, "Autoauth as '%s', not allowed", username); - Client->UID = -1; - sendf(Client->Socket, "403 Account is internal\n"); + sendf(Client->Socket, "403 Authentication failure: unknown account\n"); return ; } - - // Disabled accounts - if( userflags & USER_FLAG_DISABLED ) { - Client->UID = -1; - sendf(Client->Socket, "403 Account disabled\n"); - return ; + if( ! authenticate(Client, uid, username) ) + { + return; } - - // Save username - if(Client->Username) - free(Client->Username); - Client->Username = strdup(username); - - Client->bIsAuthed = 1; - - if(giDebugLevel) - Debug(Client, "Auto authenticated as '%s' (%i)", username, Client->UID); sendf(Client->Socket, "200 Auth OK\n"); } @@ -589,8 +616,7 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args) void Server_Cmd_AUTHIDENT(tClient *Client, char *Args) { char *username; - int userflags; - const int ident_timeout = 5; + const int IDENT_TIMEOUT = 5; if( Args != NULL && strlen(Args) ) { sendf(Client->Socket, "407 AUTHIDENT takes no arguments\n"); @@ -606,54 +632,64 @@ void Server_Cmd_AUTHIDENT(tClient *Client, char *Args) } // Get username via IDENT - username = ident_id(Client->Socket, ident_timeout); + username = ident_id(Client->Socket, IDENT_TIMEOUT); if( !username ) { perror("AUTHIDENT - IDENT timed out"); sendf(Client->Socket, "403 Authentication failure: IDENT auth timed out\n"); return ; } - // Get UID - Client->UID = Bank_GetAcctByName( username, 0 ); - if( Client->UID < 0 ) { + int uid = Bank_GetAcctByName(username, /*bCreate=*/0); + if( uid < 0 ) { if(giDebugLevel) Debug(Client, "Unknown user '%s'", username); sendf(Client->Socket, "403 Authentication failure: unknown account\n"); free(username); return ; } - - userflags = Bank_GetFlags(Client->UID); - // You can't be an internal account - if( userflags & USER_FLAG_INTERNAL ) { - if(giDebugLevel) - Debug(Client, "IDENT auth as '%s', not allowed", username); - Client->UID = -1; - sendf(Client->Socket, "403 Authentication failure: that account is internal\n"); + if( ! authenticate(Client, uid, username) ) + { free(username); return ; } + free(username); - // Disabled accounts - if( userflags & USER_FLAG_DISABLED ) { - Client->UID = -1; - sendf(Client->Socket, "403 Authentication failure: account disabled\n"); - free(username); + sendf(Client->Socket, "200 Auth OK\n"); +} + +void Server_Cmd_AUTHCARD(tClient* Client, char *Args) +{ + char* card_id; + if( Server_int_ParseArgs(0, Args, &card_id, NULL) ) + { + sendf(Client->Socket, "407 AUTHCARD takes 1 argument\n"); return ; } - // Save username - if(Client->Username) - free(Client->Username); - Client->Username = strdup(username); - - Client->bIsAuthed = 1; + // Check if trusted (has to be root) + if( Client->UID != 1 ) + { + if(giDebugLevel) + Debug(Client, "Attempting to use AUTHCARD as non-root"); + sendf(Client->Socket, "401 Untrusted\n"); + return ; + } - if(giDebugLevel) - Debug(Client, "IDENT authenticated as '%s' (%i)", username, Client->UID); - free(username); + CLIENT_DEBUG(Client, "MIFARE auth with '%s'", card_id); + int uid = Bank_GetAcctByCard(card_id); + if( uid < 0 ) + { + if(giDebugLevel) + Debug(Client, "Unknown MIFARE '%s'", card_id); + sendf(Client->Socket, "403 Authentication failure: unknown MIFARE ID\n"); + return ; + } + if( ! authenticate(Client, uid, NULL) ) + { + return ; + } - sendf(Client->Socket, "200 Auth OK\n"); + sendf(Client->Socket, "200 Auth Ok, username=%s\n", Client->Username); } /** @@ -1104,7 +1140,7 @@ void Server_Cmd_ADD(tClient *Client, char *Args) if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) { if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) { - sendf(Client->Socket, "404 Invalid user\n"); + sendf(Client->Socket, "403 Admin only\n"); return ; } // TODO: Maybe disallow changes to disabled? @@ -1168,17 +1204,15 @@ void Server_Cmd_SET(tClient *Client, char *Args) return ; } + int origBalance, rv; // Do give - switch( DispenseSet(Client->UID, uid, iAmmount, reason) ) + switch( rv = DispenseSet(Client->UID, uid, iAmmount, reason, &origBalance) ) { case 0: - sendf(Client->Socket, "200 Add OK\n"); - return ; - case 2: - sendf(Client->Socket, "402 Poor Guy\n"); + sendf(Client->Socket, "200 Add OK (%i)\n", origBalance); return ; default: - sendf(Client->Socket, "500 Unknown error\n"); + sendf(Client->Socket, "500 Unknown error (%i)\n", rv); return ; } } @@ -1466,10 +1500,7 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) } // Check authentication - if( !Client->bIsAuthed ) { - sendf(Client->Socket, "401 Not Authenticated\n"); - return ; - } + if(!require_auth(Client)) return; // Check permissions if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) { @@ -1513,11 +1544,8 @@ void Server_Cmd_UPDATEITEM(tClient *Client, char *Args) sendf(Client->Socket, "407 UPDATE_ITEM takes 3 arguments\n"); return ; } - - if( !Client->bIsAuthed ) { - sendf(Client->Socket, "401 Not Authenticated\n"); - return ; - } + + if(!require_auth(Client)) return; // Check user permissions if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) { @@ -1564,11 +1592,7 @@ void Server_Cmd_PINCHECK(tClient *Client, char *Args) } pin = atoi(pinstr); - // Not authenticated? go away! - if( !Client->bIsAuthed ) { - sendf(Client->Socket, "401 Not Authenticated\n"); - return ; - } + if(!require_auth(Client)) return; // Get user int uid = Bank_GetAcctByName(username, 0); @@ -1594,7 +1618,7 @@ void Server_Cmd_PINCHECK(tClient *Client, char *Args) last_wrong_pin_time = time(NULL); if( !Bank_IsPinValid(uid, pin) ) { - sendf(Client->Socket, "201 Pin incorrect\n"); + sendf(Client->Socket, "401 Pin incorrect\n"); struct sockaddr_storage addr; socklen_t len = sizeof(addr); char ipstr[INET6_ADDRSTRLEN]; @@ -1629,19 +1653,34 @@ void Server_Cmd_PINSET(tClient *Client, char *Args) } pin = atoi(pinstr); - if( !Client->bIsAuthed ) { - sendf(Client->Socket, "401 Not Authenticated\n"); - return ; - } + if(!require_auth(Client)) return; - int uid = Client->EffectiveUID; - if(uid == -1) - uid = Client->UID; + int uid = Client->EffectiveUID > 0 ? Client->EffectiveUID : Client->UID; + CLIENT_DEBUG(Client, "Setting PIN for UID %i", uid); // Can only pinset yourself (well, the effective user) Bank_SetPin(uid, pin); sendf(Client->Socket, "200 Pin updated\n"); return ; } +void Server_Cmd_CARDADD(tClient* Client, char* Args) +{ + char* card_id; + if( Server_int_ParseArgs(0, Args, &card_id, NULL) ) { + sendf(Client->Socket, "407 CARD_ADD takes 1 argument\n"); + return ; + } + + if(!require_auth(Client)) return; + + int uid = Client->EffectiveUID > 0 ? Client->EffectiveUID : Client->UID; + CLIENT_DEBUG(Client, "Add card '%s' to UID %i", card_id, uid); + if( Bank_AddAcctCard(uid, card_id) ) + { + sendf(Client->Socket, "408 Card already exists\n"); + return ; + } + sendf(Client->Socket, "200 Card added\n"); +} // --- INTERNAL HELPERS --- void Debug(tClient *Client, const char *Format, ...)