Sync helpop chmodes s and p with docs

[user/henk/code/inspircd.git] / src / modules / m_vhost.cpp

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 53910fdbe5c6f65e14f82fd76feb7ecda9fe7b5f..dddf1f29361fe2708514eec1e0eed48faceb111a 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   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-2007 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
+ *   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
@@ -22,35 +26,55 @@
 
 #include "inspircd.h"
 
+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)
+       {
+       }
+
+       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;
+
 /** Handle /VHOST
  */
 class CommandVhost : public Command
 {
  public:
-       CommandVhost(Module* Creator) : Command(Creator,"VHOST", 2)
+       CustomVhostMap vhosts;
+
+       CommandVhost(Module* Creator)
+               : Command(Creator, "VHOST", 2)
        {
                syntax = "<username> <password>";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               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");
-                       std::string username = tag->getString("user");
-                       std::string pass = tag->getString("pass");
-                       std::string hash = tag->getString("hash");
+               MatchingConfigs matching = vhosts.equal_range(parameters[0]);
 
-                       if (parameters[0] == username && ServerInstance->PassCompare(user, pass, parameters[1], hash))
+               for (MatchingConfigs::first_type i = matching.first; i != matching.second; ++i)
+               {
+                       CustomVhost config = i->second;
+                       if (config.CheckPass(user, parameters[1]))
                        {
-                               if (!mask.empty())
-                               {
-                                       user->WriteNotice("Setting your VHost: " + mask);
-                                       user->ChangeDisplayedHost(mask);
-                                       return CMD_SUCCESS;
-                               }
+                               user->WriteNotice("Setting your VHost: " + config.vhost);
+                               user->ChangeDisplayedHost(config.vhost);
+                               return CMD_SUCCESS;
                        }
                }
 
@@ -64,13 +88,47 @@ class ModuleVHost : public Module
        CommandVhost cmd;
 
  public:
-       ModuleVHost() : cmd(this)
+       ModuleVHost()
+               : cmd(this)
        {
        }
 
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               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());
+
+                       std::string username = tag->getString("user");
+                       if (username.empty())
+                               throw ModuleException("<vhost:user> is empty! at " + tag->getTagLocation());
+
+                       std::string pass = tag->getString("pass");
+                       if (pass.empty())
+                               throw ModuleException("<vhost:pass> is empty! at " + tag->getTagLocation());
+
+                       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);
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
+               return Version("Allows the server administrator to define accounts which can grant a custom virtual host.", VF_VENDOR);
        }
 };