X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ldapoper.cpp;h=4304ad8d5bf4caed4b61f359f37c72d606a5839b;hb=1bf7ca389426e196697eba9a8b60277db03fbedb;hp=9bfa3971f225225ecdf1e73048cb11fcd3b8a585;hpb=a4f222ee1b05e2fdb2744c1694f9140f8099b009;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp
index 9bfa3971f..4304ad8d5 100644
--- a/src/modules/m_ldapoper.cpp
+++ b/src/modules/m_ldapoper.cpp
@@ -1,11 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Adam <Adam@anope.org>
- *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Carsten Valdemar Munk <carsten.munk+inspircd@gmail.com>
+ *   Copyright (C) 2020 Christos Triantafyllidis <ctria@users.noreply.github.com>
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013-2014 Adam <Adam@anope.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
@@ -41,14 +40,15 @@ class LDAPOperBase : public LDAPInterface
 		if (!user)
 			return;
 
-		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
+		Command* oper_command = ServerInstance->Parser.GetHandler("OPER");
 		if (!oper_command)
 			return;
 
-		std::vector<std::string> params;
+		CommandBase::Params params;
 		params.push_back(opername);
 		params.push_back(password);
-		oper_command->Handle(params, user);
+		ClientProtocol::TagMap tags;
+		oper_command->Handle(user, CommandBase::Params(params, tags));
 	}
 
 	void Fallback()
@@ -83,7 +83,7 @@ class BindInterface : public LDAPOperBase
 	void OnResult(const LDAPResult& r) CXX11_OVERRIDE
 	{
 		User* user = ServerInstance->FindUUID(uid);
-		OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(opername);
+		ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->oper_blocks.find(opername);
 
 		if (!user || iter == ServerInstance->Config->oper_blocks.end())
 		{
@@ -151,7 +151,13 @@ class AdminBindInterface : public LDAPInterface
 
  public:
 	AdminBindInterface(Module* c, const std::string& p, const std::string& u, const std::string& o, const std::string& pa, const std::string& b, const std::string& w)
-		: LDAPInterface(c), provider(p), user(u), opername(p), password(pa), base(b), what(w)
+		: LDAPInterface(c)
+		, provider(p)
+		, user(u)
+		, opername(o)
+		, password(pa)
+		, base(b)
+		, what(w)
 	{
 	}
 
@@ -179,14 +185,14 @@ class AdminBindInterface : public LDAPInterface
 	}
 };
 
-class ModuleLDAPAuth : public Module
+class ModuleLDAPOper : public Module
 {
 	dynamic_reference<LDAPProvider> LDAP;
 	std::string base;
 	std::string attribute;
 
  public:
-	ModuleLDAPAuth()
+	ModuleLDAPOper()
 		: LDAP(this, "LDAP")
 	{
 		me = this;
@@ -201,14 +207,14 @@ class ModuleLDAPAuth : public Module
 		attribute = tag->getString("attribute");
 	}
 
-	ModResult OnPreCommand(std::string& command, std::vector<std::string>& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
 		if (validated && command == "OPER" && parameters.size() >= 2)
 		{
 			const std::string& opername = parameters[0];
 			const std::string& password = parameters[1];
 
-			OperIndex::iterator it = ServerInstance->Config->oper_blocks.find(opername);
+			ServerConfig::OperIndex::const_iterator it = ServerInstance->Config->oper_blocks.find(opername);
 			if (it == ServerInstance->Config->oper_blocks.end())
 				return MOD_RES_PASSTHRU;
 
@@ -217,8 +223,7 @@ class ModuleLDAPAuth : public Module
 				return MOD_RES_PASSTHRU;
 
 			std::string acceptedhosts = tag->getString("host");
-			std::string hostname = user->ident + "@" + user->host;
-			if (!InspIRCd::MatchMask(acceptedhosts, hostname, user->GetIPString()))
+			if (!InspIRCd::MatchMask(acceptedhosts, user->MakeHost(), user->MakeHostIP()))
 				return MOD_RES_PASSTHRU;
 
 			if (!LDAP)
@@ -241,8 +246,8 @@ class ModuleLDAPAuth : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Adds the ability to authenticate opers via LDAP", VF_VENDOR);
+		return Version("Allows server operators to be authenticated against an LDAP database.", VF_VENDOR);
 	}
 };
 
-MODULE_INIT(ModuleLDAPAuth)
+MODULE_INIT(ModuleLDAPOper)