-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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"
-#include "users.h"
-#include "channels.h"
-#include "modules.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) : 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 ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
if (adding)
{
{
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->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;
}
}
class ModuleSSLModes : public Module
{
-
- SSLMode* sslm;
-
+
+ SSLMode sslm;
+
public:
- ModuleSSLModes(InspIRCd* Me)
- : Module(Me)
+ ModuleSSLModes()
+ : sslm(this)
{
-
-
- sslm = new SSLMode(ServerInstance);
- if (!ServerInstance->AddMode(sslm, 'z'))
- throw ModuleException("Could not add new modes!");
}
- void Implements(char* List)
+ void init()
{
- List[I_OnUserPreJoin] = 1;
+ ServerInstance->Modules->AddService(sslm);
+ Implementation eventlist[] = { I_OnUserPreJoin, I_OnCheckBan, I_On005Numeric };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- virtual int OnUserPreJoin(userrec* user, chanrec* 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;
- }
- virtual ~ModuleSSLModes()
- {
- ServerInstance->Modes->DelMode(sslm);
- DELETE(sslm);
+ return MOD_RES_PASSTHRU;
}
-
- virtual Version GetVersion()
+
+ ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ 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;
}
-};
-
-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 channel mode +z to allow for Secure/SSL only channels", VF_VENDOR);
}
-
};
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleSSLModesFactory;
-}
+MODULE_INIT(ModuleSSLModes)
+
projects / user / henk / code / inspircd.git / blobdiff