Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[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 641d685443f11e0345871b91932ca4b8495ef60b..c81c7420783747b7d0d560b475224a5a5a925a5c 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,30 +1,39 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +z */
+#include "inspircd.h"
+#include "ssl.h"
 
-static char* dummy;
+/* $ModDesc: Provides channel mode +z to allow for Secure/SSL only channels */
 
 /** 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(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,10 +41,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))
+                                               UserCertificateRequest req(i->first, creator);
+                                               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;
@@ -69,44 +80,64 @@ 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!");
-               Implementation eventlist[] = { I_OnUserPreJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
+       void init()
+       {
+               ServerInstance->Modules->AddService(sslm);
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnCheckBan, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+       }
 
-       virtual int 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))
+                       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.c_str(), cname);
-                               return 1;
+                               return MOD_RES_DENY;
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
+       }
+
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
+       {
+               if ((mask.length() > 2) && (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()
+       {
        }
 
-       virtual ~ModuleSSLModes()
+       void On005Numeric(std::string &output)
        {
-               ServerInstance->Modes->DelMode(&sslm);
+               ServerInstance->AddExtBanChar('z');
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +z to allow for Secure/SSL only channels", VF_VENDOR);
        }
 };