Fiddling with protocol (might redesign it a bit)

[tpg/opendispense2.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index 5d375ee..be15a40 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -16,11 +16,16 @@
 #include <unistd.h>
 #include <string.h>
 
+// HACKS
+#define HACK_TPG_NOAUTH        1
+#define HACK_ROOT_NOAUTH       1
+
+// Statistics
 #define MAX_CONNECTION_QUEUE   5
 #define INPUT_BUFFER_SIZE      256
 
-#define HASH_TYPE      SHA512
-#define HASH_LENGTH    64
+#define HASH_TYPE      SHA1
+#define HASH_LENGTH    20
 
 #define MSG_STR_TOO_LONG       "499 Command too long (limit "EXPSTR(INPUT_BUFFER_SIZE)")\n"
 
@@ -40,6 +45,7 @@ typedef struct sClient
 
 // === PROTOTYPES ===
 void   Server_Start(void);
+void   Server_Cleanup(void);
 void   Server_HandleClient(int Socket, int bTrusted);
 char   *Server_ParseClientCommand(tClient *Client, char *CommandString);
 // --- Commands ---
@@ -49,6 +55,8 @@ char  *Server_Cmd_AUTOAUTH(tClient *Client, char *Args);
 char   *Server_Cmd_ENUMITEMS(tClient *Client, char *Args);
 char   *Server_Cmd_ITEMINFO(tClient *Client, char *Args);
 char   *Server_Cmd_DISPENSE(tClient *Client, char *Args);
+char   *Server_Cmd_GIVE(tClient *Client, char *Args);
+char   *Server_Cmd_ADD(tClient *Client, char *Args);
 // --- Helpers ---
  int   GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash);
 void   HexBin(uint8_t *Dest, char *Src, int BufSize);
@@ -66,9 +74,12 @@ struct sClientCommand {
        {"AUTOAUTH", Server_Cmd_AUTOAUTH},
        {"ENUM_ITEMS", Server_Cmd_ENUMITEMS},
        {"ITEM_INFO", Server_Cmd_ITEMINFO},
-       {"DISPENSE", Server_Cmd_DISPENSE}
+       {"DISPENSE", Server_Cmd_DISPENSE},
+       {"GIVE", Server_Cmd_GIVE},
+       {"ADD", Server_Cmd_ADD}
 };
 #define NUM_COMMANDS   (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))
+ int   giServer_Socket;
 
 // === CODE ===
 /**
@@ -76,12 +87,14 @@ struct sClientCommand {
  */
 void Server_Start(void)
 {
-        int    server_socket, client_socket;
+        int    client_socket;
        struct sockaddr_in      server_addr, client_addr;
 
+       atexit(Server_Cleanup);
+
        // Create Server
-       server_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if( server_socket < 0 ) {
+       giServer_Socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+       if( giServer_Socket < 0 ) {
                fprintf(stderr, "ERROR: Unable to create server socket\n");
                return ;
        }
@@ -93,14 +106,16 @@ void Server_Start(void)
        server_addr.sin_port = htons(giServer_Port);    // Port
 
        // Bind
-       if( bind(server_socket, (struct sockaddr *) &server_addr, sizeof(server_addr)) < 0 ) {
+       if( bind(giServer_Socket, (struct sockaddr *) &server_addr, sizeof(server_addr)) < 0 ) {
                fprintf(stderr, "ERROR: Unable to bind to 0.0.0.0:%i\n", giServer_Port);
+               perror("Binding");
                return ;
        }
        
        // Listen
-       if( listen(server_socket, MAX_CONNECTION_QUEUE) < 0 ) {
+       if( listen(giServer_Socket, MAX_CONNECTION_QUEUE) < 0 ) {
                fprintf(stderr, "ERROR: Unable to listen to socket\n");
+               perror("Listen");
                return ;
        }
        
@@ -111,7 +126,7 @@ void Server_Start(void)
                uint    len = sizeof(client_addr);
                 int    bTrusted = 0;
                
-               client_socket = accept(server_socket, (struct sockaddr *) &client_addr, &len);
+               client_socket = accept(giServer_Socket, (struct sockaddr *) &client_addr, &len);
                if(client_socket < 0) {
                        fprintf(stderr, "ERROR: Unable to accept client connection\n");
                        return ;
@@ -148,6 +163,12 @@ void Server_Start(void)
        }
 }
 
+void Server_Cleanup(void)
+{
+       printf("Close(%i)\n", giServer_Socket);
+       close(giServer_Socket);
+}
+
 /**
  * \brief Reads from a client socket and parses the command strings
  * \param Socket       Client socket number/handle
@@ -362,7 +383,6 @@ char *Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
  */
 char *Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 {
-//      int    nItems = giNumItems;
         int    retLen;
         int    i;
        char    *ret;
@@ -450,6 +470,7 @@ char *Server_Cmd_ITEMINFO(tClient *Client, char *Args)
 char *Server_Cmd_DISPENSE(tClient *Client, char *Args)
 {
        tItem   *item;
+        int    ret;
        if( !Client->bIsAuthed )        return strdup("401 Not Authenticated\n");
 
        item = _GetItemFromString(Args);
@@ -457,7 +478,7 @@ char *Server_Cmd_DISPENSE(tClient *Client, char *Args)
                return strdup("406 Bad Item ID\n");
        }
 
-       switch( DispenseItem( Client->UID, item ) )
+       switch( ret = DispenseItem( Client->UID, item ) )
        {
        case 0: return strdup("200 Dispense OK\n");
        case 1: return strdup("501 Unable to dispense\n");
@@ -495,12 +516,53 @@ char *Server_Cmd_GIVE(tClient *Client, char *Args)
        if( iAmmount <= 0 )     return strdup("407 Invalid Argument, ammount must be > zero\n");
 
        // Do give
-       switch( Transfer(Client->UID, uid, iAmmount, reason) )
+       switch( DispenseGive(Client->UID, uid, iAmmount, reason) )
        {
        case 0:
                return strdup("200 Give OK\n");
-       default:
+       case 2:
                return strdup("402 Poor You\n");
+       default:
+               return strdup("500 Unknown error\n");
+       }
+}
+
+char *Server_Cmd_ADD(tClient *Client, char *Args)
+{
+       char    *user, *ammount, *reason;
+        int    uid, iAmmount;
+       
+       if( !Client->bIsAuthed )        return strdup("401 Not Authenticated\n");
+
+       user = Args;
+
+       ammount = strchr(Args, ' ');
+       if( !ammount )  return strdup("407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+       *ammount = '\0';
+       ammount ++;
+
+       reason = strchr(ammount, ' ');
+       if( !reason )   return strdup("407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+       *reason = '\0';
+       reason ++;
+
+       // Get recipient
+       uid = GetUserID(user);
+       if( uid == -1 ) return strdup("404 Invalid user");
+
+       // Parse ammount
+       iAmmount = atoi(ammount);
+       if( iAmmount == 0 && ammount[0] != '0' )        return strdup("407 Invalid Argument, ammount must be > zero\n");
+
+       // Do give
+       switch( DispenseAdd(uid, Client->UID, iAmmount, reason) )
+       {
+       case 0:
+               return strdup("200 Add OK\n");
+       case 2:
+               return strdup("402 Poor Guy\n");
+       default:
+               return strdup("500 Unknown error\n");
        }
 }
 
@@ -521,6 +583,10 @@ int GetUserAuth(const char *Salt, const char *Username, const uint8_t *ProvidedH
        if( strcmp(Username, "tpg") == 0 )
                return GetUserID("tpg");
        #endif
+       #if HACK_ROOT_NOAUTH
+       if( strcmp(Username, "root") == 0 )
+               return GetUserID("root");
+       #endif
        
        #if 0
        //