-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
*
- * ---------------------------------------------------
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-using namespace std;
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
-/* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
+struct CustomVhost
+{
+ const std::string name;
+ const std::string password;
+ const std::string hash;
+ const std::string vhost;
+
+ CustomVhost(const std::string& n, const std::string& p, const std::string& h, const std::string& v)
+ : name(n)
+ , password(p)
+ , hash(h)
+ , vhost(v)
+ {
+ }
-static ConfigReader *Conf;
+ bool CheckPass(User* user, const std::string& pass) const
+ {
+ return ServerInstance->PassCompare(user, password, pass, hash);
+ }
+};
+typedef std::multimap<std::string, CustomVhost> CustomVhostMap;
+typedef std::pair<CustomVhostMap::iterator, CustomVhostMap::iterator> MatchingConfigs;
-class cmd_vhost : public command_t
+/** Handle /VHOST
+ */
+class CommandVhost : public Command
{
public:
- cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2)
+ CustomVhostMap vhosts;
+
+ CommandVhost(Module* Creator)
+ : Command(Creator, "VHOST", 2)
{
- this->source = "m_vhost.so";
syntax = "<username> <password>";
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
- for (int index = 0; index < Conf->Enumerate("vhost"); index++)
+ MatchingConfigs matching = vhosts.equal_range(parameters[0]);
+
+ for (MatchingConfigs::first_type i = matching.first; i != matching.second; ++i)
{
- std::string mask = Conf->ReadValue("vhost","host",index);
- std::string username = Conf->ReadValue("vhost","user",index);
- std::string pass = Conf->ReadValue("vhost","pass",index);
- if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
+ CustomVhost config = i->second;
+ if (config.CheckPass(user, parameters[1]))
{
- if (mask != "")
- {
- user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
- user->ChangeDisplayedHost(mask.c_str());
- return CMD_FAILURE;
- }
+ user->WriteNotice("Setting your VHost: " + config.vhost);
+ user->ChangeDisplayedHost(config.vhost);
+ return CMD_SUCCESS;
}
}
- user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+
+ user->WriteNotice("Invalid username or password.");
return CMD_FAILURE;
}
};
class ModuleVHost : public Module
{
- private:
+ CommandVhost cmd;
- cmd_vhost* mycommand;
-
public:
- ModuleVHost(InspIRCd* Me) : Module::Module(Me)
- {
-
- Conf = new ConfigReader(ServerInstance);
- mycommand = new cmd_vhost(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- }
-
- virtual ~ModuleVHost()
+ ModuleVHost()
+ : cmd(this)
{
- DELETE(Conf);
}
- void Implements(char* List)
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- List[I_OnRehash] = 1;
- }
+ CustomVhostMap newhosts;
+ ConfigTagList tags = ServerInstance->Config->ConfTags("vhost");
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
+ {
+ ConfigTag* tag = i->second;
+ std::string mask = tag->getString("host");
+ if (mask.empty())
+ throw ModuleException("<vhost:host> is empty! at " + tag->getTagLocation());
- virtual void OnRehash(const std::string ¶meter)
- {
- DELETE(Conf);
- Conf = new ConfigReader(ServerInstance);
- }
-
- virtual Version GetVersion()
- {
- return Version(1,0,0,1,VF_VENDOR,API_VERSION);
- }
-
-};
+ std::string username = tag->getString("user");
+ if (username.empty())
+ throw ModuleException("<vhost:user> is empty! at " + tag->getTagLocation());
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+ std::string pass = tag->getString("pass");
+ if (pass.empty())
+ throw ModuleException("<vhost:pass> is empty! at " + tag->getTagLocation());
-class ModuleVHostFactory : public ModuleFactory
-{
- public:
- ModuleVHostFactory()
- {
- }
-
- ~ModuleVHostFactory()
- {
+ const std::string hash = tag->getString("hash", "plaintext", 1);
+ if (stdalgo::string::equalsci(hash, "plaintext"))
+ {
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "<vhost> tag for %s at %s contains an plain text password, this is insecure!",
+ username.c_str(), tag->getTagLocation().c_str());
+ }
+
+ CustomVhost vhost(username, pass, hash, mask);
+ newhosts.insert(std::make_pair(username, vhost));
+ }
+
+ cmd.vhosts.swap(newhosts);
}
-
- virtual Module * CreateModule(InspIRCd* Me)
+
+ Version GetVersion() CXX11_OVERRIDE
{
- return new ModuleVHost(Me);
+ return Version("Allows the server administrator to define accounts which can grant a custom virtual host.", VF_VENDOR);
}
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleVHostFactory;
-}
-
+MODULE_INIT(ModuleVHost)
projects / user / henk / code / inspircd.git / blobdiff