X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=9d4344629cc9653af567b9248440a360487af9b9;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=f81b97fed78ef3eae75827423705a6a765b7b6f8;hpb=e65b2c70e43882a8b4f31df78b5f9242140320f9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index f81b97fed..9d4344629 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -23,17 +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 */ - -/* We need this for checking our user hasnt /quit before we finish our lookup */ -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST }; +/** Holds a CGI site's details + */ class CGIhost : public classbase { public: @@ -48,6 +46,8 @@ public: typedef std::vector CGIHostlist; +/** Resolver for CGI:IRC hostnames encoded in ident/GECOS + */ class CGIResolver : public Resolver { std::string typ; @@ -56,15 +56,15 @@ class CGIResolver : public Resolver bool notify; public: CGIResolver(bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type) - : Resolver(source, forward), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } + : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } virtual void OnLookupComplete(const std::string &result) { /* Check the user still exists */ - if ((them) && (them == fd_ref_table[theirfd])) + if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) - 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()); + 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()); strlcpy(them->host, result.c_str(), 63); strlcpy(them->dhost, result.c_str(), 63); @@ -74,10 +74,10 @@ class CGIResolver : public Resolver virtual void OnError(ResolverError e, const std::string &errormessage) { - if ((them) && (them == fd_ref_table[theirfd])) + if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) - 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()); + 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()); } } @@ -88,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(""); } @@ -111,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. @@ -136,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; } } @@ -198,16 +198,16 @@ public: virtual void OnUserRegister(userrec* user) { - log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,insp_ntoa(user->ip4)); + 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, insp_ntoa(user->ip4)); + 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(insp_ntoa(user->ip4), 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(), insp_ntoa(user->ip4), 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) { @@ -235,50 +235,54 @@ 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)) { user->Extend("cgiirc_realhost", new std::string(user->host)); - user->Extend("cgiirc_realip", new std::string(insp_ntoa(user->ip4))); + user->Extend("cgiirc_realip", new std::string(user->GetIPString())); strlcpy(user->host, user->password, 64); strlcpy(user->dhost, user->password, 64); - if(insp_aton(user->password, &user->ip4)) +#ifdef IPV6 + if (insp_aton(user->password, (insp_inaddr*)&((sockaddr_in6*)&user->ip)->sin6_addr)) +#else + if (insp_aton(user->password, (insp_inaddr*)&((sockaddr_in*)&user->ip)->sin_addr)) +#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) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); } 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) { if (NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); } } *user->password = 0; /*if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/ + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/ return true; } 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; @@ -305,14 +309,18 @@ public: snprintf(newip, 16, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); user->Extend("cgiirc_realhost", new std::string(user->host)); - user->Extend("cgiirc_realip", new std::string(insp_ntoa(user->ip4))); - insp_aton(newip, &user->ip4); - + user->Extend("cgiirc_realip", new std::string(user->GetIPString())); +#ifdef IPV6 + insp_aton(newip, (insp_inaddr*)&((sockaddr_in6*)&user->ip)->sin6_addr); +#else + insp_aton(newip, (insp_inaddr*)&((sockaddr_in*)&user->ip)->sin_addr); +#endif + 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) { @@ -321,7 +329,7 @@ public: strlcpy(user->ident, "~cgiirc", 8); if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); } /*strlcpy(user->host, newip, 16); strlcpy(user->dhost, newip, 16); @@ -422,7 +430,7 @@ class ModuleCgiIRCFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleCgiIRC(Me); }