New configuration option "RequireAuthPing": PING-PONG on login

[ngircd-alex.git] / src / ngircd / parse.c

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 3710d70c494d07972d3198245a00e0dd445bb719..8f5e6019694a53807d023b4df9010c281ad10d0b 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -26,7 +26,6 @@
 #include "ngircd.h"
 #include "defines.h"
 #include "conn-func.h"
-#include "client.h"
 #include "channel.h"
 #include "log.h"
 #include "messages.h"
@@ -83,7 +82,7 @@ static COMMAND My_Commands[] =
        { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
        { "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 },
        { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
-       { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+       { "PONG", IRC_PONG, 0xFFFF, 0, 0, 0 },
        { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
        { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 },
        { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 },
@@ -109,6 +108,10 @@ static COMMAND My_Commands[] =
        { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
 #ifdef IRCPLUS
        { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 },
+#endif
+#ifndef STRICT_RFC
+       { "GET",  IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
+       { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
 #endif
        { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
 };
@@ -121,8 +124,6 @@ static bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
 
 static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
 
-#define ARRAY_SIZE(x)  (sizeof(x)/sizeof((x)[0]))
-
 /**
  * Return the pointer to the global "IRC command structure".
  * This structure, an array of type "COMMAND" describes all the IRC commands
@@ -181,7 +182,7 @@ Parse_Request( CONN_ID Idx, char *Request )
                if( ! ptr )
                {
                        LogDebug("Connection %d: Parse error: prefix without command!?", Idx);
-                       return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" );
+                       return Conn_WriteStr(Idx, "ERROR :Prefix without command");
                }
                *ptr = '\0';
 #ifndef STRICT_RFC
@@ -275,14 +276,28 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
 
        *Closed = false;
 
-       if( ! Req->prefix ) return true;
-
        client = Conn_GetClient( Idx );
        assert( client != NULL );
 
-       /* only validate if this connection is already registered */
-       if(( Client_Type( client ) != CLIENT_USER ) && ( Client_Type( client ) != CLIENT_SERVER ) && ( Client_Type( client ) != CLIENT_SERVICE ))
+       if (!Req->prefix && Client_Type(client) == CLIENT_SERVER
+           && strcasecmp(Req->command, "ERROR") != 0
+           && strcasecmp(Req->command, "PING") != 0)
        {
+               Log(LOG_ERR,
+                   "Received command without prefix (connection %d, command \"%s\")!?",
+                   Idx, Req->command);
+               if (!Conn_WriteStr(Idx, "ERROR :Prefix missing"))
+                       *Closed = true;
+               return false;
+       }
+
+       if (!Req->prefix)
+               return true;
+
+       /* only validate if this connection is already registered */
+       if (Client_Type(client) != CLIENT_USER
+           && Client_Type(client) != CLIENT_SERVER
+           && Client_Type(client) != CLIENT_SERVICE) {
                /* not registered, ignore prefix */
                Req->prefix = NULL;
                return true;
@@ -290,19 +305,25 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
 
        /* check if client in prefix is known */
        c = Client_Search( Req->prefix );
-       if( ! c )
-       {
-               Log( LOG_ERR, "Invalid prefix \"%s\", client not known (connection %d, command %s)!?", Req->prefix, Idx, Req->command );
-               if( ! Conn_WriteStr( Idx, "ERROR :Invalid prefix \"%s\", client not known!?", Req->prefix )) *Closed = true;
+       if (!c) {
+               Log(LOG_ERR,
+                   "Invalid prefix \"%s\", client not known (connection %d, command \"%s\")!?",
+                   Req->prefix, Idx, Req->command);
+               if (!Conn_WriteStr(Idx,
+                                  "ERROR :Invalid prefix \"%s\", client not known",
+                                  Req->prefix))
+                       *Closed = true;
                return false;
        }
 
        /* check if the client named in the prefix is expected
         * to come from that direction */
-       if( Client_NextHop( c ) != client )
-       {
-               Log( LOG_ERR, "Spoofed prefix \"%s\" from \"%s\" (connection %d, command %s)!", Req->prefix, Client_Mask( Conn_GetClient( Idx )), Idx, Req->command );
-               Conn_Close( Idx, NULL, "Spoofed prefix", true);
+       if (Client_NextHop(c) != client) {
+               Log(LOG_ERR,
+                   "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
+                   Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx,
+                   Req->command);
+               Conn_Close(Idx, NULL, "Spoofed prefix", true);
                *Closed = true;
                return false;
        }
@@ -398,7 +419,7 @@ Handle_Numeric(CLIENT *client, REQUEST *Req)
                /* This server is the target of the numeric */
                num = atoi(Req->command);
 
-               for (i = 0; i < (int) ARRAY_SIZE(Numerics); i++) {
+               for (i = 0; i < (int) C_ARRAY_SIZE(Numerics); i++) {
                        if (num == Numerics[i].numeric) {
                                if (!Numerics[i].function)
                                        return CONNECTED;