X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=191ca10f1c5cc06b92ca4124bdcb89c70438479e;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=e0b3126e4e83161fdc8b72e8a6a515214771faf7;hpb=cbff8c76278f7cb706e3c4ae0c8bc4cb63c15f96;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index e0b3126e4..191ca10f1 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -1,32 +1,65 @@ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton + * + * 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 . + */ -/* $ModDesc: Provides support for unreal-style channel mode +z */ +#include "inspircd.h" +#include "modules/ssl.h" + +/** Handle channel mode +z + */ class SSLMode : public ModeHandler { - Server* Srv; public: - SSLMode(Server* s) : ModeHandler('z', 0, 0, false, MODETYPE_CHANNEL, false), Srv(s) { } + UserCertificateAPI API; + + SSLMode(Module* Creator) + : ModeHandler(Creator, "sslonly", 'z', PARAM_NONE, MODETYPE_CHANNEL) + , API(Creator) + { + } - 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 (!channel->IsModeSet('z')) + if (!channel->IsModeSet(this)) { - chanuserlist userlist = Srv->GetUsers(channel); - for(unsigned int i = 0; i < userlist.size(); i++) + if (IS_LOCAL(source)) { - if(!userlist[i]->GetExt("ssl")) - { - WriteServ(source->fd, "490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name); + if (!API) return MODEACTION_DENY; + + const UserMembList* userlist = channel->GetUsers(); + for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++) + { + ssl_cert* cert = API->GetCertificate(i->first); + if (!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); + channel->SetMode(this, true); return MODEACTION_ALLOW; } else @@ -36,9 +69,9 @@ class SSLMode : public ModeHandler } else { - if (channel->IsModeSet('z')) + if (channel->IsModeSet(this)) { - channel->SetMode('z',false); + channel->SetMode(this, false); return MODEACTION_ALLOW; } @@ -49,81 +82,67 @@ class SSLMode : public ModeHandler class ModuleSSLModes : public Module { - Server *Srv; - SSLMode* sslm; - - public: - ModuleSSLModes(Server* Me) - : Module::Module(Me) - { - Srv = Me; - sslm = new SSLMode(Me); - Srv->AddMode(sslm, 'z'); - } + SSLMode sslm; - void Implements(char* List) + public: + ModuleSSLModes() + : sslm(this) { - List[I_On005Numeric] = List[I_OnUserPreJoin] = 1; } - virtual void On005Numeric(std::string &output) + void init() CXX11_OVERRIDE { - InsertMode(output, "z", 4); + ServerInstance->Modules->AddService(sslm); } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if(chan && chan->IsModeSet('z')) + if(chan && chan->IsModeSet(sslm)) { - if(user->GetExt("ssl")) + if (!sslm.API) + return MOD_RES_DENY; + + ssl_cert* cert = sslm.API->GetCertificate(user); + if (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.c_str()); + return MOD_RES_DENY; } } - - return 0; - } - virtual ~ModuleSSLModes() - { - DELETE(sslm); - } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR); + return MOD_RES_PASSTHRU; } -}; - -class ModuleSSLModesFactory : public ModuleFactory -{ - public: - ModuleSSLModesFactory() + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE { + if ((mask.length() > 2) && (mask[0] == 'z') && (mask[1] == ':')) + { + if (!sslm.API) + return MOD_RES_DENY; + + ssl_cert* cert = sslm.API->GetCertificate(user); + if (cert && InspIRCd::Match(cert->GetFingerprint(), mask.substr(2))) + return MOD_RES_DENY; + } + return MOD_RES_PASSTHRU; } - - ~ModuleSSLModesFactory() + + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { + tokens["EXTBAN"].push_back('z'); } - - virtual Module* CreateModule(Server* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSSLModes(Me); + return Version("Provides channel mode +z to allow for Secure/SSL only channels", VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSSLModesFactory; -} +MODULE_INIT(ModuleSSLModes)