X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fngircd%2Firc-oper.c;h=dd408a6fa8bd8c77869397ff8655efcee881bdf6;hb=37609d6a4f036b175fdc304d0ee466bd8ad57bf9;hp=237107f69b8f56c828f212122da415cee247ba1b;hpb=46b0eef721b9b3eec37d29aff65b6a7fc488a887;p=ngircd-alex.git diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 237107f6..dd408a6f 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors. + * Copyright (c)2001-2013 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 @@ -28,6 +28,7 @@ #include "conf.h" #include "channel.h" #include "class.h" +#include "irc-macros.h" #include "irc-write.h" #include "log.h" #include "match.h" @@ -47,16 +48,13 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) { Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask(Client), errtoken, errmsg); - IRC_SetPenalty(Client, 3); - return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG, + return IRC_WriteErrClient(Client, ERR_PASSWDMISMATCH_MSG, Client_ID(Client)); } /* Bad_OperPass */ /** * Handler for the IRC "OPER" command. * - * See RFC 2812, 3.1.4 "Oper message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -70,9 +68,7 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (Req->argc != 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) len = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); @@ -98,8 +94,8 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) if (!Client_OperByMe(Client)) Log(LOG_NOTICE|LOG_snotice, - "Got valid OPER from \"%s\", user is an IRC operator now.", - Client_Mask(Client)); + "Got valid OPER for \"%s\" from \"%s\", user is an IRC operator now.", + Req->argv[0], Client_Mask(Client)); Client_SetOperByMe(Client, true); return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client)); @@ -108,8 +104,6 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) /** * Handler for the IRC "DIE" command. * - * See RFC 2812, 4.3 "Die message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -125,17 +119,14 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Op_Check(Client, Req)) - return Op_NoPrivileges(Client, Req); - - /* Bad number of parameters? */ #ifdef STRICT_RFC - if (Req->argc != 0) + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) #else - if (Req->argc > 1) + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1) #endif - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Is a message given? */ if (Req->argc > 0) { @@ -159,8 +150,6 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) /** * Handler for the IRC "REHASH" command. * - * See RFC 2812, 4.2 "Rehash message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -173,14 +162,11 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) + if (!Op_Check(Client, Req)) return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ - if (Req->argc != 0) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command ); - Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask(Client)); IRC_WriteStrClient(Client, RPL_REHASHING_MSG, Client_ID(Client)); @@ -193,8 +179,6 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) /** * Handler for the IRC "RESTART" command. * - * See RFC 2812, 4.4 "Restart message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -207,14 +191,14 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (!Op_Check(Client, Req)) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 0) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); + Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask(Client)); NGIRCd_SignalRestart = true; @@ -225,8 +209,6 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) /** * Handler for the IRC "CONNECT" command. * - * See RFC 2812, 3.4.7 "Connect message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -239,21 +221,21 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (Client_Type(Client) != CLIENT_SERVER - && !Client_HasMode(Client, 'o')) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 && Req->argc != 5 && Req->argc != 6) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); /* Invalid port number? */ if ((Req->argc > 1) && atoi(Req->argv[1]) < 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (Client_Type(Client) != CLIENT_SERVER + && !Client_HasMode(Client, 'o')) + return Op_NoPrivileges(Client, Req); + from = Client; target = Client_ThisServer(); @@ -262,14 +244,14 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) from = Client_Search(Req->prefix); if (! from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); + return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); target = (Req->argc == 3) ? Client_Search(Req->argv[2]) : Client_Search(Req->argv[5]); if (! target || Client_Type(target) != CLIENT_SERVER) - return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, - Client_ID(from), Req->argv[0]); + return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(from), Req->argv[0]); } if (target != Client_ThisServer()) { @@ -292,7 +274,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) switch (Req->argc) { case 1: if (!Conf_EnablePassiveServer(Req->argv[0])) - return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG, Client_ID(from), Req->argv[0]); break; @@ -301,7 +283,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) /* Connect configured server */ if (!Conf_EnableServer (Req->argv[0], (UINT16) atoi(Req->argv[1]))) - return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG, Client_ID(from), Req->argv[0]); break; @@ -310,7 +292,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) if (!Conf_AddServer (Req->argv[0], (UINT16) atoi(Req->argv[1]), Req->argv[2], Req->argv[3], Req->argv[4])) - return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG, Client_ID(from), Req->argv[0]); } @@ -343,14 +325,14 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Op_Check(Client, Req)) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); + IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), "Received DISCONNECT %s from %s", Req->argv[0], Client_ID(Client)); @@ -364,7 +346,7 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) /* Disconnect configured server */ if (!Conf_DisableServer(Req->argv[0])) - return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG, + return IRC_WriteErrClient(Client, ERR_NOSUCHSERVER_MSG, Client_ID(Client), Req->argv[0]); /* Are we still connected or were we killed, too? */ @@ -377,8 +359,6 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) /** * Handler for the IRC "WALLOPS" command. * - * See RFC 2812, 4.7 "Operwall message". - * * @param Client The client from which this command has been received. * @param Req Request structure with prefix and all parameters. * @return CONNECTED or DISCONNECTED. @@ -391,14 +371,12 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (Req->argc != 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 1) switch (Client_Type(Client)) { case CLIENT_USER: if (!Client_OperByMe(Client)) - return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG, Client_ID(Client)); from = Client; break; @@ -410,7 +388,7 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) } if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); IRC_SendWallops(Client, from, "%s", Req->argv[0]); @@ -434,15 +412,15 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - from = Op_Check(Client, Req); - if (!from) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 3) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + from = Op_Check(Client, Req); + if (!from) + return Op_NoPrivileges(Client, Req); + switch(Req->command[0]) { case 'g': case 'G':