Merge m_ssl_data with m_ssinfo to reduce the number of SSL modules

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11430 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 76 insertions, 111 deletions

diff --git a/src/modules/m_ssl_data.cpp b/src/modules/m_ssl_data.cpp
deleted file mode 100644
index efc99d3f2..000000000
--- a/src/modules/m_ssl_data.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-#include "transport.h"
-
-/* $ModDesc: Provides SSL metadata and /WHOIS information */
-class ModuleSSLData : public Module
-{
- public:
-	ModuleSSLData(InspIRCd* Me) : Module(Me)
-	{
-		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version("$Id$", VF_VENDOR|VF_COMMON, API_VERSION);
-	}
-
-
-	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-	virtual void OnWhois(User* source, User* dest)
-	{
-		if(dest->GetExt("ssl"))
-		{
-			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
-		}
-	}
-
-	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
-	{
-		// check if the linking module wants to know about OUR metadata
-		if (extname == "ssl")
-		{
-			// check if this user has an ssl field to send
-			if (!user->GetExt(extname))
-				return;
-
-			// call this function in the linking module, let it format the data how it
-			// sees fit, and send it on its way. We dont need or want to know how.
-			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON");
-		}
-		else if (extname == "ssl_cert")
-		{
-			ssl_cert* cert;
-			if (!user->GetExt("ssl_cert", cert))
-				return;
-
-			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, cert->GetMetaLine().c_str());
-		}
-	}
-
-	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
-	{
-		// check if its our metadata key, and its associated with a user
-		if ((target_type == TYPE_USER) && (extname == "ssl"))
-		{
-			User* dest = static_cast<User*>(target);
-			// if they dont already have an ssl flag, accept the remote server's
-			if (!dest->GetExt(extname))
-			{
-				dest->Extend(extname);
-			}
-		}
-		else if ((target_type == TYPE_USER) && (extname == "ssl_cert"))
-		{
-			User* dest = static_cast<User*>(target);
-			if (dest->GetExt(extname))
-				return;
-
-			ssl_cert* cert = new ssl_cert;
-			dest->Extend(extname, cert);
-
-			std::stringstream s(extdata);
-			std::string v;
-			getline(s,v,' ');
-
-			cert->invalid = (v.find('v') != std::string::npos);
-			cert->trusted = (v.find('T') != std::string::npos);
-			cert->revoked = (v.find('R') != std::string::npos);
-			cert->unknownsigner = (v.find('s') != std::string::npos);
-			if (v.find('E') != std::string::npos)
-			{
-				getline(s,cert->error,'\n');
-			}
-			else
-			{
-				getline(s,cert->fingerprint,' ');
-				getline(s,cert->dn,' ');
-				getline(s,cert->issuer,'\n');
-			}
-		}
-	}
-};
-
-MODULE_INIT(ModuleSSLData)
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index fb1a00666..55a0dc7fa 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -14,8 +14,7 @@
 #include "inspircd.h"
 #include "transport.h"
 
-/* $ModDesc: Provides /sslinfo command used to test who a mask matches */
-/* $ModDep: transport.h */
+/* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
 
 /** Handle /SSLINFO
  */
@@ -69,10 +68,11 @@ class ModuleSSLInfo : public Module
 	ModuleSSLInfo(InspIRCd* Me)
 		: Module(Me)
 	{
-
 		newcommand = new CommandSSLInfo(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
 
+		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 
@@ -84,6 +84,79 @@ class ModuleSSLInfo : public Module
 	{
 		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
+
+	virtual void OnWhois(User* source, User* dest)
+	{
+		if(dest->GetExt("ssl"))
+		{
+			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
+		}
+	}
+
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	{
+		// check if the linking module wants to know about OUR metadata
+		if (extname == "ssl")
+		{
+			// check if this user has an ssl field to send
+			if (!user->GetExt(extname))
+				return;
+
+			// call this function in the linking module, let it format the data how it
+			// sees fit, and send it on its way. We dont need or want to know how.
+			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON");
+		}
+		else if (extname == "ssl_cert")
+		{
+			ssl_cert* cert;
+			if (!user->GetExt("ssl_cert", cert))
+				return;
+
+			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, cert->GetMetaLine().c_str());
+		}
+	}
+
+	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+	{
+		// check if its our metadata key, and its associated with a user
+		if ((target_type == TYPE_USER) && (extname == "ssl"))
+		{
+			User* dest = static_cast<User*>(target);
+			// if they dont already have an ssl flag, accept the remote server's
+			if (!dest->GetExt(extname))
+			{
+				dest->Extend(extname);
+			}
+		}
+		else if ((target_type == TYPE_USER) && (extname == "ssl_cert"))
+		{
+			User* dest = static_cast<User*>(target);
+			if (dest->GetExt(extname))
+				return;
+
+			ssl_cert* cert = new ssl_cert;
+			dest->Extend(extname, cert);
+
+			std::stringstream s(extdata);
+			std::string v;
+			getline(s,v,' ');
+
+			cert->invalid = (v.find('v') != std::string::npos);
+			cert->trusted = (v.find('T') != std::string::npos);
+			cert->revoked = (v.find('R') != std::string::npos);
+			cert->unknownsigner = (v.find('s') != std::string::npos);
+			if (v.find('E') != std::string::npos)
+			{
+				getline(s,cert->error,'\n');
+			}
+			else
+			{
+				getline(s,cert->fingerprint,' ');
+				getline(s,cert->dn,' ');
+				getline(s,cert->issuer,'\n');
+			}
+		}
+	}
 };
 
 MODULE_INIT(ModuleSSLInfo)