]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-mode.c
MODE command: Always report channel creation time
[ngircd-alex.git] / src / ngircd / irc-mode.c
index 88d2294bad203efe377820bc8f9aaee822056544..cde573bf83faa98db98e9702bdd234f5fbe21203 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * 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 commands for mode changes (like MODE, AWAY, etc.)
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "irc-macros.h"
@@ -33,7 +31,6 @@
 #include "messages.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "irc-mode.h"
 
 static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
@@ -69,9 +66,15 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(origin, Req, Client)
 
+       /* Test for "fake" MODE commands injected by this local instance,
+        * for example when handling the "DefaultUserModes" settings.
+        * This doesn't harm real commands, because prefixes of regular
+        * clients are checked in Validate_Prefix() and can't be faked. */
+       if (Req->prefix && Client_Search(Req->prefix) == Client_ThisServer())
+               Client = Client_Search(Req->prefix);
+
        /* Channel or user mode? */
        cl = NULL; chan = NULL;
        if (Client_IsValidNick(Req->argv[0]))
@@ -224,11 +227,13 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                        else
                                x[0] = 'B';
                        break;
-               case 'c': /* Receive connect notices
-                          * (only settable by IRC operators!) */
+               case 'c': /* Receive connect notices */
+               case 'q': /* KICK-protected user */
+               case 'F': /* disable flood protection */
+                         /* (only settable by IRC operators!) */
                        if (!set || Client_Type(Client) == CLIENT_SERVER
-                           || Client_OperByMe(Origin))
-                               x[0] = 'c';
+                           || Client_HasMode(Origin, 'o'))
+                               x[0] = *mode_ptr;
                        else
                                ok = IRC_WriteErrClient(Origin,
                                                        ERR_NOPRIVILEGES_MSG,
@@ -236,22 +241,12 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                        break;
                case 'o': /* IRC operator (only unsettable!) */
                        if (!set || Client_Type(Client) == CLIENT_SERVER) {
-                               Client_SetOperByMe(Target, false);
                                x[0] = 'o';
                        } else
                                ok = IRC_WriteErrClient(Origin,
                                                        ERR_NOPRIVILEGES_MSG,
                                                        Client_ID(Origin));
                        break;
-               case 'q': /* KICK-protected user */
-                       if (!set || Client_Type(Client) == CLIENT_SERVER
-                           || Client_OperByMe(Origin))
-                               x[0] = 'q';
-                       else
-                               ok = IRC_WriteErrClient(Origin,
-                                                       ERR_NOPRIVILEGES_MSG,
-                                                       Client_ID(Origin));
-                       break;
                case 'r': /* Restricted (only settable) */
                        if (set || Client_Type(Client) == CLIENT_SERVER)
                                x[0] = 'r';
@@ -275,7 +270,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                                                        Client_ID(Origin));
                        else if (!set || Conf_CloakHostModeX[0]
                                 || Client_Type(Client) == CLIENT_SERVER
-                                || Client_OperByMe(Client)) {
+                                || Client_HasMode(Origin, 'o')) {
                                x[0] = 'x';
                                send_RPL_HOSTHIDDEN_MSG = true;
                        } else
@@ -367,7 +362,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                         Client_Modes(Target));
        }
 
-       IRC_SetPenalty(Client, 1);
        return ok;
 } /* Client_Mode */
 
@@ -384,37 +378,44 @@ Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel)
        char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], argadd[CLIENT_PASS_LEN];
        const char *mode_ptr;
 
-       /* Member or not? -- That's the question! */
-       if (!Channel_IsMemberOf(Channel, Origin))
-               return IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
-                       Client_ID(Origin), Channel_Name(Channel), Channel_Modes(Channel));
-
-       /* The sender is a member: generate extended reply */
-       strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
-       mode_ptr = the_modes;
-       the_args[0] = '\0';
-
-       while(*mode_ptr) {
-               switch(*mode_ptr) {
-               case 'l':
-                       snprintf(argadd, sizeof(argadd), " %lu", Channel_MaxUsers(Channel));
-                       strlcat(the_args, argadd, sizeof(the_args));
-                       break;
-               case 'k':
-                       strlcat(the_args, " ", sizeof(the_args));
-                       strlcat(the_args, Channel_Key(Channel), sizeof(the_args));
-                       break;
+       if (!Channel_IsMemberOf(Channel, Origin)) {
+               /* Not a member: "simple" mode reply */
+               if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
+                                       Client_ID(Origin), Channel_Name(Channel),
+                                       Channel_Modes(Channel)))
+                       return DISCONNECTED;
+       } else {
+               /* The sender is a member: generate extended reply */
+               strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
+               mode_ptr = the_modes;
+               the_args[0] = '\0';
+
+               while(*mode_ptr) {
+                       switch(*mode_ptr) {
+                       case 'l':
+                               snprintf(argadd, sizeof(argadd), " %lu",
+                                        Channel_MaxUsers(Channel));
+                               strlcat(the_args, argadd, sizeof(the_args));
+                               break;
+                       case 'k':
+                               strlcat(the_args, " ", sizeof(the_args));
+                               strlcat(the_args, Channel_Key(Channel),
+                                       sizeof(the_args));
+                               break;
+                       }
+                       mode_ptr++;
                }
-               mode_ptr++;
+               if (the_args[0])
+                       strlcat(the_modes, the_args, sizeof(the_modes));
+
+               if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
+                                       Client_ID(Origin), Channel_Name(Channel),
+                                       the_modes))
+                       return DISCONNECTED;
        }
-       if (the_args[0])
-               strlcat(the_modes, the_args, sizeof(the_modes));
 
-       if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
-                               Client_ID(Origin), Channel_Name(Channel),
-                               the_modes))
-               return DISCONNECTED;
 #ifndef STRICT_RFC
+       /* Channel creation time */
        if (!IRC_WriteStrClient(Origin, RPL_CREATIONTIME_MSG,
                                  Client_ID(Origin), Channel_Name(Channel),
                                  Channel_CreationTime(Channel)))
@@ -456,7 +457,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 
        /* Check if origin is oper and opers can use mode */
        use_servermode = Conf_OperServerMode;
-       if(Client_OperByMe(Client) && Conf_OperCanMode) {
+       if(Client_HasMode(Client, 'o') && Conf_OperCanMode) {
                is_oper = true;
        }
 
@@ -593,9 +594,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                goto chan_exit;
                        if (!set) {
                                if (is_oper || is_machine || is_owner ||
-                                   is_admin || is_op || is_halfop)
+                                   is_admin || is_op || is_halfop) {
                                        x[0] = *mode_ptr;
-                               else
+                                       if (Channel_HasMode(Channel, 'k'))
+                                               strlcpy(argadd, "*", sizeof(argadd));
+                                       if (arg_arg > mode_arg)
+                                               arg_arg++;
+                               } else
                                        connected = IRC_WriteErrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
@@ -928,7 +933,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                }
        }
 
-       IRC_SetPenalty(Client, 1);
        return connected;
 } /* Channel_Mode */
 
@@ -945,8 +949,6 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
        assert (Client != NULL);
        assert (Req != NULL);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
-
        if (Req->argc == 1 && Req->argv[0][0]) {
                Client_SetAway(Client, Req->argv[0]);
                Client_ModeAdd(Client, 'a');