X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=7374f091e80997f1abbe9d6939b5abfd90a7a3ab;hb=c6a3d4bafc70dc9bd99b9da37c4b12a5324d4e0f;hp=b9bc4992c6014d50107dfc462c63d1183d3dd1d9;hpb=4f7d99c193420035b8b75d075dd458df535d5bda;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index b9bc4992c..7374f091e 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -11,11 +11,10 @@ * --------------------------------------------------- */ -/* $Core: libIRCDchannels */ +/* $Core */ #include "inspircd.h" #include -#include "wildcard.h" #include "mode.h" Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance) @@ -29,9 +28,8 @@ Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : Serv this->created = ts ? ts : ServerInstance->Time(); this->age = this->created; - - maxbans = topicset = limit = 0; - memset(&modes, 0, 64); + maxbans = topicset = 0; + modes.reset(); } void Channel::SetMode(char mode,bool mode_on) @@ -68,19 +66,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)) + { + 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 { - 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; + 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,9 +265,10 @@ 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(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn); return NULL; @@ -235,7 +276,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool } else { - if (IS_OPER(user)) + if (user->HasPrivPermission("channels/high-join-limit")) { if (user->chans.size() >= Instance->Config->OperMaxChans) { @@ -302,54 +343,72 @@ 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(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(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(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(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()); + } } } } @@ -362,7 +421,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool } Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting) -{ +{ std::string nick = user->nick; bool silent = false; @@ -438,11 +497,9 @@ bool Channel::IsBanned(User* user) 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++) { - /* 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))) + 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 { return true; } @@ -469,7 +526,7 @@ bool Channel::IsExtBanned(const std::string &str, char type) 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); - if (match(str, maskptr)) + if (InspIRCd::Match(str, maskptr, NULL)) return true; } } @@ -506,8 +563,6 @@ bool Channel::IsExtBanned(User *user, char type) /* 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) { @@ -522,7 +577,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); @@ -845,11 +900,16 @@ char* Channel::ChanModes(bool showkey) switch (n) { case CM_KEY: - extparam = (showkey ? this->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 = ""; + } + break; case CM_NOEXTERNAL: case CM_TOPICLOCK: case CM_INVITEONLY: @@ -946,7 +1006,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()); @@ -982,7 +1042,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::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;