X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=0538f9f626cc450914dfeec81a1d30d3294e0b77;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=1a7f0670b73a96a7e213fdf4c4e30dad7ba47d7b;hpb=4cb2be033bbb0eafc7ee4fa579daf7ccaca8860b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 1a7f0670b..0538f9f62 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,109 +1,134 @@
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | 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 support for unreal-style channel mode +z */
 
-class ModuleSSLModes : public Module
+/** Handle channel mode +z
+ */
+class SSLMode : public ModeHandler
 {
-	Server *Srv;
-	
  public:
-	ModuleSSLModes(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		Srv->AddExtendedMode('z', MT_CHANNEL, false, 0, 0);
-	}
+	SSLMode(Module* Creator) : ModeHandler(Creator, 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-	void Implements(char* List)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+		if (adding)
+		{
+			if (!channel->IsModeSet('z'))
+			{
+				if (IS_LOCAL(source))
+				{
+					const UserMembList* userlist = channel->GetUsers();
+					for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++)
+					{
+						BufferedSocketCertificateRequest req(i->first, creator, i->first->GetIOHook());
+						req.Send();
+						if(!req.cert && !ServerInstance->ULine(i->first->server))
+						{
+							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;
+						}
+					}
+				}
+				channel->SetMode('z',true);
+				return MODEACTION_ALLOW;
+			}
+			else
+			{
+				return MODEACTION_DENY;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('z'))
+			{
+				channel->SetMode('z',false);
+				return MODEACTION_ALLOW;
+			}
+
+			return MODEACTION_DENY;
+		}
 	}
+};
 
-	virtual void On005Numeric(std::string &output)
+class ModuleSSLModes : public Module
+{
+
+	SSLMode sslm;
+
+ public:
+	ModuleSSLModes()
+		: sslm(this)
 	{
-		output.insert(output.find(" ", output.find("CHANMODES=", 0)), "z");
+		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 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->IsCustomModeSet('z'))
+		if(chan && chan->IsModeSet('z'))
 		{
-			if(user->GetExt("ssl"))
+			BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+			req.Send();
+			if (req.cert)
 			{
 				// Let them in
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 			else
 			{
 				// Deny
-				WriteServ(user->fd, "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;
+
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		// check if this is our mode character...
-		if ((modechar == 'z') && (type == MT_CHANNEL))
-  		{
-  			chanrec* chan = (chanrec*)target;
-  			
-  			chanuserlist userlist = Srv->GetUsers(chan);
-  			
-  			for(unsigned int i = 0; i < userlist.size(); i++)
-  			{
-  				if(!userlist[i]->GetExt("ssl"))
-  				{
-  					WriteServ(user->fd, "490 %s %s :all members of the channel must be connected via SSL", user->nick, chan->name);
-  					return 0;
-  				}
-  			}
-  			
-			return 1;
-		}
-		else
+		if (mask[0] == 'z' && mask[1] == ':')
 		{
-			return 0;
+			BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+			req.Send();
+			if (req.cert && InspIRCd::Match(req.cert->GetFingerprint(), mask.substr(2)))
+				return MOD_RES_DENY;
 		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleSSLModes()
-	{
-	}
-	
-	virtual Version GetVersion()
+	~ModuleSSLModes()
 	{
-		return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+		ServerInstance->Modes->DelMode(&sslm);
 	}
-};
-
 
-class ModuleSSLModesFactory : public ModuleFactory
-{
- public:
-	ModuleSSLModesFactory()
+	void On005Numeric(std::string &output)
 	{
+		ServerInstance->AddExtBanChar('z');
 	}
-	
-	~ModuleSSLModesFactory()
-	{
-	}
-	
-	virtual Module* CreateModule(Server* Me)
+
+	Version GetVersion()
 	{
-		return new ModuleSSLModes(Me);
+		return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSSLModesFactory;
-}
+MODULE_INIT(ModuleSSLModes)
+