X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=c81c7420783747b7d0d560b475224a5a5a925a5c;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=3ed40108dac71fcdddcb2aa4e6f6bc11766416a1;hpb=72943b2c720c1d94b145b4fa61bfb89d65d4ef9c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index 3ed40108d..c81c74207 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -1,109 +1,146 @@ -#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 */ -class ModuleSSLModes : public Module +#include "inspircd.h" +#include "ssl.h" + +/* $ModDesc: Provides channel mode +z to allow for Secure/SSL only channels */ + +/** Handle channel mode +z + */ +class SSLMode : public ModeHandler { - Server *Srv; - public: - ModuleSSLModes(Server* Me) - : Module::Module(Me) + SSLMode(Module* Creator) : ModeHandler(Creator, "sslonly", 'z', PARAM_NONE, MODETYPE_CHANNEL) { } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - Srv = Me; - Srv->AddExtendedMode('z', MT_CHANNEL, false, 0, 0); + if (adding) + { + if (!channel->IsModeSet('z')) + { + if (IS_LOCAL(source)) + { + const UserMembList* userlist = channel->GetUsers(); + for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++) + { + 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; + } + } + } + channel->SetMode('z',true); + return MODEACTION_ALLOW; + } + else + { + return MODEACTION_DENY; + } + } + else + { + if (channel->IsModeSet('z')) + { + channel->SetMode('z',false); + return MODEACTION_ALLOW; + } + + return MODEACTION_DENY; + } } +}; - void Implements(char* List) +class ModuleSSLModes : public Module +{ + + SSLMode sslm; + + public: + ModuleSSLModes() + : sslm(this) { - List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1; } - virtual void On005Numeric(std::string &output) + void init() { - InsertMode(output, "z", 4); + 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) + + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { - if(chan && chan->IsCustomModeSet('z')) + if(chan && chan->IsModeSet('z')) { - if(user->GetExt("ssl")) + UserCertificateRequest req(user, this); + req.Send(); + if (req.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); + return MOD_RES_DENY; } } - - return 0; + + return MOD_RES_PASSTHRU; } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) { - // check if this is our mode character... - if ((modechar == 'z') && (type == MT_CHANNEL)) - { - chanrec* chan = (chanrec*)target; - - chanuserlist userlist = Srv->GetUsers(chan); - - for(unsigned int i = 0; i < userlist.size(); i++) - { - if(!userlist[i]->GetExt("ssl")) - { - WriteServ(user->fd, "490 %s %s :all members of the channel must be connected via SSL", user->nick, chan->name); - return 0; - } - } - - return 1; - } - else + if ((mask.length() > 2) && (mask[0] == 'z') && (mask[1] == ':')) { - return 0; + 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 ~ModuleSSLModes() - { - } - - virtual Version GetVersion() + ~ModuleSSLModes() { - return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR); } -}; - -class ModuleSSLModesFactory : public ModuleFactory -{ - public: - ModuleSSLModesFactory() + void On005Numeric(std::string &output) { + ServerInstance->AddExtBanChar('z'); } - - ~ModuleSSLModesFactory() - { - } - - virtual Module* CreateModule(Server* Me) + + Version GetVersion() { - 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) +