#include <string.h>
#include <limits.h>
#include <stdarg.h>
-#include <ldap.h>
#define DEBUG_TRACE_CLIENT 0
void Server_Cmd_USERFLAGS(tClient *Client, char *Args);
// --- Helpers ---
int sendf(int Socket, const char *Format, ...);
-void HexBin(uint8_t *Dest, char *Src, int BufSize);
// === CONSTANTS ===
// - Commands
* 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);
* Usage: PASS <hash>
*/
void Server_Cmd_PASS(tClient *Client, char *Args)
-{
- // TODO: Decrypt password passed
+{
+ char *space = strchr(Args, ' ');
+ if(space) *space = '\0'; // Remove characters after the ' '
+ // Pass on to cokebank
Client->UID = GetUserAuth(Client->Salt, Client->Username, Args);
if( Client->UID != -1 ) {
*/
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 ) {
return ;
}
+ // You can't be an internal account
+ if( GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+ Client->UID = -1;
+ sendf(Client->Socket, "401 Auth Failure\n");
+ return ;
+ }
+
if(giDebugLevel)
printf("Client %i: Authenticated as '%s' (%i)\n", Client->ID, Args, Client->UID);
}
// Check user permissions
- if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
+ if( !(GetFlags(Client->UID) & USER_FLAG_COKE) ) {
sendf(Client->Socket, "403 Not in coke\n");
return ;
}
return ;
}
+ // You can't be an internal account
+ if( GetFlags(Client->EffectiveUID) & USER_FLAG_INTERNAL ) {
+ Client->EffectiveUID = -1;
+ sendf(Client->Socket, "404 User not found\n");
+ return ;
+ }
+
sendf(Client->Socket, "200 User set\n");
}
sendf(Client->Socket, "404 Invalid target user\n");
return ;
}
+
+ // You can't alter an internal account
+ if( GetFlags(uid) & USER_FLAG_INTERNAL ) {
+ sendf(Client->Socket, "404 Invalid target user\n");
+ return ;
+ }
// Parse ammount
iAmmount = atoi(ammount);
reason ++;
// Check user permissions
- if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
+ if( !(GetFlags(Client->UID) & USER_FLAG_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");
+ if( uid == -1 ) {
+ sendf(Client->Socket, "404 Invalid user\n");
return ;
}
- if( uid == -1 ) {
+
+ // You can't alter an internal account
+ if( GetFlags(uid) & USER_FLAG_INTERNAL ) {
sendf(Client->Socket, "404 Invalid user\n");
return ;
}
void _SendUserInfo(tClient *Client, int UserID)
{
- char *type, *disabled="";
+ char *type, *disabled="", *door="";
int flags = GetFlags(UserID);
- switch( flags & USER_FLAG_TYPEMASK )
- {
- default:
- case USER_TYPE_NORMAL: type = "user"; break;
- case USER_TYPE_COKE: type = "coke"; break;
- case USER_TYPE_WHEEL: type = "wheel"; break;
- case USER_TYPE_GOD: type = "meta"; break;
+ if( flags & USER_FLAG_INTERNAL ) {
+ type = "internal";
+ }
+ else if( flags & USER_FLAG_COKE ) {
+ if( flags & USER_FLAG_WHEEL )
+ type = "coke,wheel";
+ else
+ type = "coke";
+ }
+ else if( flags & USER_FLAG_WHEEL ) {
+ type = "wheel";
+ }
+ else {
+ type = "user";
}
if( flags & USER_FLAG_DISABLED )
disabled = ",disabled";
if( flags & USER_FLAG_DOORGROUP )
- disabled = ",door";
+ door = ",door";
// TODO: User flags/type
sendf(
char *username, *space;
// Check permissions
- if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_WHEEL ) {
+ if( !(GetFlags(Client->UID) & USER_FLAG_WHEEL) ) {
sendf(Client->Socket, "403 Not Wheel\n");
return ;
}
int uid;
// Check permissions
- if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_WHEEL ) {
+ if( !(GetFlags(Client->UID) & USER_FLAG_WHEEL) ) {
sendf(Client->Socket, "403 Not Wheel\n");
return ;
}
int Mask;
int Value;
} cFLAGS[] = {
- {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED},
- {"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP},
- {"user", USER_FLAG_TYPEMASK, USER_TYPE_NORMAL},
- {"coke", USER_FLAG_TYPEMASK, USER_TYPE_COKE},
- {"wheel", USER_FLAG_TYPEMASK, USER_TYPE_WHEEL},
- {"meta", USER_FLAG_TYPEMASK, USER_TYPE_GOD}
+ {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED}
+ ,{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP}
+ ,{"coke", USER_FLAG_COKE, USER_FLAG_COKE}
+ ,{"wheel", USER_FLAG_WHEEL, USER_FLAG_WHEEL}
+ // ,{"internal", USER_FLAG_INTERNAL, USER_FLAG_INTERNAL}
};
const int ciNumFlags = sizeof(cFLAGS)/sizeof(cFLAGS[0]);
return send(Socket, buf, len, 0);
}
}
-
-/**
- * \brief Decode a Base64 value
- */
-int UnBase64(uint8_t *Dest, char *Src, int BufSize)
-{
- uint32_t val;
- int i, j;
- char *start_src = Src;
-
- for( i = 0; i+2 < BufSize; i += 3 )
- {
- val = 0;
- for( j = 0; j < 4; j++, Src ++ ) {
- if('A' <= *Src && *Src <= 'Z')
- val |= (*Src - 'A') << ((3-j)*6);
- else if('a' <= *Src && *Src <= 'z')
- val |= (*Src - 'a' + 26) << ((3-j)*6);
- else if('0' <= *Src && *Src <= '9')
- val |= (*Src - '0' + 52) << ((3-j)*6);
- else if(*Src == '+')
- val |= 62 << ((3-j)*6);
- else if(*Src == '/')
- val |= 63 << ((3-j)*6);
- else if(!*Src)
- break;
- else if(*Src != '=')
- j --; // Ignore invalid characters
- }
- Dest[i ] = (val >> 16) & 0xFF;
- Dest[i+1] = (val >> 8) & 0xFF;
- Dest[i+2] = val & 0xFF;
- if(j != 4) break;
- }
-
- // Finish things off
- if(i < BufSize)
- Dest[i] = (val >> 16) & 0xFF;
- if(i+1 < BufSize)
- Dest[i+1] = (val >> 8) & 0xFF;
-
- return Src - start_src;
-}
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au