X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=b653096b24566361685e7acafe391a4362bbf1db;hb=6b929c6dbb3d36c3873ab9911ad4d8a46ddbdc99;hp=28a583c801cd8bb4a71ce54f012bdfd8e6e2fb58;hpb=dce58b1611e275118d418bfb3b4402bd14d279dd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 28a583c80..b653096b2 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -1,32 +1,49 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * 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/>.
  */
 
+
 #include "inspircd.h"
 #include "m_cap.h"
 #include "account.h"
+#include "sasl.h"
 
 /* $ModDesc: Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE. */
 
 enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE };
 enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 
+static std::string sasl_target = "*";
+
+static void SendSASL(const parameterlist& params)
+{
+	if (!ServerInstance->PI->SendEncapsulatedData(params))
+	{
+		SASLFallback(NULL, params);
+	}
+}
+
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
 class SaslAuthenticator
 {
  private:
-	InspIRCd *ServerInstance;
 	std::string agent;
 	User *user;
 	SaslState state;
@@ -38,14 +55,14 @@ class SaslAuthenticator
 		: user(user_), state(SASL_INIT), state_announced(false)
 	{
 		parameterlist params;
-		params.push_back("*");
+		params.push_back(sasl_target);
 		params.push_back("SASL");
 		params.push_back(user->uuid);
 		params.push_back("*");
 		params.push_back("S");
 		params.push_back(method);
 
-		ServerInstance->PI->SendEncapsulatedData(params);
+		SendSASL(params);
 	}
 
 	SaslResult GetSaslResult(const std::string &result_)
@@ -104,7 +121,7 @@ class SaslAuthenticator
 			return true;
 
 		parameterlist params;
-		params.push_back("*");
+		params.push_back(sasl_target);
 		params.push_back("SASL");
 		params.push_back(this->user->uuid);
 		params.push_back(this->agent);
@@ -112,7 +129,7 @@ class SaslAuthenticator
 
 		params.insert(params.end(), parameters.begin(), parameters.end());
 
-		ServerInstance->PI->SendEncapsulatedData(params);
+		SendSASL(params);
 
 		if (parameters[0][0] == '*')
 		{
@@ -226,8 +243,13 @@ class ModuleSASL : public Module
 	ModuleSASL()
 		: authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
 	{
-		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
+
+	void init()
+	{
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 
 		ServiceProvider* providelist[] = { &auth, &sasl, &authExt };
 		ServerInstance->Modules->AddServices(providelist, 3);
@@ -236,6 +258,11 @@ class ModuleSASL : public Module
 			ServerInstance->Logs->Log("m_sasl", DEFAULT, "WARNING: m_services_account.so and m_cap.so are not loaded! m_sasl.so will NOT function correctly until these two modules are loaded!");
 	}
 
+	void OnRehash(User*)
+	{
+		sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*");
+	}
+
 	ModResult OnUserRegister(LocalUser *user)
 	{
 		SaslAuthenticator *sasl_ = authExt.get(user);
@@ -248,10 +275,6 @@ class ModuleSASL : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleSASL()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR);