X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=9d4344629cc9653af567b9248440a360487af9b9;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=7bb46b753b8b8393df70b00fdee75a7d27464263;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 7bb46b753..9d4344629 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -23,16 +23,15 @@ #include #include "users.h" #include "modules.h" -#include "helperfuncs.h" #include "dns.h" #include "inspircd.h" /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ -extern InspIRCd* ServerInstance; - enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST }; +/** Holds a CGI site's details + */ class CGIhost : public classbase { public: @@ -47,6 +46,8 @@ public: typedef std::vector CGIHostlist; +/** Resolver for CGI:IRC hostnames encoded in ident/GECOS + */ class CGIResolver : public Resolver { std::string typ; @@ -60,7 +61,7 @@ class CGIResolver : public Resolver virtual void OnLookupComplete(const std::string &result) { /* Check the user still exists */ - if ((them) && (them == ServerInstance->fd_ref_table[theirfd])) + if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str()); @@ -73,7 +74,7 @@ class CGIResolver : public Resolver virtual void OnError(ResolverError e, const std::string &errormessage) { - if ((them) && (them == ServerInstance->fd_ref_table[theirfd])) + if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str()); @@ -87,13 +88,13 @@ class CGIResolver : public Resolver class ModuleCgiIRC : public Module { - Server *Srv; + bool NotifyOpers; CGIHostlist Hosts; public: - ModuleCgiIRC(Server* Me) : Module::Module(Me) + ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; + OnRehash(""); } @@ -110,7 +111,7 @@ public: virtual void OnRehash(const std::string ¶meter) { - ConfigReader Conf; + ConfigReader Conf(ServerInstance); NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed. @@ -135,7 +136,7 @@ public: } else { - log(DEBUG, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); + ServerInstance->Log(DEBUG, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); continue; } } @@ -197,16 +198,16 @@ public: virtual void OnUserRegister(userrec* user) { - log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,user->GetIPString()); + ServerInstance->Log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,user->GetIPString()); for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) { - log(DEBUG, "m_cgiirc.so: Matching %s against (%s or %s)", iter->hostmask.c_str(), user->host, user->GetIPString()); + ServerInstance->Log(DEBUG, "m_cgiirc.so: Matching %s against (%s or %s)", iter->hostmask.c_str(), user->host, user->GetIPString()); - if(Srv->MatchText(user->host, iter->hostmask) || Srv->MatchText(user->GetIPString(), iter->hostmask)) + if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask)) { // Deal with it... - log(DEBUG, "m_cgiirc.so: Handling CGI:IRC user: %s (%s) matched %s", user->GetFullRealHost(), user->GetIPString(), iter->hostmask.c_str()); + ServerInstance->Log(DEBUG, "m_cgiirc.so: Handling CGI:IRC user: %s (%s) matched %s", user->GetFullRealHost(), user->GetIPString(), iter->hostmask.c_str()); if(iter->type == PASS) { @@ -234,7 +235,7 @@ public: bool CheckPass(userrec* user) { - log(DEBUG, "m_cgiirc.so: CheckPass(%s) - %s", user->nick, user->password); + ServerInstance->Log(DEBUG, "m_cgiirc.so: CheckPass(%s) - %s", user->nick, user->password); if(IsValidHost(user->password)) { @@ -250,7 +251,7 @@ public: #endif { /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */ - log(DEBUG, "m_cgiirc.so: Got an IP in the user's password"); + ServerInstance->Log(DEBUG, "m_cgiirc.so: Got an IP in the user's password"); if(NotifyOpers) ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); @@ -258,12 +259,12 @@ public: else { /* We got as resolved hostname in the password. */ - log(DEBUG, "m_cgiirc.so: Got a hostname in the user's password"); + ServerInstance->Log(DEBUG, "m_cgiirc.so: Got a hostname in the user's password"); try { - CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->fd, "PASS"); - Srv->AddResolver(r); + CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->GetFd(), "PASS"); + ServerInstance->AddResolver(r); } catch (ModuleException& e) { @@ -281,7 +282,7 @@ public: } else { - log(DEBUG, "m_cgiirc.so: User's password was not a valid host"); + ServerInstance->Log(DEBUG, "m_cgiirc.so: User's password was not a valid host"); } return false; @@ -317,9 +318,9 @@ public: try { - log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->fd, "IDENT"); - CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->fd, "IDENT"); - Srv->AddResolver(r); + ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->GetFd(), "IDENT"); + CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->GetFd(), "IDENT"); + ServerInstance->AddResolver(r); } catch (ModuleException& e) { @@ -429,7 +430,7 @@ class ModuleCgiIRCFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleCgiIRC(Me); }