/*
* 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
#include "ngircd.h"
#include "defines.h"
#include "conn-func.h"
-#include "client.h"
#include "channel.h"
#include "log.h"
#include "messages.h"
{
{ "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 },
{ "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 },
{ "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 */
};
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
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
*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;
/* 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;
}
/* 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;