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

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 263f87113..a1a24d8ad 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -12,19 +12,18 @@
  */
 
 #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(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -32,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->first->GetExt("ssl", dummy))
+						UserCertificateRequest req(i->first, creator);
+						req.Send();
+						if(!req.cert && !ServerInstance->ULine(i->first->server))
 						{
-							source->WriteNumeric(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;
 						}
 					}
@@ -65,52 +66,65 @@ class SSLMode : public ModeHandler
 
 class ModuleSSLModes : public Module
 {
-	
-	SSLMode* sslm;
-	
+
+	SSLMode sslm;
+
  public:
-	ModuleSSLModes(InspIRCd* Me)
-		: Module(Me)
+	ModuleSSLModes()
+		: sslm(this)
 	{
-		
-
-		sslm = new SSLMode(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(sslm))
+		if (!ServerInstance->Modes->AddMode(&sslm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnCheckBan, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+	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; SSL users only (+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 ~ModuleSSLModes()
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		ServerInstance->Modes->DelMode(sslm);
-		delete sslm;
+		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;
 	}
-	
-	virtual Version GetVersion()
+
+	~ModuleSSLModes()
+	{
+	}
+
+	void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('z');
+	}
+
+	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +z", VF_VENDOR);
 	}
 };