X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fusers.cpp;h=bd7d046b8b9e7d6db909e536603229064039d5e7;hb=dd8679b086c568f37daa1d746a972236938206ca;hp=01bad8b619bce48edbfc179b25eaf208fcafa199;hpb=d0f802e30c492cb1b7e55f51063bfd38b29931c6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index 01bad8b61..bd7d046b8 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1,13 +1,25 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2006-2009 Robin Burchell - * Copyright (C) 2006-2007, 2009 Dennis Friis - * Copyright (C) 2008 John Brooks + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2018 systocrat + * Copyright (C) 2018 Dylan Frank + * Copyright (C) 2014 satmd + * Copyright (C) 2013-2014, 2016-2019 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2013 ChrisTX + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2016, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 DjSlash + * Copyright (C) 2011 jackmcbarn + * Copyright (C) 2009-2011 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2008 Thomas Stagner - * Copyright (C) 2008 Oliver Lupton - * Copyright (C) 2003-2008 Craig Edwards + * Copyright (C) 2008 John Brooks + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2006-2009 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -78,6 +90,9 @@ User::User(const std::string& uid, Server* srv, UserType type) ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str()); + if (srv->IsULine()) + ServerInstance->Users.all_ulines.push_back(this); + // Do not insert FakeUsers into the uuidlist so FindUUID() won't return them which is the desired behavior if (type != USERTYPE_SERVER) { @@ -112,8 +127,8 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so ChangeRealHost(GetIPString(), true); } -LocalUser::LocalUser(int myfd, const std::string& uuid, Serializable::Data& data) - : User(uuid, ServerInstance->FakeClient->server, USERTYPE_LOCAL) +LocalUser::LocalUser(int myfd, const std::string& uid, Serializable::Data& data) + : User(uid, ServerInstance->FakeClient->server, USERTYPE_LOCAL) , eh(this) , already_sent(0) { @@ -214,6 +229,19 @@ bool LocalUser::HasPrivPermission(const std::string& privstr) return oper->AllowedPrivs.Contains(privstr); } +bool User::HasSnomaskPermission(char chr) const +{ + return true; +} + +bool LocalUser::HasSnomaskPermission(char chr) const +{ + if (!this->IsOper() || !ModeParser::IsModeChar(chr)) + return false; + + return this->oper->AllowedSnomasks[chr - 'A']; +} + void UserIOHandler::OnDataReady() { if (user->quitting) @@ -339,6 +367,9 @@ CullResult User::cull() if (client_sa.family() != AF_UNSPEC) ServerInstance->Users->RemoveCloneCounts(this); + if (server->IsULine()) + stdalgo::erase(ServerInstance->Users->all_ulines, this); + return Extensible::cull(); } @@ -401,6 +432,7 @@ void OperInfo::init() AllowedPrivs.Clear(); AllowedUserModes.reset(); AllowedChanModes.reset(); + AllowedSnomasks.reset(); AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want. for(std::vector >::iterator iter = class_blocks.begin(); iter != class_blocks.end(); ++iter) @@ -410,30 +442,34 @@ void OperInfo::init() AllowedOperCommands.AddList(tag->getString("commands")); AllowedPrivs.AddList(tag->getString("privs")); - std::string modes = tag->getString("usermodes"); - for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c) + const std::string umodes = tag->getString("usermodes"); + for (std::string::const_iterator c = umodes.begin(); c != umodes.end(); ++c) { - if (*c == '*') - { + const char& chr = *c; + if (chr == '*') this->AllowedUserModes.set(); - } - else if (*c >= 'A' && *c <= 'z') - { - this->AllowedUserModes[*c - 'A'] = true; - } + else if (ModeParser::IsModeChar(chr)) + this->AllowedUserModes[chr - 'A'] = true; } - modes = tag->getString("chanmodes"); - for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c) + const std::string cmodes = tag->getString("chanmodes"); + for (std::string::const_iterator c = cmodes.begin(); c != cmodes.end(); ++c) { - if (*c == '*') - { + const char& chr = *c; + if (chr == '*') this->AllowedChanModes.set(); - } - else if (*c >= 'A' && *c <= 'z') - { - this->AllowedChanModes[*c - 'A'] = true; - } + else if (ModeParser::IsModeChar(chr)) + this->AllowedChanModes[chr - 'A'] = true; + } + + const std::string snomasks = tag->getString("snomasks", "*"); + for (std::string::const_iterator c = snomasks.begin(); c != snomasks.end(); ++c) + { + const char& chr = *c; + if (chr == '*') + this->AllowedSnomasks.set(); + else if (ModeParser::IsModeChar(chr)) + this->AllowedSnomasks[chr - 'A'] = true; } } } @@ -490,7 +526,7 @@ void LocalUser::CheckClass(bool clone_count) } else if (a->type == CC_DENY) { - ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection")); + ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection", 1)); return; } else if (clone_count) @@ -758,17 +794,16 @@ void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa) return; ServerInstance->Users->RemoveCloneCounts(this); - User::SetClientIP(sa); - - FOREACH_MOD(OnSetUserIP, (this)); - ServerInstance->Users->AddClone(this); // Recheck the connect class. this->MyClass = NULL; this->SetClass(); this->CheckClass(); + + if (!quitting) + FOREACH_MOD(OnSetUserIP, (this)); } void LocalUser::Write(const ClientProtocol::SerializedMessage& text) @@ -854,7 +889,7 @@ void User::WriteNumeric(const Numeric::Numeric& numeric) void User::WriteRemoteNotice(const std::string& text) { - ServerInstance->PI->SendUserNotice(this, text); + ServerInstance->PI->SendMessage(this, text, MSG_NOTICE); } void LocalUser::WriteRemoteNotice(const std::string& text) @@ -1138,9 +1173,9 @@ void LocalUser::SetClass(const std::string &explicit_name) } } - if (regdone && !c->config->getString("password").empty()) + if (regdone && !c->password.empty()) { - if (!ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash"))) + if (!ServerInstance->PassCompare(this, c->password, password, c->passwordhash)) { ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Bad password, skipping"); continue; @@ -1198,10 +1233,24 @@ const std::string& FakeUser::GetFullRealHost() } ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask) - : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask), - pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0), - penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(ServerInstance->Config->MaxChans), - limit(0), resolvehostnames(true) + : config(tag) + , type(t) + , fakelag(true) + , name("unnamed") + , registration_timeout(0) + , host(mask) + , pingtime(0) + , softsendqmax(0) + , hardsendqmax(0) + , recvqmax(0) + , penaltythreshold(0) + , commandrate(0) + , maxlocal(0) + , maxglobal(0) + , maxconnwarn(true) + , maxchans(0) + , limit(0) + , resolvehostnames(true) { } @@ -1259,4 +1308,6 @@ void ConnectClass::Update(const ConnectClass* src) limit = src->limit; resolvehostnames = src->resolvehostnames; ports = src->ports; + password = src->password; + passwordhash = src->passwordhash; }