* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- * <omster@gmail.com>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
#include <arpa/inet.h>
#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:
typedef std::vector<CGIhost> CGIHostlist;
+/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+ */
class CGIResolver : public Resolver
{
std::string typ;
userrec* them;
bool notify;
public:
- CGIResolver(bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type)
- : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+ CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)
+ : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
- virtual void OnLookupComplete(const std::string &result)
+ virtual void OnLookupComplete(const std::string &result, unsigned int ttl)
{
/* 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());
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());
ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me)
{
- OnRehash("");
+ OnRehash(NULL,"");
}
void Implements(char* List)
return PRIORITY_FIRST;
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(userrec* user, 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.
}
else
{
- log(DEBUG, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+ ServerInstance->Log(DEBUG, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
continue;
}
}
}
- virtual void OnUserRegister(userrec* user)
+ virtual int 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(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)
{
// If the ident lookup fails, try the password.
CheckPass(user);
}
-
- return;
+ return 0;
}
}
+ return 0;
}
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))
{
#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);
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");
- ServerInstance->AddResolver(r);
+ bool cached;
+ CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+ ServerInstance->AddResolver(r, cached);
}
catch (ModuleException& e)
{
}
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;
try
{
- log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->fd, "IDENT");
- CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->fd, "IDENT");
- ServerInstance->AddResolver(r);
+ ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->GetFd(), "IDENT");
+ bool cached;
+ CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
+ ServerInstance->AddResolver(r, cached);
}
catch (ModuleException& e)
{
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_VENDOR);
+ return Version(1,1,0,0,VF_VENDOR,API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff