X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=01a973deae90a7b444736f0572cdc25b78377a8b;hb=46f89e12959945a94f6ad81265351600badca723;hp=26e625cee70bc814f253d83170dadeadc85d3e1d;hpb=54c49b40f74d5658a6a7b060c7bd306cd085de1a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 26e625cee..01a973dea 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -16,7 +16,6 @@ #include "inspircd.h" #include #include "socketengine.h" -#include "wildcard.h" #include "xline.h" #include "bancache.h" #include "commands/cmd_whowas.h" @@ -100,6 +99,7 @@ void User::StartDNSLookup() { bool cached = false; const char* sip = this->GetIPString(false); + UserResolver *res_reverse; /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */ if (!strncmp(sip, "0::ffff:", 8)) @@ -117,11 +117,15 @@ void User::StartDNSLookup() bool User::IsNoticeMaskSet(unsigned char sm) { + if (!isalpha(sm)) + return false; return (snomasks[sm-65]); } void User::SetNoticeMask(unsigned char sm, bool value) { + if (!isalpha(sm)) + return; snomasks[sm-65] = value; } @@ -140,28 +144,42 @@ const char* User::FormatNoticeMasks() return data; } - - bool User::IsModeSet(unsigned char m) { + if (!isalpha(m)) + return false; return (modes[m-65]); } void User::SetMode(unsigned char m, bool value) { + if (!isalpha(m)) + return; modes[m-65] = value; } -const char* User::FormatModes() +const char* User::FormatModes(bool showparameters) { static char data[MAXBUF]; + std::string params; int offset = 0; - for (int n = 0; n < 64; n++) + + for (unsigned char n = 0; n < 64; n++) { if (modes[n]) - data[offset++] = n+65; + { + data[offset++] = n + 65; + ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER); + if (showparameters && mh && mh->GetNumParams(true)) + { + std::string p = mh->GetUserParameter(this); + if (p.length()) + params.append(" ").append(p); + } + } } data[offset] = 0; + strlcat(data, params.c_str(), MAXBUF); return data; } @@ -195,11 +213,9 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance fd = -1; recvq.clear(); sendq.clear(); - res_forward = res_reverse = NULL; Visibility = NULL; ip = NULL; MyClass = NULL; - io = NULL; AllowedUserModes = NULL; AllowedChanModes = NULL; AllowedOperCommands = NULL; @@ -439,8 +455,9 @@ void User::InviteTo(const irc::string &channel, time_t invtimeout) if (i->second != 0 && invtimeout > i->second) { i->second = invtimeout; - return; } + + return; } } invites.push_back(std::make_pair(channel, invtimeout)); @@ -695,101 +712,104 @@ void User::Oper(const std::string &opertype, const std::string &opername) char* savept; char* savept2; - try - { - this->modes[UM_OPERATOR] = 1; - this->WriteServ("MODE %s :+o", this->nick.c_str()); - FOREACH_MOD(I_OnOper, OnOper(this, opertype)); - ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str()); - this->oper.assign(opertype, 0, 512); - ServerInstance->Users->all_opers.push_back(this); + if (this->IsModeSet('o')) + this->UnOper(); - opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str()); - if (iter_opertype != ServerInstance->Config->opertypes.end()) - { + this->modes[UM_OPERATOR] = 1; + this->WriteServ("MODE %s :+o", this->nick.c_str()); + FOREACH_MOD(I_OnOper, OnOper(this, opertype)); - if (AllowedOperCommands) - AllowedOperCommands->clear(); - else - AllowedOperCommands = new std::map; + ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), irc::Spacify(opertype.c_str()), opername.c_str()); + this->WriteNumeric(381, "%s :You are now %s %s", this->nick.c_str(), strchr("aeiouAEIOU", *opertype.c_str()) ? "an" : "a", irc::Spacify(opertype.c_str())); - if (!AllowedChanModes) - AllowedChanModes = new bool[64]; + ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str()); + this->oper.assign(opertype, 0, 512); + ServerInstance->Users->all_opers.push_back(this); - if (!AllowedUserModes) - AllowedUserModes = new bool[64]; + opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str()); + if (iter_opertype != ServerInstance->Config->opertypes.end()) + { - memset(AllowedUserModes, 0, 64); - memset(AllowedChanModes, 0, 64); + if (AllowedOperCommands) + AllowedOperCommands->clear(); + else + AllowedOperCommands = new std::map; + + if (!AllowedChanModes) + AllowedChanModes = new bool[64]; - char* Classes = strdup(iter_opertype->second); - char* myclass = strtok_r(Classes," ",&savept); - while (myclass) + if (!AllowedUserModes) + AllowedUserModes = new bool[64]; + + memset(AllowedUserModes, 0, 64); + memset(AllowedChanModes, 0, 64); + + char* Classes = strdup(iter_opertype->second); + char* myclass = strtok_r(Classes," ",&savept); + while (myclass) + { + operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass); + if (iter_operclass != ServerInstance->Config->operclass.end()) { - operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass); - if (iter_operclass != ServerInstance->Config->operclass.end()) + char* CommandList = strdup(iter_operclass->second.commandlist); + mycmd = strtok_r(CommandList," ",&savept2); + while (mycmd) { - char* CommandList = strdup(iter_operclass->second.commandlist); - mycmd = strtok_r(CommandList," ",&savept2); - while (mycmd) + this->AllowedOperCommands->insert(std::make_pair(mycmd, true)); + mycmd = strtok_r(NULL," ",&savept2); + } + free(CommandList); + this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. + for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c) + { + if (*c == '*') { - this->AllowedOperCommands->insert(std::make_pair(mycmd, true)); - mycmd = strtok_r(NULL," ",&savept2); + memset(this->AllowedUserModes, (int)(true), 64); } - free(CommandList); - this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. - for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c) + else { - if (*c == '*') - { - memset(this->AllowedUserModes, (int)(true), 64); - } - else - { - this->AllowedUserModes[*c - 'A'] = true; - } + this->AllowedUserModes[*c - 'A'] = true; } - for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c) + } + for (unsigned char* c = (unsigned char*)iter_operclass->second.cmodelist; *c; ++c) + { + if (*c == '*') { - if (*c == '*') - { - memset(this->AllowedChanModes, (int)(true), 64); - } - else - { - this->AllowedChanModes[*c - 'A'] = true; - } + memset(this->AllowedChanModes, (int)(true), 64); + } + else + { + this->AllowedChanModes[*c - 'A'] = true; } } - myclass = strtok_r(NULL," ",&savept); } - free(Classes); + myclass = strtok_r(NULL," ",&savept); } - - FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername)); + free(Classes); } - catch (...) - { - ServerInstance->Logs->Log("OPER", DEBUG,"Exception in User::Oper()"); - } + FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername)); } void User::UnOper() { if (IS_OPER(this)) { + /* + * unset their oper type (what IS_OPER checks). + * note, order is important - this must come before modes as -o attempts + * to call UnOper. -- w00t + */ + this->oper.clear(); + /* Remove all oper only modes from the user when the deoper - Bug #466*/ std::string moderemove("-"); for (unsigned char letter = 'A'; letter <= 'z'; letter++) { - if (letter != 'o') - { - ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER); - if (mh && mh->NeedsOper()) - moderemove += letter; - } + ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_USER); + if (mh && mh->NeedsOper()) + moderemove += letter; } std::vector parameters; @@ -797,10 +817,6 @@ void User::UnOper() parameters.push_back(moderemove); ServerInstance->Parser->CallHandler("MODE", parameters, this); - - /* unset their oper type (what IS_OPER checks), and remove +o */ - this->oper.clear(); - this->modes[UM_OPERATOR] = 0; /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */ ServerInstance->Users->all_opers.remove(this); @@ -1263,14 +1279,14 @@ void User::Write(std::string text) return; } - if (this->io) + if (this->GetIOHook()) { /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to * implement their own buffering mechanisms */ try { - this->io->OnRawSocketWrite(this->fd, text.data(), text.length()); + this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length()); } catch (CoreException& modexcept) { @@ -1810,7 +1826,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) } /* check if host matches.. */ - if (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost())))) + if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && + !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL)) { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str()); continue;