* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * IRC command parser and validator
*/
#include "portab.h"
-static char UNUSED id[] = "$Id: parse.c,v 1.60 2004/01/17 03:17:49 alex Exp $";
+static char UNUSED id[] = "$Id: parse.c,v 1.67 2006/04/23 10:37:27 fw Exp $";
+
+/**
+ * @file
+ * IRC command parser and validator.
+ */
#include "imp.h"
#include <assert.h>
};
-LOCAL VOID Init_Request PARAMS(( REQUEST *Req ));
+static void Init_Request PARAMS(( REQUEST *Req ));
-LOCAL BOOLEAN Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
-LOCAL BOOLEAN Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
-LOCAL BOOLEAN Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ));
+static bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
+static bool Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
+static bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
-LOCAL BOOLEAN Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
+static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
+/**
+ * Return the pointer to the global "IRC command structure".
+ * This structure, an array of type "COMMAND" describes all the IRC commands
+ * implemented by ngIRCd and how to handle them.
+ * @return Pointer to the global command structure.
+ */
GLOBAL COMMAND *
-Parse_GetCommandStruct( VOID )
+Parse_GetCommandStruct( void )
{
return My_Commands;
} /* Parse_GetCommandStruct */
-GLOBAL BOOLEAN
-Parse_Request( CONN_ID Idx, CHAR *Request )
+/**
+ * Parse a command ("request") received from a client.
+ *
+ * This function is called after the connection layer received a valid CR+LF
+ * terminated line of text: we asume that this is a valid IRC command and
+ * try to do something useful with it :-)
+ *
+ * All errors are reported to the client from which the command has been
+ * received, and if the error is fatal this connection is closed down.
+ *
+ * This function is able to parse the syntax as described in RFC 2812,
+ * section 2.3.
+ *
+ * @param Idx Index of the connection from which the command has been received.
+ * @param Request NULL terminated line of text (the "command").
+ * @return true on success (valid command or "regular" error), false if a
+ * fatal error occured and the connection has been shut down.
+ */
+GLOBAL bool
+Parse_Request( CONN_ID Idx, char *Request )
{
- /* Client-Request parsen. Bei einem schwerwiegenden Fehler wird
- * die Verbindung geschlossen und FALSE geliefert.
- * Der Aufbau gueltiger Requests ist in RFC 2812, 2.3 definiert. */
-
REQUEST req;
- CHAR *start, *ptr;
- BOOLEAN closed;
+ char *start, *ptr;
+ bool closed;
assert( Idx >= 0 );
assert( Request != NULL );
} /* Parse_Request */
-LOCAL VOID
+/**
+ * Initialize request structure.
+ * @param Req Request structure to be initialized.
+ */
+static void
Init_Request( REQUEST *Req )
{
/* Neue Request-Struktur initialisieren */
- INT i;
+ int i;
assert( Req != NULL );
} /* Init_Request */
-LOCAL BOOLEAN
-Validate_Prefix( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )
+static bool
+Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
{
CLIENT *client, *c;
assert( Idx >= 0 );
assert( Req != NULL );
- *Closed = FALSE;
+ *Closed = false;
/* ist ueberhaupt ein Prefix vorhanden? */
- if( ! Req->prefix ) return TRUE;
+ if( ! Req->prefix ) return true;
/* Client-Struktur der Connection ermitteln */
- client = Client_GetFromConn( Idx );
+ client = Conn_GetClient( Idx );
assert( client != NULL );
/* nur validieren, wenn bereits registrierte Verbindung */
/* noch nicht registrierte Verbindung.
* Das Prefix wird ignoriert. */
Req->prefix = NULL;
- return TRUE;
+ return true;
}
/* pruefen, ob der im Prefix angegebene Client bekannt ist */
{
/* im Prefix angegebener Client ist nicht bekannt */
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;
+ if( ! Conn_WriteStr( Idx, "ERROR :Invalid prefix \"%s\", client not known!?", Req->prefix )) *Closed = true;
+ return false;
}
/* pruefen, ob der Client mit dem angegebenen Prefix in Richtung
{
/* das angegebene Prefix ist aus dieser Richtung, also
* aus der gegebenen Connection, ungueltig! */
- Log( LOG_ERR, "Spoofed prefix \"%s\" from \"%s\" (connection %d, command %s)!", Req->prefix, Client_Mask( Client_GetFromConn( Idx )), Idx, Req->command );
- Conn_Close( Idx, NULL, "Spoofed prefix", TRUE );
- *Closed = TRUE;
- return FALSE;
+ 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;
}
- return TRUE;
+ return true;
} /* Validate_Prefix */
-LOCAL BOOLEAN
-Validate_Command( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )
+static bool
+Validate_Command( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
{
assert( Idx >= 0 );
assert( Req != NULL );
- *Closed = FALSE;
+ *Closed = false;
- return TRUE;
+ return true;
} /* Validate_Comman */
-LOCAL BOOLEAN
-Validate_Args( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )
+static bool
+Validate_Args( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
{
assert( Idx >= 0 );
assert( Req != NULL );
- *Closed = FALSE;
+ *Closed = false;
- return TRUE;
+ return true;
} /* Validate_Args */
-LOCAL BOOLEAN
+static bool
Handle_Request( CONN_ID Idx, REQUEST *Req )
{
/* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler
- * wird die Verbindung geschlossen und FALSE geliefert. */
+ * wird die Verbindung geschlossen und false geliefert. */
CLIENT *client, *target, *prefix;
- CHAR str[LINE_LEN];
- BOOLEAN result;
+ char str[LINE_LEN];
+ bool result;
COMMAND *cmd;
- INT i;
+ int i;
assert( Idx >= 0 );
assert( Req != NULL );
assert( Req->command != NULL );
- client = Client_GetFromConn( Idx );
+ client = Conn_GetClient( Idx );
assert( client != NULL );
/* Statuscode? */
/* Status code without target!? */
if( Req->argc > 0 ) Log( LOG_WARNING, "Unknown target for status code %s: \"%s\"", Req->command, Req->argv[0] );
else Log( LOG_WARNING, "Unknown target for status code %s!", Req->command );
- return TRUE;
+ return true;
}
if( target == Client_ThisServer( ))
{
/* This server is the target, ignore it */
Log( LOG_DEBUG, "Ignored status code %s from \"%s\".", Req->command, Client_ID( client ));
- return TRUE;
+ return true;
}
/* Determine source */
{
/* Oops, no prefix!? */
Log( LOG_WARNING, "Got status code %s from \"%s\" without prefix!?", Req->command, Client_ID( client ));
- return TRUE;
+ return true;
}
else prefix = Client_Search( Req->prefix );
if( ! prefix )
{
/* Oops, unknown prefix!? */
Log( LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix );
- return TRUE;
+ return true;
}
/* Forward status code */
return IRC_WriteStrClient( client, ERR_NOTREGISTERED_MSG, Client_ID( client ));
}
}
+
+ if( Client_Type( client ) != CLIENT_USER &&
+ Client_Type( client ) != CLIENT_SERVER &&
+ Client_Type( client ) != CLIENT_SERVICE )
+ return true;
- /* Unbekannter Befehl */
- Log( LOG_DEBUG, "Connection %d: Unknown command \"%s\", %d %s,%s prefix.", Client_Conn( client ), Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" );
- if( Client_Type( client ) != CLIENT_SERVER ) return IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command );
- else return TRUE;
+ /* Unknown command and registered connection: generate error: */
+ Log( LOG_DEBUG, "Connection %d: Unknown command \"%s\", %d %s,%s prefix.",
+ Client_Conn( client ), Req->command, Req->argc,
+ Req->argc == 1 ? "parameter" : "parameters",
+ Req->prefix ? "" : " no" );
+
+ if (Client_Type(client) != CLIENT_SERVER) {
+ result = IRC_WriteStrClient(client, ERR_UNKNOWNCOMMAND_MSG,
+ Client_ID(client), Req->command);
+ Conn_SetPenalty(Idx, 1);
+ return result;
+ }
+
+ return true;
} /* Handle_Request */