X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=a530f2eca1be91cfbbef0302b7d57c587be0e81c;hb=48f5beea5b9076c969c2b58c11f068697ed2b811;hp=91a64f89b0102cb60e7ec6ab3b20d6b22b1f7db1;hpb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 91a64f89b..a530f2eca 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDmode */
+/* $Core */
 /* $ExtraDeps: $(RELCPPFILES) */
 /* $ExtraObjects: modes/modeclasses.a */
 /* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */
@@ -43,16 +43,14 @@
 #include "modes/cmode_h.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
-/* +s (server notices) */
-#include "modes/umode_s.h"
 /* +w (see wallops) */
 #include "modes/umode_w.h"
 /* +i (invisible) */
 #include "modes/umode_i.h"
 /* +o (operator) */
 #include "modes/umode_o.h"
-/* +n (notice mask - our implementation of snomasks) */
-#include "modes/umode_n.h"
+/* +s (server notice masks) */
+#include "modes/umode_s.h"
 
 ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired)
 	: ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired)
@@ -251,7 +249,7 @@ User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 	d = ServerInstance->FindNick(dest);
 	if (!d)
 	{
-		user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, dest);
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), dest);
 		return NULL;
 	}
 	return d;
@@ -282,7 +280,7 @@ const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
 				n->first->AddVoicedUser(d);
 			break;
 		}
-		return d->nick;
+		return d->nick.c_str();
 	}
 	return "";
 }
@@ -312,7 +310,7 @@ const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
 				n->first->DelVoicedUser(d);
 			break;
 		}
-		return d->nick;
+		return d->nick.c_str();
 	}
 	return "";
 }
@@ -322,39 +320,39 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 	if (targetchannel)
 	{
 		/* Display channel's current mode string */
-		user->WriteNumeric(324, "%s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user)));
-		user->WriteNumeric(329, "%s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age);
+		user->WriteNumeric(RPL_CHANNELMODEIS, "%s %s +%s",user->nick.c_str(), targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user)));
+		user->WriteNumeric(RPL_CHANNELCREATED, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (unsigned long)targetchannel->age);
 		return;
 	}
 	else if (targetuser)
 	{
 		if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user))
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
 			return;
 		}
 
 		if ((targetuser == user) || (IS_OPER(user)))
 		{
 			/* Display user's current mode string */
-			user->WriteNumeric(221, "%s :+%s",targetuser->nick,targetuser->FormatModes());
+			user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
 			if (IS_OPER(targetuser))
-				user->WriteNumeric(8, "%s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
+				user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
 			return;
 		}
 		else
 		{
-			user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick);
+			user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
 			return;
 		}
 	}
 
 	/* No such nick/channel */
-	user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text);
+	user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
 	return;
 }
 
-void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
 {
 	std::string target = parameters[0];
 	ModeType type = MODETYPE_USER;
@@ -367,15 +365,14 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 	/* Special case for displaying the list for listmodes,
 	 * e.g. MODE #chan b, or MODE #chan +b without a parameter
 	 */
-	if ((targetchannel) && (pcnt == 2))
+	if ((targetchannel) && (parameters.size() == 2))
 	{
-		const char* mode = parameters[1];
+		const char* mode = parameters[1].c_str();
 		int nonlistmodes_found = 0;
-		bool sent[256];
 
-		mask = MASK_CHANNEL;
+		seq++;
 
-		memset(&sent, 0, 256);
+		mask = MASK_CHANNEL;
 		
 		while (mode && *mode)
 		{
@@ -390,9 +387,9 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			/* Ensure the user doesnt request the same mode twice,
 			 * so they cant flood themselves off out of idiocy.
 			 */
-			if (!sent[mletter])
+			if (sent[mletter] != seq)
 			{
-				sent[mletter] = true;
+				sent[mletter] = seq;
 			}
 			else
 			{
@@ -413,11 +410,14 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 					continue;
 				}
 
-				if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+				if (!IS_OPER(user))
 				{
-					user->WriteNumeric(482, "%s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++);
-					mh->DisplayEmptyList(user, targetchannel);
-					continue;
+					if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+					{
+						user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only half-operators and above may view the +%c list",user->nick.c_str(), targetchannel->name.c_str(), *mode++);
+						mh->DisplayEmptyList(user, targetchannel);
+						continue;
+					}
 				}
 
 				/** See below for a description of what craq this is :D
@@ -446,11 +446,11 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			return;
 	}
 
-	if (pcnt == 1)
+	if (parameters.size() == 1)
 	{
-		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+		this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0].c_str());
 	}
-	else if (pcnt > 1)
+	else if (parameters.size() > 1)
 	{
 		bool SkipAccessChecks = false;
 
@@ -479,14 +479,14 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			mask = MASK_USER;
 			if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
 			{
-				user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick);
+				user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
 				return;
 			}
 		}
 		else
 		{
 			/* No such nick/channel */
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
 			return;
 		}
 
@@ -496,8 +496,8 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 		std::string output_sequence;
 		bool adding = true, state_change = false;
 		unsigned char handler_id = 0;
-		int parameter_counter = 2; /* Index of first parameter */
-		int parameter_count = 0;
+		unsigned int parameter_counter = 2; /* Index of first parameter */
+		unsigned int parameter_count = 0;
 		bool last_successful_state_change = false;
 
 		/* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
@@ -560,7 +560,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 							if (modehandlers[handler_id]->GetNumParams(adding))
 							{
 								/* This mode expects a parameter, do we have any parameters left in our list to use? */
-								if (parameter_counter < pcnt)
+								if (parameter_counter < parameters.size())
 								{
 									parameter = parameters[parameter_counter++];
 
@@ -612,8 +612,8 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 									if (!ourmode || ourmode->GetPrefixRank() < neededrank)
 									{
 										/* Bog off */
-										user->WriteNumeric(482, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
-												user->nick, targetchannel->name, needed, adding ? "" : "un", modechar);
+										user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
+												user->nick.c_str(), targetchannel->name.c_str(), needed, adding ? "" : "un", modechar);
 										continue;
 									}
 								}
@@ -639,6 +639,17 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 							if (abort)
 								continue;
 
+							/* If it's disabled, they have to be an oper.
+							 */
+							if (IS_LOCAL(user) && !IS_OPER(user) && ((type == MODETYPE_CHANNEL ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes)[modehandlers[handler_id]->GetModeChar() - 'A']))
+							{
+								user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - %s mode %c has been locked by the administrator",
+										user->nick.c_str(),
+										type == MODETYPE_CHANNEL ? "channel" : "user",
+										modehandlers[handler_id]->GetModeChar());
+								continue;
+							}
+
 							/* It's an oper only mode, check if theyre an oper. If they arent,
 							 * eat any parameter that  came with the mode, and continue to next
 							 */
@@ -646,16 +657,16 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 							{
 								if (IS_OPER(user))
 								{
-									user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
-											user->nick,
-											user->oper,
+									user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
+											user->nick.c_str(),
+											user->oper.c_str(),
 											type == MODETYPE_CHANNEL ? "channel" : "user",
 											modehandlers[handler_id]->GetModeChar());
 								}
 								else
 								{
-									user->WriteNumeric(481, "%s :Permission Denied - Only operators may set %s mode %c",
-											user->nick,
+									user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c",
+											user->nick.c_str(),
 											type == MODETYPE_CHANNEL ? "channel" : "user",
 											modehandlers[handler_id]->GetModeChar());
 								}
@@ -712,7 +723,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 								state_change = false;
 
 								if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100)
-										|| (parameter_count > MAXMODES))
+										|| (parameter_count > ServerInstance->Config->Limits.MaxModes))
 								{
 									/* We cant have a mode sequence this long */
 									letter = mode_sequence.end() - 1;
@@ -724,7 +735,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 					else
 					{
 						/* No mode handler? Unknown mode character then. */
-						user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick, modechar);
+						user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar);
 					}
 				break;
 			}
@@ -737,12 +748,12 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
-					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
+					targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
 					this->LastParse = targetchannel->name;
 				}
 				else
 				{
-					targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+					targetuser->WriteServ("MODE %s %s%s",targetuser->nick.c_str(),output_sequence.c_str(), parameter_list.str().c_str());
 					this->LastParse = targetuser->nick;
 				}
 			}
@@ -750,13 +761,13 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
-					targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+					targetchannel->WriteChannel(user, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
 					FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
 					this->LastParse = targetchannel->name;
 				}
 				else
 				{
-					user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+					user->WriteTo(targetuser, "MODE %s %s%s", targetuser->nick.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
 					FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str()));
 					this->LastParse = targetuser->nick;
 				}
@@ -781,6 +792,9 @@ void ModeParser::CleanMask(std::string &mask)
 	std::string::size_type pos_of_dot = mask.find_first_of('.');
 	std::string::size_type pos_of_colons = mask.find("::"); /* Because ipv6 addresses are colon delimited -- double so it treats extban as nick */
 
+	if (mask.length() >= 2 && mask[1] == ':')
+		return; // if it's an extban, don't even try guess how it needs to be formed.
+
 	if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos))
 	{
 		/* Just a nick, or just a host - or clearly ipv6 (starting with :) */
@@ -1128,7 +1142,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 {
 	char moderemove[MAXBUF];
-	const char* parameters[] = { user->nick, moderemove };
+	std::vector<std::string> parameters;
 
 	if (user->IsModeSet(this->GetModeChar()))
 	{
@@ -1139,7 +1153,9 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 		else
 		{
 			sprintf(moderemove,"-%c",this->GetModeChar());
-			ServerInstance->Parser->CallHandler("MODE", parameters, 2, user);
+			parameters.push_back(user->nick);
+			parameters.push_back(moderemove);
+			ServerInstance->Parser->CallHandler("MODE", parameters, user);
 		}
 	}
 }
@@ -1150,7 +1166,7 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
 	char moderemove[MAXBUF];
-	const char* parameters[] = { channel->name, moderemove };
+	std::vector<std::string> parameters;
 
 	if (channel->IsModeSet(this->GetModeChar()))
 	{
@@ -1161,7 +1177,9 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 		else
 		{
 			sprintf(moderemove,"-%c",this->GetModeChar());
-			ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
+			parameters.push_back(channel->name);
+			parameters.push_back(moderemove);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 		}
 	}
 }
@@ -1182,7 +1200,6 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 		new ModeChannelOp(Instance),
 		new ModeChannelHalfOp(Instance),
 		new ModeChannelVoice(Instance),
-		new ModeUserServerNotice(Instance),
 		new ModeUserWallops(Instance),
 		new ModeUserInvisible(Instance),
 		new ModeUserOperator(Instance),
@@ -1199,4 +1216,7 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 	/* Initialise the RFC mode letters */
 	for (int index = 0; modes[index]; index++)
 		this->AddMode(modes[index]);
+
+	seq = 0;
+	memset(&sent, 0, sizeof(sent));
 }