]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-oper.c
On bad /oper set the penalty to 10 seconds
[ngircd-alex.git] / src / ngircd / irc-oper.c
index 6945fbb3c238ed63c85d8adcd2b516510c646e5d..0b50bca659e40c3f89ed217c00d0ccf1de060be1 100644 (file)
@@ -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
 #include "conn-func.h"
 #include "conf.h"
 #include "channel.h"
+#include "class.h"
+#include "parse.h"
+#include "irc.h"
+#include "irc-macros.h"
 #include "irc-write.h"
+#include "lists.h"
 #include "log.h"
 #include "match.h"
 #include "messages.h"
-#include "parse.h"
 #include "op.h"
 
 #include <exp.h>
@@ -46,7 +50,7 @@ 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);
+       IRC_SetPenalty(Client, 10);
        return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG,
                                  Client_ID(Client));
 } /* Bad_OperPass */
@@ -54,8 +58,6 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 /**
  * 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.
@@ -69,10 +71,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++)
@@ -95,20 +93,16 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
                                          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));
+       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));
 } /* IRC_OPER */
 
 /**
  * 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.
@@ -127,15 +121,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();
@@ -158,8 +143,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.
@@ -175,13 +158,10 @@ 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));
+
        raise(SIGHUP);
 
        return CONNECTED;
@@ -190,8 +170,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,11 +185,6 @@ 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));
        NGIRCd_SignalRestart = true;
@@ -222,8 +195,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.
@@ -236,21 +207,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();
 
@@ -259,14 +230,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()) {
@@ -289,7 +260,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;
@@ -298,7 +269,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;
@@ -307,7 +278,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,11 +314,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));
@@ -361,7 +327,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? */
@@ -374,8 +340,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.
@@ -388,15 +352,10 @@ 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));
+               if (!Op_Check(Client, Req))
+                       return Op_NoPrivileges(Client, Req);
                from = Client;
                break;
        case CLIENT_SERVER:
@@ -407,12 +366,102 @@ 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]);
        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, *c, *c_next;
+       char reason[COMMAND_LEN], class_c;
+       struct list_head *list;
+       int class;
+
+       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]);
+                       }
+
+                       /* Check currently connected clients */
+                       snprintf(reason, sizeof(reason), "%c-Line by \"%s\": \"%s\"",
+                                class_c, Client_ID(from), Req->argv[2]);
+                       list = Class_GetList(class);
+                       c = Client_First();
+                       while (c) {
+                               c_next = Client_Next(c);
+                               if ((class == CLASS_GLINE || Client_Conn(c) > NONE)
+                                   && Lists_Check(list, c))
+                                       IRC_KillClient(Client, NULL,
+                                                      Client_ID(c), reason);
+                               c = c_next;
+                       }
+               }
+       }
+
+       return CONNECTED;
+}
 
 /* -eof- */