/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
*
* 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
* IRC command parser and validator.
*/
-#include "imp.h"
#include <assert.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <strings.h>
#include "ngircd.h"
-#include "defines.h"
#include "conn-func.h"
+#include "conf.h"
#include "channel.h"
#include "log.h"
#include "messages.h"
-#include "tool.h"
-#include "exp.h"
#include "parse.h"
-#include "imp.h"
#include "irc.h"
+#include "irc-cap.h"
#include "irc-channel.h"
+#ifdef ICONV
+# include "irc-encoding.h"
+#endif
#include "irc-info.h"
#include "irc-login.h"
+#include "irc-metadata.h"
#include "irc-mode.h"
#include "irc-op.h"
#include "irc-oper.h"
#include "irc-write.h"
#include "numeric.h"
-#include "exp.h"
-#include "conf.h"
-
struct _NUMERIC {
int numeric;
bool (*function) PARAMS(( CLIENT *Client, REQUEST *Request ));
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|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 },
- { "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 },
- { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "ISON", IRC_ISON, CLIENT_USER, 0, 0, 0 },
- { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "NICK", IRC_NICK, 0xFFFF, 0, 0, 0 },
- { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0, 0, 0 },
- { "NOTICE", IRC_NOTICE, 0xFFFF, 0, 0, 0 },
- { "OPER", IRC_OPER, CLIENT_USER, 0, 0, 0 },
- { "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, 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 },
- { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 },
- { "SERVER", IRC_SERVER, 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_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 },
- { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "USER", IRC_USER, 0xFFFF, 0, 0, 0 },
- { "USERHOST", IRC_USERHOST, CLIENT_USER, 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 },
+#define _CMD(name, func, type, min, max, penalty) \
+ { (name), (func), (type), (min), (max), (penalty), 0, 0, 0 }
+ _CMD("ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 1, 1),
+ _CMD("AWAY", IRC_AWAY, CLIENT_USER, 0, 1, 0),
+ _CMD("CAP", IRC_CAP, CLIENT_ANY, 1, 2, 0),
+ _CMD("CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+#ifdef STRICT_RFC
+ _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 0, 0),
+#else
+ _CMD("DIE", IRC_DIE, CLIENT_USER, 0, 1, 0),
+#endif
+ _CMD("DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 1, 1, 0),
+ _CMD("ERROR", IRC_ERROR, CLIENT_ANY, 0, -1, 0),
+ _CMD("GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+ _CMD("HELP", IRC_HELP, CLIENT_USER, 0, 1, 2),
+ _CMD("INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1, 2),
+ _CMD("INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 1),
+ _CMD("ISON", IRC_ISON, CLIENT_USER, 1, -1, 0),
+ _CMD("JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2, 0),
+ _CMD("KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3, 0),
+ _CMD("KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 2, 2, 0),
+ _CMD("KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+ _CMD("LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 2, 1),
+ _CMD("LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2, 2),
+ _CMD("LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2, 1),
+ _CMD("METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3, 0),
+ _CMD("MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 1),
+ _CMD("MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1, 3),
+ _CMD("NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2, 1),
+ _CMD("NICK", IRC_NICK, CLIENT_ANY, 0, -1, 0),
+ _CMD("NJOIN", IRC_NJOIN, CLIENT_SERVER, 2, 2, 0),
+ _CMD("NOTICE", IRC_NOTICE, CLIENT_ANY, 0, -1, 0),
+ _CMD("OPER", IRC_OPER, CLIENT_USER, 2, 2, 0),
+ _CMD("PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 1, 2, 0),
+ _CMD("PASS", IRC_PASS, CLIENT_ANY, 0, -1, 0),
+ _CMD("PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+ _CMD("PONG", IRC_PONG, CLIENT_ANY, 0, -1, 0),
+ _CMD("PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 2, 0),
+ _CMD("QUIT", IRC_QUIT, CLIENT_ANY, 0, 1, 0),
+ _CMD("REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0),
+ _CMD("RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0),
+ _CMD("SERVER", IRC_SERVER, CLIENT_ANY, 0, -1, 0),
+ _CMD("SERVICE", IRC_SERVICE, CLIENT_ANY, 6, 6, 0),
+ _CMD("SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 2, 1),
+ _CMD("SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 2, 0),
+ _CMD("SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 2, 2, 0),
+ _CMD("STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 2, 2),
+ _CMD("SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 2, 2, 0),
+ _CMD("SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+ _CMD("TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 1, 1),
+ _CMD("TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 1, 2, 1),
+ _CMD("TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 1, 3),
+ _CMD("USER", IRC_USER, CLIENT_ANY, 0, -1, 0),
+ _CMD("USERHOST", IRC_USERHOST, CLIENT_USER, 1, -1, 1),
+ _CMD("USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+ _CMD("VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 1, 1),
+ _CMD("WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1, 0),
+ _CMD("WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4, 0),
+ _CMD("WHO", IRC_WHO, CLIENT_USER, 0, 2, 1),
+ _CMD("WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 1),
+ _CMD("WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0),
+
#ifdef IRCPLUS
- { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 },
+ _CMD("CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, -1, 0),
+# ifdef ICONV
+ _CMD("CHARCONV", IRC_CHARCONV, CLIENT_USER, 1, 1, 0),
+# endif
#endif
+
#ifndef STRICT_RFC
- { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
- { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
+ _CMD("GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0),
+ _CMD("POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0),
#endif
- { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
+ _CMD(NULL, NULL, 0, 0, 0, 0) /* End-Mark */
+#undef _CMD
};
static void Init_Request PARAMS(( REQUEST *Req ));
* 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
+ * terminated line of text: we assume 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
* @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.
+ * fatal error occurred and the connection has been shut down.
*/
GLOBAL bool
Parse_Request( CONN_ID Idx, char *Request )
static void
Init_Request( REQUEST *Req )
{
- /* Neue Request-Struktur initialisieren */
-
int i;
assert( Req != NULL );
}
/* check if client in prefix is known */
- c = Client_Search( Req->prefix );
+ 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 (Client_Type(client) != CLIENT_SERVER) {
+ Log(LOG_ERR,
+ "Ignoring command with invalid prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
+ Req->prefix, Client_ID(client), Idx, Req->command);
+ if (!Conn_WriteStr(Idx,
+ "ERROR :Invalid prefix \"%s\"",
+ Req->prefix))
+ *Closed = true;
+ IRC_SetPenalty(client, 2);
+ } else
+ LogDebug("Ignoring command with invalid prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
+ Req->prefix, Client_ID(client), Idx, Req->command);
return false;
}
/* check if the client named in the prefix is expected
* to come from that direction */
if (Client_NextHop(c) != client) {
- if (Client_Type(c) != CLIENT_SERVER) {
+ if (Client_Type(client) != CLIENT_SERVER) {
Log(LOG_ERR,
- "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
- Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx,
- Req->command);
+ "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\"), closing connection!",
+ Req->prefix, Client_ID(client), Idx, Req->command);
Conn_Close(Idx, NULL, "Spoofed prefix", true);
*Closed = true;
} else {
- Log(LOG_INFO,
- "Ignoring spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\").",
- Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx,
- Req->command);
+ Log(LOG_WARNING,
+ "Ignoring command with spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
+ Req->prefix, Client_ID(client), Idx, Req->command);
}
return false;
-
}
return true;
*Closed = false;
return true;
-} /* Validate_Comman */
+} /* Validate_Command */
static bool
{ 376, IRC_Num_ENDOFMOTD }
};
int i, num;
- char str[LINE_LEN];
+ char str[COMMAND_LEN];
CLIENT *prefix, *target = NULL;
/* Determine target */
continue;
}
- if (!(client_type & cmd->type))
- return IRC_WriteStrClient(client, ERR_NOTREGISTERED_MSG, Client_ID(client));
+ if (!(client_type & cmd->type)) {
+ if (client_type == CLIENT_USER
+ && cmd->type & CLIENT_SERVER)
+ return IRC_WriteErrClient(client,
+ ERR_NOTREGISTEREDSERVER_MSG,
+ Client_ID(client));
+ else
+ return IRC_WriteErrClient(client,
+ ERR_NOTREGISTERED_MSG,
+ Client_ID(client));
+ }
+
+ if (cmd->penalty)
+ IRC_SetPenalty(client, cmd->penalty);
- /* Command is allowed for this client: call it and count produced bytes */
+ if (Req->argc < cmd->min_argc ||
+ (cmd->max_argc != -1 && Req->argc > cmd->max_argc))
+ return IRC_WriteErrClient(client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(client), Req->command);
+
+ /* Command is allowed for this client: call it and count
+ * generated bytes in output */
Conn_ResetWCounter();
result = (cmd->function)(client, Req);
cmd->bytes += Conn_WCounter();
Req->argc == 1 ? "parameter" : "parameters",
Req->prefix ? "" : " no" );
- if (Client_Type(client) != CLIENT_SERVER) {
- result = IRC_WriteStrClient(client, ERR_UNKNOWNCOMMAND_MSG,
+ if (Client_Type(client) != CLIENT_SERVER)
+ result = IRC_WriteErrClient(client, ERR_UNKNOWNCOMMAND_MSG,
Client_ID(client), Req->command);
- Conn_SetPenalty(Idx, 1);
- }
+
return result;
} /* Handle_Request */
projects / ngircd-alex.git / blobdiff