#include <limits.h>
#include <stdarg.h>
-// HACKS
-#define HACK_TPG_NOAUTH 1
-#define HACK_ROOT_NOAUTH 1
-
#define DEBUG_TRACE_CLIENT 0
// Statistics
char Salt[9];
int UID;
+ int EffectiveUID;
int bIsAuthed;
} tClient;
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_SETEUSER(tClient *Client, char *Args);
void Server_Cmd_ENUMITEMS(tClient *Client, char *Args);
void Server_Cmd_ITEMINFO(tClient *Client, char *Args);
void Server_Cmd_DISPENSE(tClient *Client, char *Args);
void Server_Cmd_USERFLAGS(tClient *Client, char *Args);
// --- Helpers ---
int sendf(int Socket, const char *Format, ...);
- int GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash);
void HexBin(uint8_t *Dest, char *Src, int BufSize);
-// === GLOBALS ===
- int giServer_Port = 1020;
- int giServer_NextClientID = 1;
+// === CONSTANTS ===
// - Commands
-struct sClientCommand {
- char *Name;
+const struct sClientCommand {
+ const char *Name;
void (*Function)(tClient *Client, char *Arguments);
} gaServer_Commands[] = {
{"USER", Server_Cmd_USER},
{"PASS", Server_Cmd_PASS},
{"AUTOAUTH", Server_Cmd_AUTOAUTH},
+ {"SETEUSER", Server_Cmd_SETEUSER},
{"ENUM_ITEMS", Server_Cmd_ENUMITEMS},
{"ITEM_INFO", Server_Cmd_ITEMINFO},
{"DISPENSE", Server_Cmd_DISPENSE},
{"USER_FLAGS", Server_Cmd_USERFLAGS}
};
#define NUM_COMMANDS (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))
+
+// === GLOBALS ===
+ int giServer_Port = 1020;
+ int giServer_NextClientID = 1;
int giServer_Socket;
// === CODE ===
* Usage: USER <username>
*/
void Server_Cmd_USER(tClient *Client, char *Args)
-{
+{
+ char *space = strchr(Args, ' ');
+ if(space) *space = '\0'; // Remove characters after the ' '
+
// Debug!
if( giDebugLevel )
printf("Client %i authenticating as '%s'\n", Client->ID, Args);
*/
void Server_Cmd_PASS(tClient *Client, char *Args)
{
- uint8_t clienthash[HASH_LENGTH] = {0};
+ char *space = strchr(Args, ' ');
+ if(space) *space = '\0'; // Remove characters after the ' '
- // Read user's hash
- HexBin(clienthash, Args, HASH_LENGTH);
-
- // TODO: Decrypt password passed
-
- Client->UID = GetUserAuth(Client->Salt, Client->Username, clienthash);
+ // Pass on to cokebank
+ Client->UID = GetUserAuth(Client->Salt, Client->Username, Args);
if( Client->UID != -1 ) {
Client->bIsAuthed = 1;
sendf(Client->Socket, "200 Auth OK\n");
return ;
}
-
- if( giDebugLevel ) {
- int i;
- printf("Client %i: Password hash ", Client->ID);
- for(i=0;i<HASH_LENGTH;i++)
- printf("%02x", clienthash[i]&0xFF);
- printf("\n");
- }
sendf(Client->Socket, "401 Auth Failure\n");
}
*/
void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
{
- char *spos = strchr(Args, ' ');
- if(spos) *spos = '\0'; // Remove characters after the ' '
+ char *space = strchr(Args, ' ');
+ if(space) *space = '\0'; // Remove characters after the ' '
// Check if trusted
if( !Client->bIsTrusted ) {
sendf(Client->Socket, "200 Auth OK\n");
}
+/**
+ * \brief Set effective user
+ */
+void Server_Cmd_SETEUSER(tClient *Client, char *Args)
+{
+ char *space;
+
+ space = strchr(Args, ' ');
+
+ if(space) *space = '\0';
+
+ if( !strlen(Args) ) {
+ sendf(Client->Socket, "407 SETEUSER expects an argument\n");
+ return ;
+ }
+
+ // Check user permissions
+ if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
+ sendf(Client->Socket, "403 Not in coke\n");
+ return ;
+ }
+
+ // Set id
+ Client->EffectiveUID = GetUserID(Args);
+ if( Client->EffectiveUID == -1 ) {
+ sendf(Client->Socket, "404 User not found\n");
+ return ;
+ }
+
+ sendf(Client->Socket, "200 User set\n");
+}
+
/**
* \brief Enumerate the items that the server knows about
*/
{
tItem *item;
int ret;
+ int uid;
+
if( !Client->bIsAuthed ) {
sendf(Client->Socket, "401 Not Authenticated\n");
return ;
sendf(Client->Socket, "406 Bad Item ID\n");
return ;
}
+
+ if( Client->EffectiveUID != -1 ) {
+ uid = Client->EffectiveUID;
+ }
+ else {
+ uid = Client->UID;
+ }
- switch( ret = DispenseItem( Client->UID, item ) )
+ switch( ret = DispenseItem( Client->UID, uid, item ) )
{
case 0: sendf(Client->Socket, "200 Dispense OK\n"); return ;
case 1: sendf(Client->Socket, "501 Unable to dispense\n"); return ;
{
char *recipient, *ammount, *reason;
int uid, iAmmount;
+ int thisUid;
if( !Client->bIsAuthed ) {
sendf(Client->Socket, "401 Not Authenticated\n");
sendf(Client->Socket, "407 Invalid Argument, ammount must be > zero\n");
return ;
}
+
+ if( Client->EffectiveUID != -1 ) {
+ thisUid = Client->EffectiveUID;
+ }
+ else {
+ thisUid = Client->UID;
+ }
// Do give
- switch( DispenseGive(Client->UID, uid, iAmmount, reason) )
+ switch( DispenseGive(Client->UID, thisUid, uid, iAmmount, reason) )
{
case 0:
sendf(Client->Socket, "200 Give OK\n");
*reason = '\0';
reason ++;
- // TODO: Check if the current user is in coke/higher
+ // Check user permissions
if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
sendf(Client->Socket, "403 Not in coke\n");
return ;
// Get recipient
uid = GetUserID(user);
+
+ // Check user permissions
+ if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
+ sendf(Client->Socket, "403 Not in coke\n");
+ return ;
+ }
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid user\n");
return ;
if( flags & USER_FLAG_DISABLED )
disabled = ",disabled";
+ if( flags & USER_FLAG_DOORGROUP )
+ disabled = ",door";
// TODO: User flags/type
sendf(
sendf(Client->Socket, "200 User Updated\n");
}
-/**
- * \brief Authenticate a user
- * \return User ID, or -1 if authentication failed
- */
-int GetUserAuth(const char *Salt, const char *Username, const uint8_t *ProvidedHash)
-{
- #if 0
- uint8_t h[20];
- int ofs = strlen(Username) + strlen(Salt);
- char input[ ofs + 40 + 1];
- char tmp[4 + strlen(Username) + 1]; // uid=%s
- #endif
-
- #if HACK_TPG_NOAUTH
- if( strcmp(Username, "tpg") == 0 )
- return GetUserID("tpg");
- #endif
- #if HACK_ROOT_NOAUTH
- if( strcmp(Username, "root") == 0 ) {
- int ret = GetUserID("root");
- if( ret == -1 )
- return CreateUser("root");
- return ret;
- }
- #endif
-
- #if 0
- //
- strcpy(input, Username);
- strcpy(input, Salt);
- // TODO: Get user's SHA-1 hash
- sprintf(tmp, "uid=%s", Username);
- ldap_search_s(ld, "", LDAP_SCOPE_BASE, tmp, "userPassword", 0, res);
-
- sprintf(input+ofs, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9],
- h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19]
- );
- // Then create the hash from the provided salt
- // Compare that with the provided hash
- #endif
-
- return -1;
-}
-
// --- INTERNAL HELPERS ---
int sendf(int Socket, const char *Format, ...)
{
}
}
-// TODO: Move to another file
-void HexBin(uint8_t *Dest, char *Src, int BufSize)
-{
- int i;
- for( i = 0; i < BufSize; i ++ )
- {
- uint8_t val = 0;
-
- if('0' <= *Src && *Src <= '9')
- val |= (*Src-'0') << 4;
- else if('A' <= *Src && *Src <= 'F')
- val |= (*Src-'A'+10) << 4;
- else if('a' <= *Src && *Src <= 'f')
- val |= (*Src-'a'+10) << 4;
- else
- break;
- Src ++;
-
- if('0' <= *Src && *Src <= '9')
- val |= (*Src-'0');
- else if('A' <= *Src && *Src <= 'F')
- val |= (*Src-'A'+10);
- else if('a' <= *Src && *Src <= 'f')
- val |= (*Src-'a'+10);
- else
- break;
- Src ++;
-
- Dest[i] = val;
- }
- for( ; i < BufSize; i++ )
- Dest[i] = 0;
-}
-
/**
* \brief Decode a Base64 value
*/
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au