X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=4435b3324cb6205cfae8f3a538615b7a796d7f20;hb=bd12e3a4e6501496f6eeb7aeb5245162020d6e6c;hp=d917edb84b6bfd03f4a301594ba56ccd19091eb2;hpb=bd2782b9e80f10f91810fcc819bd6d77f1c991a0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index d917edb84..4435b3324 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,11 +11,10 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDchannels */
+/* $Core */
 
 #include "inspircd.h"
 #include <cstdarg>
-#include "wildcard.h"
 #include "mode.h"
 
 Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
@@ -26,12 +25,10 @@ Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : Serv
 
 	(*(ServerInstance->chanlist))[cname.c_str()] = this;
 	this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
-	this->created = ts ? ts : ServerInstance->Time();
-	this->age = this->created;
+	this->age = ts ? ts : ServerInstance->Time();
 
-
-	maxbans = topicset = limit = 0;
-	memset(&modes, 0, 64);
+	maxbans = topicset = 0;
+	modes.reset();
 }
 
 void Channel::SetMode(char mode,bool mode_on)
@@ -68,19 +65,61 @@ bool Channel::IsModeSet(char mode)
 
 std::string Channel::GetModeParameter(char mode)
 {
-	switch (mode)
+	CustomModeList::iterator n = custom_mode_params.find(mode);
+	if (n != custom_mode_params.end())
+		return n->second;
+	return "";
+}
+
+int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
+{
+	if (u && IS_LOCAL(u))
 	{
-		case 'k':
-			return this->key;
-		case 'l':
-			return ConvToStr(this->limit);
-		default:
-			CustomModeList::iterator n = custom_mode_params.find(mode);
-			if (n != custom_mode_params.end())
-				return n->second;
-			return "";
-		break;
+		if(!forceset)
+		{
+			int MOD_RESULT = 0;
+			/* 0: check status, 1: don't, -1: disallow change silently */
+
+			FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(u,this,ntopic));
+
+			if (MOD_RESULT == 1)
+				return CMD_FAILURE;
+			else if (MOD_RESULT == 0)
+			{
+				if (!this->HasUser(u))
+				{
+					u->WriteNumeric(442, "%s %s :You're not on that channel!",u->nick.c_str(), this->name.c_str());
+					return CMD_FAILURE;
+				}
+				if ((this->IsModeSet('t')) && (this->GetStatus(u) < STATUS_HOP))
+				{
+					u->WriteNumeric(482, "%s %s :You must be at least a half-operator to change the topic on this channel", u->nick.c_str(), this->name.c_str());
+					return CMD_FAILURE;
+				}
+			}
+		}
 	}
+
+	this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
+	if (u)
+	{
+		this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+		this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+	}
+	else
+	{
+		this->setby.assign(ServerInstance->Config->ServerName);
+		this->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+	}
+
+	this->topicset = ServerInstance->Time();
+
+	if (u && IS_LOCAL(u))
+	{
+		FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(u, this, this->topic));
+	}
+
+	return CMD_SUCCESS;
 }
 
 long Channel::GetUserCounter()
@@ -225,21 +264,22 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	 */
 	if (IS_LOCAL(user) && !override)
 	{
-		if (user->GetMaxChans())
+		// Checking MyClass exists because we *may* get here with NULL, not 100% sure.
+		if (user->MyClass && user->MyClass->GetMaxChans())
 		{
-			if (user->chans.size() >= user->GetMaxChans())
+			if (user->chans.size() >= user->MyClass->GetMaxChans())
 			{
-				user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 				return NULL;
 			}
 		}
 		else
 		{
-			if (IS_OPER(user))
+			if (user->HasPrivPermission("channels/high-join-limit"))
 			{
 				if (user->chans.size() >= Instance->Config->OperMaxChans)
 				{
-					user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+					user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 					return NULL;
 				}
 			}
@@ -247,7 +287,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			{
 				if (user->chans.size() >= Instance->Config->MaxChans)
 				{
-					user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+					user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 					return NULL;
 				}
 			}
@@ -256,6 +296,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 
 	strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
 	Ptr = Instance->FindChan(cname);
+	bool created_by_local = false;
 
 	if (!Ptr)
 	{
@@ -270,6 +311,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		else
 		{
 			privs = "@";
+			created_by_local = true;
 		}
 
 		if (IS_LOCAL(user) && override == false)
@@ -302,61 +344,81 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			}
 			else if (MOD_RESULT == 0)
 			{
-				if (!Ptr->key.empty())
+				std::string ckey = Ptr->GetModeParameter('k');
+				bool invited = user->IsInvited(Ptr->name.c_str());
+				bool can_bypass = Instance->Config->InvBypassModes && invited;
+
+				if (!ckey.empty())
 				{
 					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+					FOREACH_RESULT_I(Instance, I_OnCheckKey, OnCheckKey(user, Ptr, key ? key : ""));
 					if (!MOD_RESULT)
 					{
-						if ((!key) || Ptr->key == key)
+						// If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
+						if ((!key || ckey != key) && !can_bypass)
 						{
-							user->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), Ptr->name.c_str());
+							user->WriteNumeric(ERR_BADCHANNELKEY, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), Ptr->name.c_str());
 							return NULL;
 						}
 					}
 				}
+
 				if (Ptr->IsModeSet('i'))
 				{
 					MOD_RESULT = 0;
 					FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
 					if (!MOD_RESULT)
 					{
-						if (!user->IsInvited(Ptr->name.c_str()))
+						if (!invited)
 						{
-							user->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
+							user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
 							return NULL;
 						}
 					}
-					user->RemoveInvite(Ptr->name.c_str());
 				}
-				if (Ptr->limit)
+
+				std::string limit = Ptr->GetModeParameter('l');
+				if (!limit.empty())
 				{
 					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
+					FOREACH_RESULT_I(Instance, I_OnCheckLimit, OnCheckLimit(user, Ptr));
 					if (!MOD_RESULT)
 					{
-						if (Ptr->GetUserCounter() >= Ptr->limit)
+						long llimit = atol(limit.c_str());
+						if (Ptr->GetUserCounter() >= llimit && !can_bypass)
 						{
-							user->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str());
+							user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str());
 							return NULL;
 						}
 					}
 				}
+
 				if (Ptr->bans.size())
 				{
-					if (Ptr->IsBanned(user))
+					if (Ptr->IsBanned(user) && !can_bypass)
 					{
-						user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
+						user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
 						return NULL;
 					}
 				}
+
+				/*
+				 * If the user has invites for this channel, remove them now
+				 * after a successful join so they don't build up.
+				 */
+				if (invited)
+				{
+					user->RemoveInvite(Ptr->name.c_str());
+				}
 			}
 		}
 	}
 
-	/* As spotted by jilles, dont bother to set this on remote users */
-	if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0)
+	if (created_by_local)
+	{
+		/* As spotted by jilles, dont bother to set this on remote users */
 		Ptr->SetDefaultModes();
+	}
 
 	return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
 }
@@ -416,8 +478,8 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 	{
 		if (Ptr->topicset)
 		{
-			user->WriteNumeric(332, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
-			user->WriteNumeric(333, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
+			user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
+			user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
 		}
 		Ptr->UserList(user);
 	}
@@ -427,69 +489,78 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 
 bool Channel::IsBanned(User* user)
 {
-	char mask[MAXBUF];
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
+	int result = 0;
+	FOREACH_RESULT_MAP(I_OnCheckBan, OnCheckBan(user, this),
+		result = banmatch_reduce(result, MOD_RESULT);
+	);
+
+	if (result)
+		return (result < 0);
 
-	if (MOD_RESULT == -1)
-		return true;
-	else if (MOD_RESULT == 0)
+	char mask[MAXBUF];
+	snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
 	{
-		snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
-		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+		if ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host
+			(InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host
+			(InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip
 		{
-			/* This allows CIDR ban matching
-			 *
-			 *        Full masked host                      Full unmasked host                   IP with/without CIDR
-			 */
-			if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
-			{
-				return true;
-			}
+			return true;
 		}
 	}
 	return false;
 }
 
-bool Channel::IsExtBanned(User *user, char type)
+int Channel::GetExtBanStatus(const std::string &str, char type)
 {
-	char mask[MAXBUF];
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnCheckExtBan,OnCheckExtBan(user, this, type));
+	int result = 0;
+	FOREACH_RESULT_MAP(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type),
+		result = banmatch_reduce(result, MOD_RESULT);
+	);
 
-	if (MOD_RESULT == -1)
-		return true;
-	else if (MOD_RESULT == 0)
-	{
-		snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+	if (result)
+		return result;
 
-		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
-		{
-			if (i->data[0] != type || i->data[1] != ':')
-				continue;
+	// nobody decided for us, check the ban list
+	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+	{
+		if (i->data[0] != type || i->data[1] != ':')
+			continue;
 
-			// Iterate past char and : to get to the mask without doing a data copy(!)
-			std::string maskptr = i->data.substr(2);
+		std::string maskptr = i->data.substr(2);
+		ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
 
-			/* This allows CIDR ban matching
-			 *
-			 *        Full masked host                             Full unmasked host                     IP with/without CIDR
-		 	*/
-			if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
-			{
-				return true;
-			}
-		}
+		if (InspIRCd::Match(str, maskptr, NULL))
+			return -1;
 	}
 
-	return false;
+	return 0;
+}
+
+int Channel::GetExtBanStatus(User *user, char type)
+{
+	int result = 0;
+	FOREACH_RESULT_MAP(I_OnCheckExtBan, OnCheckExtBan(user, this, type),
+		result = banmatch_reduce(result, MOD_RESULT);
+	);
+
+	if (result)
+		return result;
+
+	char mask[MAXBUF];
+	int rv = 0;
+	snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+
+	// XXX: we should probably hook cloaked hosts in here somehow too..
+	rv = banmatch_reduce(rv, this->GetExtBanStatus(mask, type));
+	rv = banmatch_reduce(rv, this->GetExtBanStatus(user->GetFullHost(), type));
+	rv = banmatch_reduce(rv, this->GetExtBanStatus(user->GetFullRealHost(), type));
+	return rv;
 }
 
 /* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
  * Therefore, if this function returns 0 the caller should delete the Channel.
- *
- * XXX: bleh, string copy of reason, fixme! -- w00t
  */
 long Channel::PartUser(User *user, std::string &reason)
 {
@@ -504,7 +575,7 @@ long Channel::PartUser(User *user, std::string &reason)
 		FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent));
 
 		if (!silent)
-			this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : ":", reason.c_str());
+			this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);
@@ -593,12 +664,12 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 	{
 		if (!this->HasUser(user))
 		{
-			src->WriteNumeric(441, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str());
+			src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str());
 			return this->GetUserCounter();
 		}
 		if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
 		{
-			src->WriteNumeric(482, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick.c_str(), this->name.c_str());
+			src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick.c_str(), this->name.c_str());
 			return this->GetUserCounter();
 		}
 		int MOD_RESULT = 0;
@@ -623,7 +694,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 				int us = this->GetStatus(user);
    			 	if ((them < STATUS_HOP) || (them < us))
 				{
-					src->WriteNumeric(482, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them == STATUS_HOP ? "" : "half-");
+					src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them == STATUS_HOP ? "" : "half-");
 					return this->GetUserCounter();
 				}
 			}
@@ -827,11 +898,16 @@ char* Channel::ChanModes(bool showkey)
 			switch (n)
 			{
 				case CM_KEY:
-					extparam = (showkey ? this->key : "<key>");
-				break;
-				case CM_LIMIT:
-					extparam = ConvToStr(this->limit);
-				break;
+					// Unfortunately this must be special-cased, as we definitely don't want to always display key.
+					if (showkey)
+					{
+						extparam = this->GetModeParameter('k');
+					}
+					else
+					{
+						extparam = "<key>";
+					}
+					break;
 				case CM_NOEXTERNAL:
 				case CM_TOPICLOCK:
 				case CM_INVITEONLY:
@@ -879,7 +955,7 @@ void Channel::UserList(User *user, CUList *ulist)
 	{
 		if ((this->IsModeSet('s')) && (!this->HasUser(user)))
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
 			return;
 		}
 	}
@@ -928,7 +1004,7 @@ void Channel::UserList(User *user, CUList *ulist)
 		if (curlen + prefixlist.length() + nick.length() + 1 > 480)
 		{
 			/* list overflowed into multiple numerics */
-			user->WriteServ(std::string(list));
+			user->WriteNumeric(RPL_NAMREPLY, std::string(list));
 
 			/* reset our lengths */
 			dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name.c_str());
@@ -949,10 +1025,10 @@ void Channel::UserList(User *user, CUList *ulist)
 	/* if whats left in the list isnt empty, send it */
 	if (numusers)
 	{
-		user->WriteNumeric(353,std::string(list));
+		user->WriteNumeric(RPL_NAMREPLY, std::string(list));
 	}
 
-	user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
+	user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
 }
 
 long Channel::GetMaxBans()
@@ -964,7 +1040,7 @@ long Channel::GetMaxBans()
 	/* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */
 	for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
 	{
-		if (match(this->name,n->first))
+		if (InspIRCd::Match(this->name, n->first, NULL))
 		{
 			this->maxbans = n->second;
 			return n->second;
@@ -1120,4 +1196,3 @@ void Channel::RemoveAllPrefixes(User* user)
 		prefixes.erase(n);
 	}
 }
-