X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=a1a24d8ad552c7813e2fc6e46579bd25f0c6123c;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;hp=396623eb9fa147454fef70f94043a436ddb5a433;hpb=91df762e93212958db487d8517addba1a63a4ddd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 396623eb9..a1a24d8ad 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,7 +12,7 @@
  */
 
 #include "inspircd.h"
-#include "transport.h"
+#include "ssl.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
@@ -21,7 +21,7 @@
 class SSLMode : public ModeHandler
 {
  public:
-	SSLMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	SSLMode(Module* Creator) : ModeHandler(Creator, "sslonly", 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
@@ -34,7 +34,7 @@ class SSLMode : public ModeHandler
 					const UserMembList* userlist = channel->GetUsers();
 					for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++)
 					{
-						BufferedSocketCertificateRequest req(i->first, creator, i->first->GetIOHook());
+						UserCertificateRequest req(i->first, creator);
 						req.Send();
 						if(!req.cert && !ServerInstance->ULine(i->first->server))
 						{
@@ -70,8 +70,8 @@ class ModuleSSLModes : public Module
 	SSLMode sslm;
 
  public:
-	ModuleSSLModes(InspIRCd* Me)
-		: Module(Me), sslm(Me, this)
+	ModuleSSLModes()
+		: sslm(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&sslm))
 			throw ModuleException("Could not add new modes!");
@@ -83,7 +83,7 @@ class ModuleSSLModes : public Module
 	{
 		if(chan && chan->IsModeSet('z'))
 		{
-			BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+			UserCertificateRequest req(user, this);
 			req.Send();
 			if (req.cert)
 			{
@@ -101,18 +101,20 @@ class ModuleSSLModes : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnCheckBan(User *user, Channel *c)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
-		req.Send();
-		if (req.cert)
-			return c->GetExtBanStatus(req.cert->GetFingerprint(), 'z');
+		if (mask[0] == 'z' && mask[1] == ':')
+		{
+			UserCertificateRequest req(user, this);
+			req.Send();
+			if (req.cert && InspIRCd::Match(req.cert->GetFingerprint(), mask.substr(2)))
+				return MOD_RES_DENY;
+		}
 		return MOD_RES_PASSTHRU;
 	}
 
 	~ModuleSSLModes()
 	{
-		ServerInstance->Modes->DelMode(&sslm);
 	}
 
 	void On005Numeric(std::string &output)
@@ -122,7 +124,7 @@ class ModuleSSLModes : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +z", VF_VENDOR);
 	}
 };