Introduce "X" snomask for remote *:line messages [patch by jackmcbarn]

[user/henk/code/inspircd.git] / src / modules / m_sslmodes.cpp

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index b19347ea7c8b43e6d24c4bd36bca5493a4471de7..27a9285cce3dfbef0d10ef2a0ef777fe135d9db2 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -12,17 +12,16 @@
  */
 
 #include "inspircd.h"
+#include "transport.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, Module* Creator) : ModeHandler(Instance, Creator, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       SSLMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -32,10 +31,12 @@ 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) && !ServerInstance->ULine(i->first->server))
+                                               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;
@@ -74,16 +75,17 @@ class ModuleSSLModes : public Module
        {
                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 ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       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))
+                       BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+                       req.Send();
+                       if (req.cert)
                        {
                                // Let them in
                                return MOD_RES_PASSTHRU;
@@ -99,12 +101,29 @@ class ModuleSSLModes : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleSSLModes()
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
+       {
+               if (mask[0] == 'z' && mask[1] == ':')
+               {
+                       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;
+       }
+
+       ~ModuleSSLModes()
        {
                ServerInstance->Modes->DelMode(&sslm);
        }
 
-       virtual Version GetVersion()
+       void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('z');
+       }
+
+       Version GetVersion()
        {
                return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }