X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=ca690fb8f5e976f64f0edf3951af9a0b7180787c;hb=8fe441db7cfddb90bc6fca2e33dfffd2ae68dca7;hp=b2883c0f0b5a5b7882eba75f0a97e2d84ec00f52;hpb=be9fbe56f96dddb09af5b256f4529f1d8d563743;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index b2883c0f0..ca690fb8f 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <string>
 #include <vector>
 
@@ -9,17 +22,23 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "socket.h"
 #include "hashcomp.h"
+#include "inspircd.h"
+
+#include "transport.h"
 
 /* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: -I/usr/include -I/usr/local/include */
-/* $LinkerFlags: -L/usr/local/lib -Wl,--rpath -Wl,/usr/local/lib -L/usr/lib -Wl,--rpath -Wl,/usr/lib -lssl */
+/* $CompileFlags: `perl extra/openssl_config.pl compile` */
+/* $LinkerFlags: `perl extra/openssl_config.pl link` */
+/* $ModDep: transport.h */
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
 enum issl_io_status { ISSL_WRITE, ISSL_READ };
 
+static bool SelfSigned = false;
+
 bool isin(int port, const std::vector<int> &portlist)
 {
 	for(unsigned int i = 0; i < portlist.size(); i++)
@@ -34,6 +53,8 @@ char* get_error()
 	return ERR_error_string(ERR_get_error(), NULL);
 }
 
+/** Represents an SSL user's extra data
+ */
 class issl_session : public classbase
 {
 public:
@@ -54,13 +75,26 @@ public:
 	}
 };
 
+static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
+{
+	/* XXX: This will allow self signed certificates.
+	 * In the future if we want an option to not allow this,
+	 * we can just return preverify_ok here, and openssl
+	 * will boot off self-signed and invalid peer certs.
+	 */
+	int ve = X509_STORE_CTX_get_error(ctx);
+
+	SelfSigned = (ve == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
+
+	return 1;
+}
+	
 class ModuleSSLOpenSSL : public Module
 {
-	Server* Srv;
-	ServerConfig* SrvConf;
+	
 	ConfigReader* Conf;
 	
-	CullList culllist;
+	CullList* culllist;
 	
 	std::vector<int> listenports;
 	
@@ -79,14 +113,15 @@ class ModuleSSLOpenSSL : public Module
 	
  public:
 	
-	ModuleSSLOpenSSL(Server* Me)
+	ModuleSSLOpenSSL(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		SrvConf = Srv->GetConfig();
+		culllist = new CullList(ServerInstance);
+
+		ServerInstance->PublishInterface("InspSocketHook", this);
 		
 		// Not rehashable...because I cba to reduce all the sizes of existing buffers.
-		inbufsize = SrvConf->NetBufferSize;
+		inbufsize = ServerInstance->Config->NetBufferSize;
 		
 		/* Global SSL library initialization*/
 		SSL_library_init();
@@ -95,41 +130,49 @@ class ModuleSSLOpenSSL : public Module
 		/* Build our SSL context*/
 		ctx = SSL_CTX_new( SSLv23_server_method() );
 
+		SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
+
 		// Needs the flag as it ignores a plain /rehash
 		OnRehash("ssl");
 	}
 	
 	virtual void OnRehash(const std::string &param)
 	{
-		if(param != "ssl")
+		if (param != "ssl")
 			return;
 	
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 			
-		for(unsigned int i = 0; i < listenports.size(); i++)
+		for (unsigned int i = 0; i < listenports.size(); i++)
 		{
-			SrvConf->DelIOHook(listenports[i]);
+			ServerInstance->Config->DelIOHook(listenports[i]);
 		}
 		
 		listenports.clear();
 		
-		for(int i = 0; i < Conf->Enumerate("bind"); i++)
+		for (int i = 0; i < Conf->Enumerate("bind"); i++)
 		{
 			// For each <bind> tag
-			if(((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "openssl"))
+			if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "openssl"))
 			{
 				// Get the port we're meant to be listening on with SSL
-				unsigned int port = Conf->ReadInteger("bind", "port", i, true);
-				if(SrvConf->AddIOHook(port, this))
-				{
-					// We keep a record of which ports we're listening on with SSL
-					listenports.push_back(port);
-				
-					log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", port);
-				}
-				else
+				std::string port = Conf->ReadValue("bind", "port", i);
+				irc::portparser portrange(port, false);
+				long portno = -1;
+				while ((portno = portrange.GetToken()))
 				{
-					log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port);
+					if (ServerInstance->Config->AddIOHook(portno, this))
+					{
+						listenports.push_back(portno);
+						for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
+							if (ServerInstance->Config->ports[i] == portno)
+								ServerInstance->Config->openSockfd[i]->SetDescription("ssl");
+						ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno);
+					}
+					else
+					{
+						ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?",	portno);
+					}
 				}
 			}
 		}
@@ -138,68 +181,64 @@ class ModuleSSLOpenSSL : public Module
 		// +1 so we the path ends with a /
 		confdir = confdir.substr(0, confdir.find_last_of('/') + 1);
 		
-		cafile	= Conf->ReadValue("openssl", "cafile", 0);
-		// crlfile	= Conf->ReadValue("openssl", "crlfile", 0);
-		certfile	= Conf->ReadValue("openssl", "certfile", 0);
-		keyfile	= Conf->ReadValue("openssl", "keyfile", 0);
-		dhfile	= Conf->ReadValue("openssl", "dhfile", 0);
+		cafile	 = Conf->ReadValue("openssl", "cafile", 0);
+		certfile = Conf->ReadValue("openssl", "certfile", 0);
+		keyfile	 = Conf->ReadValue("openssl", "keyfile", 0);
+		dhfile	 = Conf->ReadValue("openssl", "dhfile", 0);
 		
 		// Set all the default values needed.
-		if(cafile == "")
+		if (cafile == "")
 			cafile = "ca.pem";
 			
-		//if(crlfile == "")
-		//	crlfile = "crl.pem";
-			
-		if(certfile == "")
+		if (certfile == "")
 			certfile = "cert.pem";
 			
-		if(keyfile == "")
+		if (keyfile == "")
 			keyfile = "key.pem";
 			
-		if(dhfile == "")
+		if (dhfile == "")
 			dhfile = "dhparams.pem";
 			
 		// Prepend relative paths with the path to the config directory.	
-		if(cafile[0] != '/')
+		if (cafile[0] != '/')
 			cafile = confdir + cafile;
 		
 		//if(crlfile[0] != '/')
 		//	crlfile = confdir + crlfile;
 			
-		if(certfile[0] != '/')
+		if (certfile[0] != '/')
 			certfile = confdir + certfile;
 			
-		if(keyfile[0] != '/')
+		if (keyfile[0] != '/')
 			keyfile = confdir + keyfile;
 			
-		if(dhfile[0] != '/')
+		if (dhfile[0] != '/')
 			dhfile = confdir + dhfile;
 
 		/* Load our keys and certificates*/
-		if(!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str()))
+		if (!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str()))
 		{
-			log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s", certfile.c_str());
+			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s", certfile.c_str());
 		}
 
-		if(!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM))
+		if (!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM))
 		{
-			log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s", keyfile.c_str());
+			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s", keyfile.c_str());
 		}
 
 		/* Load the CAs we trust*/
-		if(!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))
+		if (!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))
 		{
-			log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from ", cafile.c_str());
+			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from ", cafile.c_str());
 		}
 
 		FILE* dhpfile = fopen(dhfile.c_str(), "r");
 		DH* ret;
 
-		if(dhpfile == NULL)
+		if (dhpfile == NULL)
 		{
-			log(DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno));
-			throw ModuleException();
+			ServerInstance->Log(DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno));
+			throw ModuleException("Couldn't open DH file " + dhfile + ": " + strerror(errno));
 		}
 		else
 		{
@@ -207,7 +246,7 @@ class ModuleSSLOpenSSL : public Module
 		
 			if(SSL_CTX_set_tmp_dh(ctx, ret) < 0)
 			{
-				log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters");
+				ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters");
 			}
 		}
 		
@@ -219,50 +258,109 @@ class ModuleSSLOpenSSL : public Module
 	virtual ~ModuleSSLOpenSSL()
 	{
 		SSL_CTX_free(ctx);
+		delete culllist;
 	}
 	
 	virtual void OnCleanup(int target_type, void* item)
 	{
-		if(target_type == TYPE_USER)
+		if (target_type == TYPE_USER)
 		{
 			userrec* user = (userrec*)item;
 			
-			if(user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports))
+			if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports))
 			{
 				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
 				// Potentially there could be multiple SSL modules loaded at once on different ports.
-				log(DEBUG, "m_ssl_openssl.so: Adding user %s to cull list", user->nick);
-				culllist.AddItem(user, "SSL module unloading");
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Adding user %s to cull list", user->nick);
+				culllist->AddItem(user, "SSL module unloading");
+			}
+			if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
+			{
+				ssl_cert* tofree;
+				user->GetExt("ssl_cert", tofree);
+				delete tofree;
+				user->Shrink("ssl_cert");
 			}
 		}
 	}
 	
 	virtual void OnUnloadModule(Module* mod, const std::string &name)
 	{
-		if(mod == this)
+		if (mod == this)
 		{
 			// We're being unloaded, kill all the users added to the cull list in OnCleanup
-			int numusers = culllist.Apply();
-			log(DEBUG, "m_ssl_openssl.so: Killed %d users for unload of OpenSSL SSL module", numusers);
+			int numusers = culllist->Apply();
+			ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Killed %d users for unload of OpenSSL SSL module", numusers);
 			
 			for(unsigned int i = 0; i < listenports.size(); i++)
-				SrvConf->DelIOHook(listenports[i]);
+			{
+				ServerInstance->Config->DelIOHook(listenports[i]);
+				for (unsigned int j = 0; j < ServerInstance->stats->BoundPortCount; j++)
+					if (ServerInstance->Config->ports[j] == listenports[i])
+						ServerInstance->Config->openSockfd[j]->SetDescription("plaintext");
+			}
 		}
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
-		List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnGlobalConnect] = 1;
+		List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
+		List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
 	}
 
+	virtual char* OnRequest(Request* request)
+	{
+		ISHRequest* ISR = (ISHRequest*)request;
+		ServerInstance->Log(DEBUG, "hook OnRequest");
+		if (strcmp("IS_NAME", request->GetId()) == 0)
+		{
+			return "openssl";
+		}
+		else if (strcmp("IS_HOOK", request->GetId()) == 0)
+		{
+			char* ret = "OK";
+			try
+			{
+				ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+			}
+			catch (ModuleException &e)
+			{
+				return NULL;
+			}
+
+			return ret;
+		}
+		else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
+		{
+			ServerInstance->Log(DEBUG, "Unhooking socket %08x", ISR->Sock);
+			return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+		}
+		else if (strcmp("IS_HSDONE", request->GetId()) == 0)
+		{
+			issl_session* session = &sessions[ISR->Sock->GetFd()];
+			return (session->status == ISSL_HANDSHAKING) ? NULL : (char*)"OK";
+		}
+		else if (strcmp("IS_ATTACH", request->GetId()) == 0)
+		{
+			issl_session* session = &sessions[ISR->Sock->GetFd()];
+			if (session)
+			{
+				VerifyCertificate(session, (InspSocket*)ISR->Sock);
+				return "OK";
+			}
+		}
+		return NULL;
+	}
+
+
 	virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
 	{
+		ServerInstance->Log(DEBUG, "Hook accept %d", fd);
 		issl_session* session = &sessions[fd];
 	
 		session->fd = fd;
@@ -271,82 +369,115 @@ class ModuleSSLOpenSSL : public Module
 		session->sess = SSL_new(ctx);
 		session->status = ISSL_NONE;
 	
-		if(session->sess == NULL)
+		if (session->sess == NULL)
 		{
-			log(DEBUG, "m_ssl.so: Couldn't create SSL object: %s", get_error());
+			ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't create SSL object: %s", get_error());
 			return;
 		}
 		
-		if(SSL_set_fd(session->sess, fd) == 0)
+		if (SSL_set_fd(session->sess, fd) == 0)
 		{
-			log(DEBUG, "m_ssl.so: Couldn't set fd for SSL object: %s", get_error());
+			ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't set fd for SSL object: %s", get_error());
 			return;
 		}
 
  		Handshake(session);
 	}
 
+	virtual void OnRawSocketConnect(int fd)
+	{
+		issl_session* session = &sessions[fd];
+
+		session->fd = fd;
+		session->inbuf = new char[inbufsize];
+		session->inbufoffset = 0;
+		session->sess = SSL_new(ctx);
+		session->status = ISSL_NONE;
+
+		if (session->sess == NULL)
+		{
+			ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't create SSL object: %s", get_error());
+			return;
+		}
+
+		if (SSL_set_fd(session->sess, fd) == 0)
+		{
+			ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't set fd for SSL object: %s", get_error());
+			return;
+		}
+
+		Handshake(session);
+	}
+
 	virtual void OnRawSocketClose(int fd)
 	{
-		log(DEBUG, "m_ssl_openssl.so: OnRawSocketClose: %d", fd);
+		ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketClose: %d", fd);
 		CloseSession(&sessions[fd]);
+
+		EventHandler* user = ServerInstance->SE->GetRef(fd);
+
+		if ((user) && (user->GetExt("ssl_cert", dummy)))
+		{
+			ssl_cert* tofree;
+			user->GetExt("ssl_cert", tofree);
+			delete tofree;
+			user->Shrink("ssl_cert");
+		}
 	}
-	
+
 	virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
 	{
 		issl_session* session = &sessions[fd];
 		
-		if(!session->sess)
+		if (!session->sess)
 		{
-			log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: No session to read from");
+			ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: No session to read from");
 			readresult = 0;
 			CloseSession(session);
 			return 1;
 		}
 		
-		log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead(%d, buffer, %u, %d)", fd, count, readresult);
-		
-		if(session->status == ISSL_HANDSHAKING)
+		if (session->status == ISSL_HANDSHAKING)
 		{
-			if(session->rstat == ISSL_READ || session->wstat == ISSL_READ)
+			if (session->rstat == ISSL_READ || session->wstat == ISSL_READ)
 			{
 				// The handshake isn't finished and it wants to read, try to finish it.
-				if(Handshake(session))
+				if (Handshake(session))
 				{
 					// Handshake successfully resumed.
-					log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: successfully resumed handshake");
+					ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: successfully resumed handshake");
 				}
 				else
 				{
 					// Couldn't resume handshake.	
-					log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: failed to resume handshake");
+					ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: failed to resume handshake");
 					return -1;
 				}
 			}
 			else
 			{
-				log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: handshake wants to write data but we are currently reading");
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: handshake wants to write data but we are currently reading");
 				return -1;			
 			}
 		}
-		
+
 		// If we resumed the handshake then session->status will be ISSL_OPEN
 				
-		if(session->status == ISSL_OPEN)
+		if (session->status == ISSL_OPEN)
 		{
-			if(session->wstat == ISSL_READ)
+			if (session->wstat == ISSL_READ)
 			{
 				if(DoWrite(session) == 0)
 					return 0;
 			}
 			
-			if(session->rstat == ISSL_READ)
+			if (session->rstat == ISSL_READ)
 			{
 				int ret = DoRead(session);
 			
-				if(ret > 0)
+				if (ret > 0)
 				{
-					if(count <= session->inbufoffset)
+					if (count <= session->inbufoffset)
 					{
 						memcpy(buffer, session->inbuf, count);
 						// Move the stuff left in inbuf to the beginning of it
@@ -366,9 +497,6 @@ class ModuleSSLOpenSSL : public Module
 						session->inbufoffset = 0;
 					}
 				
-					log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: Passing %d bytes up to insp:", count);
-					Srv->Log(DEBUG, std::string(buffer, readresult));
-				
 					return 1;
 				}
 				else
@@ -385,46 +513,45 @@ class ModuleSSLOpenSSL : public Module
 	{		
 		issl_session* session = &sessions[fd];
 
-		if(!session->sess)
+		if (!session->sess)
 		{
-			log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: No session to write to");
+			ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: No session to write to");
 			CloseSession(session);
 			return 1;
 		}
-		
-		log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: Adding %d bytes to the outgoing buffer", count);		
+
 		session->outbuf.append(buffer, count);
 		
-		if(session->status == ISSL_HANDSHAKING)
+		if (session->status == ISSL_HANDSHAKING)
 		{
 			// The handshake isn't finished, try to finish it.
-			if(session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
+			if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
 			{
-				if(Handshake(session))
+				if (Handshake(session))
 				{
 					// Handshake successfully resumed.
-					log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: successfully resumed handshake");
+					ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: successfully resumed handshake");
 				}
 				else
 				{
 					// Couldn't resume handshake.	
-					log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: failed to resume handshake"); 
+					ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: failed to resume handshake"); 
 				}
 			}
 			else
 			{
-				log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: handshake wants to read data but we are currently writing");			
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: handshake wants to read data but we are currently writing");			
 			}
 		}
 		
-		if(session->status == ISSL_OPEN)
+		if (session->status == ISSL_OPEN)
 		{
-			if(session->rstat == ISSL_WRITE)
+			if (session->rstat == ISSL_WRITE)
 			{
 				DoRead(session);
 			}
 			
-			if(session->wstat == ISSL_WRITE)
+			if (session->wstat == ISSL_WRITE)
 			{
 				return DoWrite(session);
 			}
@@ -435,43 +562,43 @@ class ModuleSSLOpenSSL : public Module
 	
 	int DoWrite(issl_session* session)
 	{
-		log(DEBUG, "m_ssl_openssl.so: DoWrite: Trying to write %d bytes:", session->outbuf.size());
-		Srv->Log(DEBUG, session->outbuf);
-			
+		if (!session->outbuf.size())
+			return -1;
+
+		ServerInstance->Log(DEBUG, "m_ssl_openssl.so: To write: %d", session->outbuf.size());
 		int ret = SSL_write(session->sess, session->outbuf.data(), session->outbuf.size());
 		
-		if(ret == 0)
+		if (ret == 0)
 		{
-			log(DEBUG, "m_ssl_openssl.so: DoWrite: Client closed the connection");
+			ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Client closed the connection");
 			CloseSession(session);
 			return 0;
 		}
-		else if(ret < 0)
+		else if (ret < 0)
 		{
 			int err = SSL_get_error(session->sess, ret);
 			
-			if(err == SSL_ERROR_WANT_WRITE)
+			if (err == SSL_ERROR_WANT_WRITE)
 			{
-				log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written, need to retry: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written, need to retry: %s", get_error());
 				session->wstat = ISSL_WRITE;
 				return -1;
 			}
-			else if(err == SSL_ERROR_WANT_READ)
+			else if (err == SSL_ERROR_WANT_READ)
 			{
-				log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written but the damn thing wants to read instead: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written but the damn thing wants to read instead: %s", get_error());
 				session->wstat = ISSL_READ;
 				return -1;
 			}
 			else
 			{
-				log(DEBUG, "m_ssl_openssl.so: DoWrite: Error writing SSL data: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Error writing SSL data: %s", get_error());
 				CloseSession(session);
 				return 0;
 			}
 		}
 		else
 		{
-			log(DEBUG, "m_ssl_openssl.so: DoWrite: Successfully wrote %d bytes", ret);
 			session->outbuf = session->outbuf.substr(ret);
 			return ret;
 		}
@@ -481,36 +608,35 @@ class ModuleSSLOpenSSL : public Module
 	{
 		// Is this right? Not sure if the unencrypted data is garaunteed to be the same length.
 		// Read into the inbuffer, offset from the beginning by the amount of data we have that insp hasn't taken yet.
-		log(DEBUG, "m_ssl_openssl.so: DoRead: SSL_read(sess, inbuf+%d, %d-%d)", session->inbufoffset, inbufsize, session->inbufoffset);
 			
 		int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset);
 
-		if(ret == 0)
+		if (ret == 0)
 		{
 			// Client closed connection.
-			log(DEBUG, "m_ssl_openssl.so: DoRead: Client closed the connection");
+			ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Client closed the connection");
 			CloseSession(session);
 			return 0;
 		}
-		else if(ret < 0)
+		else if (ret < 0)
 		{
 			int err = SSL_get_error(session->sess, ret);
 				
-			if(err == SSL_ERROR_WANT_READ)
+			if (err == SSL_ERROR_WANT_READ)
 			{
-				log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read, need to retry: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read, need to retry: %s", get_error());
 				session->rstat = ISSL_READ;
 				return -1;
 			}
-			else if(err == SSL_ERROR_WANT_WRITE)
+			else if (err == SSL_ERROR_WANT_WRITE)
 			{
-				log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read but the damn thing wants to write instead: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read but the damn thing wants to write instead: %s", get_error());
 				session->rstat = ISSL_WRITE;
 				return -1;
 			}
 			else
 			{
-				log(DEBUG, "m_ssl_openssl.so: DoRead: Error reading SSL data: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Error reading SSL data: %s", get_error());
 				CloseSession(session);
 				return 0;
 			}
@@ -520,8 +646,6 @@ class ModuleSSLOpenSSL : public Module
 			// Read successfully 'ret' bytes into inbuf + inbufoffset
 			// There are 'ret' + 'inbufoffset' bytes of data in 'inbuf'
 			// 'buffer' is 'count' long
-			
-			log(DEBUG, "m_ssl_openssl.so: DoRead: Read %d bytes, now have %d waiting to be passed up", ret, ret + session->inbufoffset);
 
 			session->inbufoffset += ret;
 
@@ -533,16 +657,16 @@ class ModuleSSLOpenSSL : public Module
 	virtual void OnWhois(userrec* source, userrec* dest)
 	{
 		// Bugfix, only send this numeric for *our* SSL users
-		if(dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) &&  isin(dest->GetPort(), listenports)))
+		if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) &&  isin(dest->GetPort(), listenports)))
 		{
-			source->WriteServ("320 %s %s :is using a secure connection", source->nick, dest->nick);
+			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick, dest->nick);
 		}
 	}
 	
 	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
 	{
 		// check if the linking module wants to know about OUR metadata
-		if(extname == "ssl")
+		if (extname == "ssl")
 		{
 			// check if this user has an swhois field to send
 			if(user->GetExt(extname, dummy))
@@ -572,26 +696,26 @@ class ModuleSSLOpenSSL : public Module
 	{		
 		int ret = SSL_accept(session->sess);
       
-		if(ret < 0)
+		if (ret < 0)
 		{
 			int err = SSL_get_error(session->sess, ret);
 				
-			if(err == SSL_ERROR_WANT_READ)
+			if (err == SSL_ERROR_WANT_READ)
 			{
-				log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to read again: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to read again: %s", get_error());
 				session->rstat = ISSL_READ;
 				session->status = ISSL_HANDSHAKING;
 			}
-			else if(err == SSL_ERROR_WANT_WRITE)
+			else if (err == SSL_ERROR_WANT_WRITE)
 			{
-				log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to write more data: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to write more data: %s", get_error());
 				session->wstat = ISSL_WRITE;
 				session->status = ISSL_HANDSHAKING;
 				MakePollWrite(session);
 			}
 			else
 			{
-				log(DEBUG, "m_ssl_openssl.so: Handshake: Failed, bailing: %s", get_error());
+				ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Failed, bailing: %s", get_error());
 				CloseSession(session);
 			}
 
@@ -600,10 +724,10 @@ class ModuleSSLOpenSSL : public Module
 		else
 		{
 			// Handshake complete.
-			log(DEBUG, "m_ssl_openssl.so: Handshake completed");
+			ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake completed");
 			
 			// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
-			userrec* u = Srv->FindDescriptor(session->fd);
+			userrec* u = ServerInstance->FindDescriptor(session->fd);
 			if (u)
 			{
 				if (!u->GetExt("ssl", dummy))
@@ -618,7 +742,7 @@ class ModuleSSLOpenSSL : public Module
 		}
 	}
 	
-	virtual void OnGlobalConnect(userrec* user)
+	virtual void OnPostConnect(userrec* user)
 	{
 		// This occurs AFTER OnUserConnect so we can be sure the
 		// protocol module has propogated the NICK message.
@@ -630,9 +754,11 @@ class ModuleSSLOpenSSL : public Module
 			metadata->push_back("ssl");		// The metadata id
 			metadata->push_back("ON");		// The value to send
 			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
-			event->Send();				// Trigger the event. We don't care what module picks it up.
+			event->Send(ServerInstance);		// Trigger the event. We don't care what module picks it up.
 			DELETE(event);
 			DELETE(metadata);
+
+			VerifyCertificate(&sessions[user->GetFd()], user);
 		}
 	}
 	
@@ -643,13 +769,13 @@ class ModuleSSLOpenSSL : public Module
 	
 	void CloseSession(issl_session* session)
 	{
-		if(session->sess)
+		if (session->sess)
 		{
 			SSL_shutdown(session->sess);
 			SSL_free(session->sess);
 		}
 		
-		if(session->inbuf)
+		if (session->inbuf)
 		{
 			delete[] session->inbuf;
 		}
@@ -659,6 +785,57 @@ class ModuleSSLOpenSSL : public Module
 		session->sess = NULL;
 		session->status = ISSL_NONE;
 	}
+
+	void VerifyCertificate(issl_session* session, Extensible* user)
+	{
+		X509* cert;
+		ssl_cert* certinfo = new ssl_cert;
+		unsigned int n;
+		unsigned char md[EVP_MAX_MD_SIZE];
+		const EVP_MD *digest = EVP_md5();
+
+		user->Extend("ssl_cert",certinfo);
+
+		cert = SSL_get_peer_certificate((SSL*)session->sess);
+
+		if (!cert)
+		{
+			certinfo->data.insert(std::make_pair("error","Could not get peer certificate: "+std::string(get_error())));
+			return;
+		}
+
+		certinfo->data.insert(std::make_pair("invalid", SSL_get_verify_result(session->sess) != X509_V_OK ? ConvToStr(1) : ConvToStr(0)));
+
+		if (SelfSigned)
+		{
+			certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(0)));
+			certinfo->data.insert(std::make_pair("trusted",ConvToStr(1)));
+		}
+		else
+		{
+			certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(1)));
+			certinfo->data.insert(std::make_pair("trusted",ConvToStr(0)));
+		}
+
+		certinfo->data.insert(std::make_pair("dn",std::string(X509_NAME_oneline(X509_get_subject_name(cert),0,0))));
+		certinfo->data.insert(std::make_pair("issuer",std::string(X509_NAME_oneline(X509_get_issuer_name(cert),0,0))));
+
+		if (!X509_digest(cert, digest, md, &n))
+		{
+			certinfo->data.insert(std::make_pair("error","Out of memory generating fingerprint"));
+		}
+		else
+		{
+			certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n)));
+		}
+
+		if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == 0))
+		{
+			certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
+		}
+
+		X509_free(cert);
+	}
 };
 
 class ModuleSSLOpenSSLFactory : public ModuleFactory
@@ -672,7 +849,7 @@ class ModuleSSLOpenSSLFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSSLOpenSSL(Me);
 	}