X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslinfo.cpp;h=083ac0f0448486a212bfc53ad61adfc57a3389ed;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=3bc94bbaa2f37c0f5b27e073426e37ba32b702f9;hpb=5d9609ea474dc577824dd921288dee83a4f01077;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 3bc94bbaa..083ac0f04 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | 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>
  *
- * 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 "ssl.h"
 
@@ -83,9 +89,9 @@ class CommandSSLInfo : public Command
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		User* target = ServerInstance->FindNick(parameters[0]);
+		User* target = ServerInstance->FindNickOnly(parameters[0]);
 
-		if (!target)
+		if ((!target) || (target->registered != REG_ALL))
 		{
 			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
@@ -126,12 +132,12 @@ class ModuleSSLInfo : public Module
 
 	void init()
 	{
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 
-		ServerInstance->Extensions.Register(&cmd.CertExt);
+		ServerInstance->Modules->AddService(cmd.CertExt);
 
-		Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect, I_OnPostConnect };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion()
@@ -168,14 +174,15 @@ class ModuleSSLInfo : public Module
 
 	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
-		irc::string pcmd = command.c_str();
-
-		if ((pcmd == "OPER") && (validated))
+		if ((command == "OPER") && (validated))
 		{
 			OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]);
 			if (i != ServerInstance->Config->oper_blocks.end())
 			{
 				OperInfo* ifo = i->second;
+				if (!ifo->oper_block)
+					return MOD_RES_PASSTHRU;
+
 				ssl_cert* cert = cmd.CertExt.get(user);
 
 				if (ifo->oper_block->getBool("sslonly") && !cert)
@@ -205,14 +212,22 @@ class ModuleSSLInfo : public Module
 		if (!req.cert)
 			return;
 		cmd.CertExt.set(user, req.cert);
-		if (req.cert->fingerprint.empty())
+	}
+
+	void OnPostConnect(User* user)
+	{
+		ssl_cert *cert = cmd.CertExt.get(user);
+		if (!cert || cert->fingerprint.empty())
 			return;
 		// find an auto-oper block for this user
 		for(OperIndex::iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); i++)
 		{
 			OperInfo* ifo = i->second;
+			if (!ifo->oper_block)
+				continue;
+
 			std::string fp = ifo->oper_block->getString("fingerprint");
-			if (fp == req.cert->fingerprint && ifo->oper_block->getBool("autologin"))
+			if (fp == cert->fingerprint && ifo->oper_block->getBool("autologin"))
 				user->Oper(ifo);
 		}
 	}