X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=a1a24d8ad552c7813e2fc6e46579bd25f0c6123c;hb=3cf993500544c2157992650da2487bfa89be405d;hp=55cfd7a165250da5a2385d71a87cf52f661d67de;hpb=cfb2c2fff47d99f43434de7db339c2f2237c6bad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 55cfd7a16..a1a24d8ad 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,21 +1,29 @@
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 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 "ssl.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
-static char* dummy;
-
-
-
+/** Handle channel mode +z
+ */
 class SSLMode : public ModeHandler
 {
  public:
-	SSLMode(InspIRCd* Instance) : ModeHandler(Instance, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	SSLMode(Module* Creator) : ModeHandler(Creator, "sslonly", 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -23,12 +31,14 @@ class SSLMode : public ModeHandler
 			{
 				if (IS_LOCAL(source))
 				{
-					CUList* userlist = channel->GetUsers();
-					for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
+					const UserMembList* userlist = channel->GetUsers();
+					for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++)
 					{
-						if(!i->second->GetExt("ssl", dummy))
+						UserCertificateRequest req(i->first, creator);
+						req.Send();
+						if(!req.cert && !ServerInstance->ULine(i->first->server))
 						{
-							source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+							source->WriteNumeric(ERR_ALLMUSTSSL, "%s %s :all members of the channel must be connected via SSL", source->nick.c_str(), channel->name.c_str());
 							return MODEACTION_DENY;
 						}
 					}
@@ -56,81 +66,68 @@ class SSLMode : public ModeHandler
 
 class ModuleSSLModes : public Module
 {
-	
-	SSLMode* sslm;
-	
- public:
-	ModuleSSLModes(InspIRCd* Me)
-		: Module::Module(Me)
-	{
-		
 
-		sslm = new SSLMode(ServerInstance);
-		ServerInstance->AddMode(sslm, 'z');
-	}
+	SSLMode sslm;
 
-	void Implements(char* List)
+ public:
+	ModuleSSLModes()
+		: sslm(this)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+		if (!ServerInstance->Modes->AddMode(&sslm))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnCheckBan, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->Modes->InsertMode(output, "z", 4);
-	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if(chan && chan->IsModeSet('z'))
 		{
-			if(user->GetExt("ssl", dummy))
+			UserCertificateRequest req(user, this);
+			req.Send();
+			if (req.cert)
 			{
 				// Let them in
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 			else
 			{
 				// Deny
-				user->WriteServ( "489 %s %s :Cannot join channel (+z)", user->nick, cname);
-				return 1;
+				user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick.c_str(), cname);
+				return MOD_RES_DENY;
 			}
 		}
-		
-		return 0;
-	}
 
-	virtual ~ModuleSSLModes()
-	{
-		DELETE(sslm);
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Version GetVersion()
+
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+		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;
 	}
-};
-
 
-class ModuleSSLModesFactory : public ModuleFactory
-{
- public:
-	ModuleSSLModesFactory()
+	~ModuleSSLModes()
 	{
 	}
-	
-	~ModuleSSLModesFactory()
+
+	void On005Numeric(std::string &output)
 	{
+		ServerInstance->AddExtBanChar('z');
 	}
-	
-	virtual Module* CreateModule(InspIRCd* Me)
+
+	Version GetVersion()
 	{
-		return new ModuleSSLModes(Me);
+		return Version("Provides support for unreal-style channel mode +z", VF_VENDOR);
 	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSSLModesFactory;
-}
+MODULE_INIT(ModuleSSLModes)
+