]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-oper.c
Rework check for number of parameters
[ngircd-alex.git] / src / ngircd / irc-oper.c
index e8b8d264d887742166322edfd2b5e9703500ae2c..40633177a51babbe3d8971453f9b62818bec8a50 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * 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
@@ -27,6 +27,8 @@
 #include "conn-func.h"
 #include "conf.h"
 #include "channel.h"
+#include "class.h"
+#include "irc-macros.h"
 #include "irc-write.h"
 #include "log.h"
 #include "match.h"
@@ -37,7 +39,6 @@
 #include <exp.h>
 #include "irc-oper.h"
 
-
 /**
  * Handle invalid received OPER command.
  * Log OPER attempt and send error message to client.
@@ -47,12 +48,17 @@ 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.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_OPER( CLIENT *Client, REQUEST *Req )
 {
@@ -62,8 +68,6 @@ 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 );
-
        len = array_length(&Conf_Opers, sizeof(*op));
        op = array_start(&Conf_Opers);
        for (i = 0; i < len && strcmp(op[i].name, Req->argv[0]); i++)
@@ -77,20 +81,31 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
        if (op[i].mask && (!Match(op[i].mask, Client_Mask(Client))))
                return Bad_OperPass(Client, op[i].mask, "hostmask check failed");
 
-       if( ! Client_HasMode( Client, 'o' ))
-       {
-               Client_ModeAdd( Client, 'o' );
-               if( ! IRC_WriteStrClient( Client, "MODE %s :+o", Client_ID( Client ))) return DISCONNECTED;
-               IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client ));
+       if (!Client_HasMode(Client, 'o')) {
+               Client_ModeAdd(Client, 'o');
+               if (!IRC_WriteStrClient(Client, "MODE %s :+o",
+                                       Client_ID(Client)))
+                       return DISCONNECTED;
+               IRC_WriteStrServersPrefix(NULL, Client, "MODE %s :+o",
+                                         Client_ID(Client));
        }
 
-       if( ! Client_OperByMe( Client )) Log( LOG_NOTICE|LOG_snotice, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client ));
+       if (!Client_OperByMe(Client))
+               Log(LOG_NOTICE|LOG_snotice,
+                   "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 ));
+       Client_SetOperByMe(Client, true);
+       return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client));
 } /* IRC_OPER */
 
-
+/**
+ * Handler for the IRC "DIE" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_DIE(CLIENT * Client, REQUEST * Req)
 {
@@ -105,15 +120,6 @@ IRC_DIE(CLIENT * Client, REQUEST * Req)
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-       /* Bad number of parameters? */
-#ifdef STRICT_RFC
-       if (Req->argc != 0)
-#else
-       if (Req->argc > 1)
-#endif
-               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-                                         Client_ID(Client), Req->command);
-
        /* Is a message given? */
        if (Req->argc > 0) {
                c = Conn_First();
@@ -133,7 +139,13 @@ IRC_DIE(CLIENT * Client, REQUEST * Req)
        return CONNECTED;
 } /* IRC_DIE */
 
-
+/**
+ * Handler for the IRC "REHASH" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_REHASH( CLIENT *Client, REQUEST *Req )
 {
@@ -145,16 +157,22 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req )
        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));
 
-       Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client ));
        raise(SIGHUP);
 
        return CONNECTED;
 } /* IRC_REHASH */
 
-
+/**
+ * Handler for the IRC "RESTART" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_RESTART( CLIENT *Client, REQUEST *Req )
 {
@@ -166,17 +184,19 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req )
        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 RESTART command from \"%s\" ...", Client_Mask( Client ));
+       Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...",
+           Client_Mask(Client));
        NGIRCd_SignalRestart = true;
+
        return CONNECTED;
 } /* IRC_RESTART */
 
-
 /**
- * Connect configured or new server.
+ * Handler for the IRC "CONNECT" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_CONNECT(CLIENT * Client, REQUEST * Req)
@@ -186,21 +206,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();
 
@@ -209,14 +229,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()) {
@@ -239,7 +259,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;
@@ -248,7 +268,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;
@@ -257,7 +277,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]);
        }
@@ -272,9 +292,15 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
        return CONNECTED;
 } /* IRC_CONNECT */
 
-
 /**
- * Disconnect (and disable) configured server.
+ * Handler for the IRC "DISCONNECT" command.
+ *
+ * This command is not specified in the IRC RFCs, it is an extension
+ * of ngIRCd: it shuts down and disables a configured server connection.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
@@ -287,11 +313,6 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
        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,
-                                         Client_ID(Client), Req->command);
-
        IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
                        "Received DISCONNECT %s from %s",
                        Req->argv[0], Client_ID(Client));
@@ -305,7 +326,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? */
@@ -315,7 +336,13 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
                return DISCONNECTED;
 } /* IRC_DISCONNECT */
 
-
+/**
+ * Handler for the IRC "WALLOPS" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 {
@@ -324,13 +351,11 @@ 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);
-
        switch (Client_Type(Client)) {
        case CLIENT_USER:
                if (!Client_OperByMe(Client))
-                       return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, Client_ID(Client));
+                       return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG,
+                                                 Client_ID(Client));
                from = Client;
                break;
        case CLIENT_SERVER:
@@ -341,11 +366,87 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
        }
 
        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);
 
        IRC_SendWallops(Client, from, "%s", Req->argv[0]);
        return CONNECTED;
 } /* IRC_WALLOPS */
 
+/**
+ * Handle <?>LINE commands (GLINE, KLINE).
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_xLINE(CLIENT *Client, REQUEST *Req)
+{
+       CLIENT *from;
+       int class;
+       char class_c;
+
+       assert(Client != NULL);
+       assert(Req != NULL);
+
+       /* Bad number of parameters? */
+       if (Req->argc != 1 && Req->argc != 3)
+               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':
+                       class = CLASS_GLINE; class_c = 'G';
+                       break;
+               case 'k':
+               case 'K':
+                       class = CLASS_KLINE; class_c = 'K';
+                       break;
+               default:
+                       Log(LOG_CRIT,
+                           "IRC_xLINE() called for unknown line: %c!? Ignored.",
+                           Req->command[0]);
+                       return CONNECTED;
+       }
+
+       if (Req->argc == 1) {
+               /* Delete mask from list */
+               Class_DeleteMask(class, Req->argv[0]);
+               Log(LOG_NOTICE|LOG_snotice,
+                   "\"%s\" deleted \"%s\" from %c-Line list.",
+                   Client_Mask(from), Req->argv[0], class_c);
+               if (class == CLASS_GLINE) {
+                       /* Inform other servers */
+                       IRC_WriteStrServersPrefix(Client, from, "%s %s",
+                                                 Req->command, Req->argv[0]);
+
+               }
+       } else {
+               /* Add new mask to list */
+               if (Class_AddMask(class, Req->argv[0],
+                                 time(NULL) + atol(Req->argv[1]),
+                                 Req->argv[2])) {
+                       Log(LOG_NOTICE|LOG_snotice,
+                           "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",
+                           Client_Mask(from), Req->argv[0], class_c,
+                           Req->argv[2], atol(Req->argv[1]));
+                       if (class == CLASS_GLINE) {
+                               /* Inform other servers */
+                               IRC_WriteStrServersPrefix(Client, from,
+                                               "%s %s %s :%s", Req->command,
+                                               Req->argv[0], Req->argv[1],
+                                               Req->argv[2]);
+                       }
+               }
+       }
+
+       return CONNECTED;
+}
 
 /* -eof- */