On bad /oper set the penalty to 10 seconds

[ngircd-alex.git] / src / ngircd / irc-oper.c

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 9907371eb82657c5ba05e3f693c0c4deb27eadc4..0b50bca659e40c3f89ed217c00d0ccf1de060be1 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -28,12 +28,14 @@
 #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>
@@ -48,7 +50,8 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 {
        Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s",
            Client_Mask(Client), errtoken, errmsg);
-       return IRC_WriteErrClient(Client, ERR_PASSWDMISMATCH_MSG,
+       IRC_SetPenalty(Client, 10);
+       return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG,
                                  Client_ID(Client));
 } /* Bad_OperPass */
 
@@ -68,8 +71,6 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
-
        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++)
@@ -92,12 +93,10 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
                                          Client_ID(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));
+       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 */
 
@@ -122,12 +121,6 @@ IRC_DIE(CLIENT * Client, REQUEST * Req)
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-#ifdef STRICT_RFC
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
-#else
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
-#endif
-
        /* Is a message given? */
        if (Req->argc > 0) {
                c = Conn_First();
@@ -165,8 +158,6 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req )
        if (!Op_Check(Client, Req))
                return Op_NoPrivileges(Client, Req);
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
-
        Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...",
            Client_Mask(Client));
        IRC_WriteStrClient(Client, RPL_REHASHING_MSG, Client_ID(Client));
@@ -194,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_WriteErrClient(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;
@@ -221,10 +207,6 @@ 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)
@@ -236,6 +218,10 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
                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();
 
@@ -328,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_WriteErrClient(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));
@@ -371,13 +352,10 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 1)
-
        switch (Client_Type(Client)) {
        case CLIENT_USER:
-               if (!Client_OperByMe(Client))
-                       return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG,
-                                                 Client_ID(Client));
+               if (!Op_Check(Client, Req))
+                       return Op_NoPrivileges(Client, Req);
                from = Client;
                break;
        case CLIENT_SERVER:
@@ -405,22 +383,23 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 GLOBAL bool
 IRC_xLINE(CLIENT *Client, REQUEST *Req)
 {
-       CLIENT *from;
+       CLIENT *from, *c, *c_next;
+       char reason[COMMAND_LEN], class_c;
+       struct list_head *list;
        int class;
-       char class_c;
 
        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_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':
@@ -465,6 +444,20 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
                                                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;
+                       }
                }
        }