X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=437e8c434547faa797e4685f2e352658240b50fb;hp=bbedcf4caf9968a4ecfbc7a8291660741a73d02a;hb=b130b35f48d19450240748425e12d21f2c38350f;hpb=3283d275ba26c470d131ce0b6f66ee54a00bfd1c

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index bbedcf4c..437e8c43 100644
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -1,111 +1,187 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Channel operator commands
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
+/**
+ * @file
+ * Channel operator commands
+ */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
-#include <stdio.h>
 
-#include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
+#include "irc-macros.h"
 #include "irc-write.h"
 #include "lists.h"
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
-#include "irc-op.h"
+/* Local functions */
+
+static bool
+try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
+	 const char *reason)
+{
+	CLIENT *target = Client_Search(nick);
+
+	if (!target)
+		return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
+					  Client_ID(from), nick);
+
+	Channel_Kick(peer, target, from, channel, reason);
+	return true;
+}
 
+/* Global functions */
 
+/**
+ * Handler for the IRC command "KICK".
+ *
+ * @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_KICK( CLIENT *Client, REQUEST *Req )
+IRC_KICK(CLIENT *Client, REQUEST *Req)
 {
-	CLIENT *target, *from;
-	
+	CLIENT *from;
+	char *itemList = Req->argv[0];
+	const char* currentNick, *currentChannel, *reason;
+	unsigned int channelCount = 1;
+	unsigned int nickCount = 1;
+
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
-	
-	/* Ziel-User suchen */
-	target = Client_Search( Req->argv[1] );
-	if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[1] );
+	while (*itemList) {
+		if (*itemList == ',') {
+			*itemList = '\0';
+			channelCount++;
+		}
+		itemList++;
+	}
 
-	Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from ));
-	return CONNECTED;
-} /* IRC_KICK */	
+	itemList = Req->argv[1];
+	while (*itemList) {
+		if (*itemList == ',') {
+			*itemList = '\0';
+			nickCount++;
+		}
+		itemList++;
+	}
+
+	reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from);
+	currentNick = Req->argv[1];
+	currentChannel = Req->argv[0];
+	if (channelCount == 1) {
+		while (nickCount > 0) {
+			if (!try_kick(Client, from, currentNick,
+				      currentChannel, reason))
+				return false;
+
+			while (*currentNick)
+				currentNick++;
+
+			currentNick++;
+			nickCount--;
+		}
+	} else if (channelCount == nickCount) {
+		while (nickCount > 0) {
+			if (!try_kick(Client, from, currentNick,
+				      currentChannel, reason))
+				return false;
 
+			while (*currentNick)
+				currentNick++;
 
+			while (*currentChannel)
+				currentChannel++;
+
+			currentNick++;
+			currentChannel++;
+			nickCount--;
+		}
+	} else {
+		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					Client_ID(Client), Req->command);
+	}
+	return true;
+} /* IRC_KICK */
+
+/**
+ * Handler for the IRC command "INVITE".
+ *
+ * @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_INVITE(CLIENT *Client, REQUEST *Req)
 {
 	CHANNEL *chan;
 	CLIENT *target, *from;
+	const char *colon_if_necessary;
 	bool remember = false;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if (Req->argc != 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					Client_ID(Client), Req->command);
-
-	if (Client_Type(Client) == CLIENT_SERVER)
-		from = Client_Search(Req->prefix);
-	else
-		from = Client;
-	if (!from)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-					Client_ID(Client), Req->prefix);
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	/* Search user */
 	target = Client_Search(Req->argv[0]);
 	if (!target || (Client_Type(target) != CLIENT_USER))
-		return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG,
-				Client_ID(Client), Req->argv[0]);
+		return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG,
+					  Client_ID(Client), Req->argv[0]);
 
 	chan = Channel_Search(Req->argv[1]);
 	if (chan) {
 		/* Channel exists. Is the user a valid member of the channel? */
 		if (!Channel_IsMemberOf(chan, from))
-			return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]);
+			return IRC_WriteErrClient(from, ERR_NOTONCHANNEL_MSG,
+						  Client_ID(Client),
+						  Req->argv[1]);
+
+		/* Is the channel "invite-disallow"? */
+		if (Channel_HasMode(chan, 'V'))
+			return IRC_WriteErrClient(from, ERR_NOINVITE_MSG,
+						  Client_ID(from),
+						  Channel_Name(chan));
 
 		/* Is the channel "invite-only"? */
-		if (strchr(Channel_Modes(chan), 'i')) {
-			/* Yes. The user must be channel operator! */
-			if (!strchr(Channel_UserModes(chan, from), 'o'))
-				return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
-						Client_ID(from), Channel_Name(chan));
+		if (Channel_HasMode(chan, 'i')) {
+			/* Yes. The user issuing the INVITE command must be
+			 * channel owner/admin/operator/halfop! */
+			if (!Channel_UserHasMode(chan, from, 'q') &&
+			    !Channel_UserHasMode(chan, from, 'a') &&
+			    !Channel_UserHasMode(chan, from, 'o') &&
+			    !Channel_UserHasMode(chan, from, 'h'))
+				return IRC_WriteErrClient(from,
+							  ERR_CHANOPRIVSNEEDED_MSG,
+							  Client_ID(from),
+							  Channel_Name(chan));
 			remember = true;
 		}
 
 		/* Is the target user already member of the channel? */
 		if (Channel_IsMemberOf(chan, target))
-			return IRC_WriteStrClient(from, ERR_USERONCHANNEL_MSG,
-					Client_ID(from), Req->argv[0], Req->argv[1]);
+			return IRC_WriteErrClient(from, ERR_USERONCHANNEL_MSG,
+						  Client_ID(from),
+						  Req->argv[0], Req->argv[1]);
 
 		/* If the target user is banned on that channel: remember invite */
 		if (Lists_Check(Channel_GetListBans(chan), target))
@@ -113,23 +189,35 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 
 		if (remember) {
 			/* We must remember this invite */
-			if (!Channel_AddInvite(chan, Client_Mask(target), true))
+			if (!Channel_AddInvite(chan, Client_MaskCloaked(target),
+						true))
 				return CONNECTED;
 		}
 	}
 
-	LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
-
+	LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from),
+		 Req->argv[0], Req->argv[1]);
+
+	/*
+	 * RFC 2812 states:
+	 * 'There is no requirement that the channel [..] must exist or be a
+	 * valid channel'. The problem with this is that this allows the
+	 * "channel" to contain spaces, in which case we must prefix its name
+	 * with a colon to make it clear that it is only a single argument.
+	 */
+	colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":"";
 	/* Inform target client */
-	IRC_WriteStrClientPrefix(target, from, "INVITE %s %s", Req->argv[0], Req->argv[1]);
+	IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0],
+				  colon_if_necessary, Req->argv[1]);
 
 	if (Client_Conn(target) > NONE) {
 		/* The target user is local, so we have to send the status code */
 		if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG,
-				Client_ID(from), Req->argv[0], Req->argv[1]))
+					       Client_ID(from), Req->argv[0],
+					       colon_if_necessary, Req->argv[1]))
 			return DISCONNECTED;
 
-		if (strchr(Client_Modes(target), 'a') &&
+		if (Client_HasMode(target, 'a') &&
 			!IRC_WriteStrClient(from, RPL_AWAY_MSG, Client_ID(from),
 					Client_ID(target), Client_Away(target)))
 				return DISCONNECTED;
@@ -137,5 +225,4 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
 	return CONNECTED;
 } /* IRC_INVITE */
 
-
 /* -eof- */