X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=8203dd0ecb2687617af5f911db820733d239d35d;hp=ec856a0c28fc05ff33b5d1930c79ee4bdb3f75b1;hb=fa8b83e69b0d7edcfdcf8f0a4496c79f9c5ec161;hpb=5a91d621009d6a0f3b8e5ff054aa6ae7e3195191 diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index ec856a0c..8203dd0e 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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" @@ -59,7 +58,7 @@ static COMMAND My_Commands[] = { { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 }, - { "CONNECT", IRC_CONNECT, CLIENT_USER, 0, 0, 0 }, + { "CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 }, { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 }, { "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 }, @@ -92,7 +91,7 @@ static COMMAND My_Commands[] = { "SERVICE", IRC_SERVICE, 0xFFFF, 0, 0, 0 }, { "SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 0, 0 }, { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "SQUIT", IRC_SQUIT, CLIENT_SERVER, 0, 0, 0 }, + { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -103,11 +102,16 @@ static COMMAND My_Commands[] = { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 0, 0, 0 }, { "WHO", IRC_WHO, CLIENT_USER, 0, 0, 0 }, { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "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 */ }; @@ -120,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 @@ -169,51 +171,45 @@ Parse_Request( CONN_ID Idx, char *Request ) Init_Request( &req ); - /* Fuehrendes und folgendes "Geraffel" verwerfen */ + /* remove leading & trailing whitespace */ ngt_TrimStr( Request ); - /* gibt es ein Prefix? */ if( Request[0] == ':' ) { - /* Prefix vorhanden */ + /* Prefix */ req.prefix = Request + 1; ptr = strchr( Request, ' ' ); if( ! ptr ) { - Log( LOG_DEBUG, "Connection %d: Parse error: prefix without command!?", Idx ); - return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" ); + LogDebug("Connection %d: Parse error: prefix without command!?", Idx); + return Conn_WriteStr(Idx, "ERROR :Prefix without command"); } *ptr = '\0'; #ifndef STRICT_RFC - /* multiple Leerzeichen als Trenner zwischen - * Prefix und Befehl ignorieren */ + /* ignore multiple spaces between prefix and command */ while( *(ptr + 1) == ' ' ) ptr++; #endif start = ptr + 1; } else start = Request; - /* Befehl */ ptr = strchr( start, ' ' ); if( ptr ) { *ptr = '\0'; #ifndef STRICT_RFC - /* multiple Leerzeichen als Trenner vor - * Parametern ignorieren */ + /* ignore multiple spaces between parameters */ while( *(ptr + 1) == ' ' ) ptr++; #endif } req.command = start; - /* Argumente, Parameter */ + /* Arguments, Parameters */ if( ptr ) { - /* Prinzipiell gibt es welche :-) */ start = ptr + 1; while( start ) { - /* Parameter-String "zerlegen" */ if( start[0] == ':' ) { req.argv[req.argc] = start + 1; @@ -227,8 +223,6 @@ Parse_Request( CONN_ID Idx, char *Request ) { *ptr = '\0'; #ifndef STRICT_RFC - /* multiple Leerzeichen als - * Parametertrenner ignorieren */ while( *(ptr + 1) == ' ' ) ptr++; #endif } @@ -244,7 +238,6 @@ Parse_Request( CONN_ID Idx, char *Request ) } } - /* Daten validieren */ if( ! Validate_Prefix( Idx, &req, &closed )) return ! closed; if( ! Validate_Command( Idx, &req, &closed )) return ! closed; if( ! Validate_Args( Idx, &req, &closed )) return ! closed; @@ -283,41 +276,41 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) *Closed = false; - /* ist ueberhaupt ein Prefix vorhanden? */ if( ! Req->prefix ) return true; - /* Client-Struktur der Connection ermitteln */ client = Conn_GetClient( Idx ); assert( client != NULL ); - /* nur validieren, wenn bereits registrierte Verbindung */ - if(( Client_Type( client ) != CLIENT_USER ) && ( Client_Type( client ) != CLIENT_SERVER ) && ( Client_Type( client ) != CLIENT_SERVICE )) - { - /* noch nicht registrierte Verbindung. - * Das Prefix wird ignoriert. */ + /* 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; } - /* pruefen, ob der im Prefix angegebene Client bekannt ist */ + /* check if client in prefix is known */ c = Client_Search( Req->prefix ); - if( ! c ) - { - /* 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; + 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; } - /* pruefen, ob der Client mit dem angegebenen Prefix in Richtung - * des Senders liegt, d.h. sicherstellen, dass das Prefix nicht - * gefaelscht ist */ - if( Client_NextHop( c ) != client ) - { - /* 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( Conn_GetClient( Idx )), Idx, Req->command ); - Conn_Close( Idx, NULL, "Spoofed prefix", true); + /* 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); *Closed = true; return false; } @@ -413,7 +406,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; @@ -456,8 +449,6 @@ Handle_Numeric(CLIENT *client, REQUEST *Req) static bool Handle_Request( CONN_ID Idx, REQUEST *Req ) { - /* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler - * wird die Verbindung geschlossen und false geliefert. */ CLIENT *client; bool result = true; int client_type; @@ -479,7 +470,6 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) cmd = My_Commands; while (cmd->name) { - /* Befehl suchen */ if (strcasecmp(Req->command, cmd->name) != 0) { cmd++; continue;