-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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 free but copyrighted software; see
- * the file COPYING for details.
+ * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#ifndef WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
+#include "inspircd.h"
+#include "xline.h"
+#include "modules/dns.h"
-enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
+enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
/** Holds a CGI site's details
*/
-class CGIhost : public classbase
+class CGIhost
{
public:
std::string hostmask;
CGItype type;
std::string password;
- CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &spassword ="")
+ CGIhost(const std::string &mask, CGItype t, const std::string &spassword)
: hostmask(mask), type(t), password(spassword)
{
}
*/
class CommandWebirc : public Command
{
- CGIHostlist Hosts;
+ public:
bool notify;
- public:
- CommandWebirc(InspIRCd* Instance, CGIHostlist &cHosts, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), Hosts(cHosts), notify(bnotify)
+ StringExtItem realhost;
+ StringExtItem realip;
+ LocalStringExt webirc_hostname;
+ LocalStringExt webirc_ip;
+
+ CGIHostlist Hosts;
+ CommandWebirc(Module* Creator)
+ : Command(Creator, "WEBIRC", 4),
+ realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
+ webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
{
- this->source = "m_cgiirc.so";
+ works_before_reg = true;
this->syntax = "password client hostname ip";
}
- CmdResult Handle(const char* const* parameters, int pcnt, User *user)
+ CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
{
if(user->registered == REG_ALL)
return CMD_FAILURE;
-
+
for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
{
- if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask))
+ if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
{
if(iter->type == WEBIRC && parameters[0] == iter->password)
{
- user->Extend("cgiirc_realhost", new std::string(user->host));
- user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+ realhost.set(user, user->host);
+ realip.set(user, user->GetIPString());
+
+ bool host_ok = (parameters[2].length() < 64);
+ const std::string& newhost = (host_ok ? parameters[2] : parameters[3]);
+
if (notify)
- ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], user->host);
- user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
- user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
- return CMD_LOCALONLY;
+ ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), newhost.c_str(), user->host.c_str());
+
+ // Check if we're happy with the provided hostname. If it's problematic then make sure we won't set a host later, just the IP
+ if (host_ok)
+ webirc_hostname.set(user, parameters[2]);
+ else
+ webirc_hostname.unset(user);
+
+ webirc_ip.set(user, parameters[3]);
+ return CMD_SUCCESS;
}
}
}
+
+ ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
return CMD_FAILURE;
}
};
/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
*/
-class CGIResolver : public Resolver
+class CGIResolver : public DNS::Request
{
std::string typ;
- int theirfd;
- User* them;
+ std::string theiruid;
+ LocalIntExt& waiting;
bool notify;
public:
- CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
- : Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
-
- virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+ CGIResolver(DNS::Manager *mgr, Module* me, bool NotifyOpers, const std::string &source, LocalUser* u,
+ const std::string &ttype, LocalIntExt& ext)
+ : DNS::Request(mgr, me, source, DNS::QUERY_PTR), typ(ttype), theiruid(u->uuid),
+ waiting(ext), notify(NotifyOpers)
{
- if (resultnum)
- return;
+ }
+ void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE
+ {
/* Check the user still exists */
- if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+ User* them = ServerInstance->FindUUID(theiruid);
+ if ((them) && (!them->quitting))
{
+ LocalUser* lu = IS_LOCAL(them);
+ if (!lu)
+ return;
+
+ const DNS::ResourceRecord &ans_record = r->answers[0];
+ if (ans_record.rdata.empty() || ans_record.rdata.length() > 64)
+ return;
+
if (notify)
- ServerInstance->SNO->WriteToSnoMask('A', "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->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), ans_record.rdata.c_str(), typ.c_str());
- strlcpy(them->host, result.c_str(), 63);
- strlcpy(them->dhost, result.c_str(), 63);
- strlcpy(them->ident, "~cgiirc", 8);
+ them->host = them->dhost = ans_record.rdata;
them->InvalidateCache();
+ lu->CheckLines(true);
}
}
- virtual void OnError(ResolverError e, const std::string &errormessage)
+ void OnError(const DNS::Query *r) CXX11_OVERRIDE
{
- if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+ if (!notify)
+ return;
+
+ User* them = ServerInstance->FindUUID(theiruid);
+ if ((them) && (!them->quitting))
{
- if (notify)
- ServerInstance->SNO->WriteToSnoMask('A', "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->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str());
}
}
- virtual ~CGIResolver()
+ ~CGIResolver()
{
+ User* them = ServerInstance->FindUUID(theiruid);
+ if (!them)
+ return;
+ int count = waiting.get(them);
+ if (count)
+ waiting.set(them, count - 1);
}
};
class ModuleCgiIRC : public Module
{
- CommandWebirc* mycommand;
- bool NotifyOpers;
- CGIHostlist Hosts;
-public:
- ModuleCgiIRC(InspIRCd* Me) : Module(Me)
+ CommandWebirc cmd;
+ LocalIntExt waiting;
+ dynamic_reference<DNS::Manager> DNS;
+
+ static void RecheckClass(LocalUser* user)
+ {
+ user->MyClass = NULL;
+ user->SetClass();
+ user->CheckClass();
+ }
+
+ static void ChangeIP(LocalUser* user, const std::string& newip)
+ {
+ ServerInstance->Users->RemoveCloneCounts(user);
+ user->SetClientIP(newip.c_str());
+ ServerInstance->Users->AddLocalClone(user);
+ ServerInstance->Users->AddGlobalClone(user);
+ }
+
+ void HandleIdentOrPass(LocalUser* user, const std::string& newip, bool was_pass)
{
-
- OnRehash(NULL,"");
- mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
- ServerInstance->AddCommand(mycommand);
+ cmd.realhost.set(user, user->host);
+ cmd.realip.set(user, user->GetIPString());
+ ChangeIP(user, newip);
+ user->host = user->dhost = user->GetIPString();
+ user->InvalidateCache();
+ RecheckClass(user);
+
+ // Don't create the resolver if the core couldn't put the user in a connect class or when dns is disabled
+ if (user->quitting || !DNS || !user->MyClass->resolvehostnames)
+ return;
- Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
- ServerInstance->Modules->Attach(eventlist, this, 7);
+ CGIResolver* r = new CGIResolver(*this->DNS, this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), waiting);
+ try
+ {
+ waiting.set(user, waiting.get(user) + 1);
+ this->DNS->Process(r);
+ }
+ catch (DNS::Exception &ex)
+ {
+ int count = waiting.get(user);
+ if (count)
+ waiting.set(user, count - 1);
+ delete r;
+ if (cmd.notify)
+ ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname; %s", user->nick.c_str(), user->host.c_str(), ex.GetReason());
+ }
}
-
- virtual void Prioritize()
+public:
+ ModuleCgiIRC()
+ : cmd(this)
+ , waiting("cgiirc-delay", this)
+ , DNS(this, "DNS")
{
- ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_FIRST);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ void init() CXX11_OVERRIDE
{
- ConfigReader Conf(ServerInstance);
-
- NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed.
-
- if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
- NotifyOpers = true;
-
- for(int i = 0; i < Conf.Enumerate("cgihost"); i++)
+ OnRehash(NULL);
+ ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting };
+ ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
+ }
+
+ void OnRehash(User* user) CXX11_OVERRIDE
+ {
+ cmd.Hosts.clear();
+
+ // Do we send an oper notice when a CGI:IRC has their host changed?
+ cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
+
+ ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost");
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
{
- std::string hostmask = Conf.ReadValue("cgihost", "mask", i); // An allowed CGI:IRC host
- std::string type = Conf.ReadValue("cgihost", "type", i); // What type of user-munging we do on this host.
- std::string password = Conf.ReadValue("cgihost", "password", i);
-
+ ConfigTag* tag = i->second;
+ std::string hostmask = tag->getString("mask"); // An allowed CGI:IRC host
+ std::string type = tag->getString("type"); // What type of user-munging we do on this host.
+ std::string password = tag->getString("password");
+
if(hostmask.length())
{
- if (type == "webirc" && !password.length()) {
- ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+ if (type == "webirc" && password.empty())
+ {
+ ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
}
else
{
- CGItype cgitype = INVALID;
+ CGItype cgitype;
if (type == "pass")
cgitype = PASS;
else if (type == "ident")
else if (type == "passfirst")
cgitype = PASSFIRST;
else if (type == "webirc")
- {
cgitype = WEBIRC;
- }
-
- if (cgitype == INVALID)
+ else
+ {
cgitype = PASS;
+ ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid <cgihost:type> value in config: %s, setting it to \"pass\"", type.c_str());
+ }
- Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
+ cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password));
}
}
else
{
- ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+ ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
continue;
}
}
}
- virtual void OnCleanup(int target_type, void* item)
- {
- if(target_type == TYPE_USER)
- {
- User* user = (User*)item;
- std::string* realhost;
- std::string* realip;
-
- if(user->GetExt("cgiirc_realhost", realhost))
- {
- delete realhost;
- user->Shrink("cgiirc_realhost");
- }
-
- if(user->GetExt("cgiirc_realip", realip))
- {
- delete realip;
- user->Shrink("cgiirc_realip");
- }
- }
- }
-
- virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+ ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE
{
- if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
- {
- std::string* data;
-
- if(user->GetExt(extname, data))
- {
- proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *data);
- }
- }
- }
+ if (waiting.get(user))
+ return MOD_RES_DENY;
- virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
- {
- if(target_type == TYPE_USER)
- {
- User* dest = (User*)target;
- std::string* bleh;
- if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))
- {
- dest->Extend(extname, new std::string(extdata));
- }
- }
- }
+ std::string *webirc_ip = cmd.webirc_ip.get(user);
+ if (!webirc_ip)
+ return MOD_RES_PASSTHRU;
- virtual void OnUserDisconnect(User* user)
- {
- OnCleanup(TYPE_USER, user);
+ ChangeIP(user, *webirc_ip);
+
+ std::string* webirc_hostname = cmd.webirc_hostname.get(user);
+ user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
+
+ RecheckClass(user);
+ if (user->quitting)
+ return MOD_RES_DENY;
+
+ user->CheckLines(true);
+ if (user->quitting)
+ return MOD_RES_DENY;
+
+ cmd.webirc_hostname.unset(user);
+ cmd.webirc_ip.unset(user);
+
+ return MOD_RES_PASSTHRU;
}
-
- virtual int OnUserRegister(User* user)
- {
- for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
- {
- if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask))
+ ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
+ {
+ for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
+ {
+ if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
{
// Deal with it...
if(iter->type == PASS)
{
CheckPass(user); // We do nothing if it fails so...
+ user->CheckLines(true);
}
else if(iter->type == PASSFIRST && !CheckPass(user))
{
// If the password lookup failed, try the ident
CheckIdent(user); // If this fails too, do nothing
+ user->CheckLines(true);
}
else if(iter->type == IDENT)
{
CheckIdent(user); // Nothing on failure.
+ user->CheckLines(true);
}
else if(iter->type == IDENTFIRST && !CheckIdent(user))
{
// If the ident lookup fails, try the password.
CheckPass(user);
+ user->CheckLines(true);
}
else if(iter->type == WEBIRC)
{
// We don't need to do anything here
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual void OnUserConnect(User* user)
- {
- std::string *webirc_hostname, *webirc_ip;
- if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
- {
- strlcpy(user->host,webirc_hostname->c_str(),63);
- strlcpy(user->dhost,webirc_hostname->c_str(),63);
- delete webirc_hostname;
- user->InvalidateCache();
- user->Shrink("cgiirc_webirc_hostname");
- }
- if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
- {
- bool valid=false;
- ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
- valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
-
- if(!valid)
- valid = (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr));
-#else
- if (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr))
- valid = true;
-#endif
-
- delete webirc_ip;
- user->InvalidateCache();
- user->Shrink("cgiirc_webirc_ip");
- ServerInstance->Users->AddLocalClone(user);
- ServerInstance->Users->AddGlobalClone(user);
- user->CheckClass();
- }
- }
-
- bool CheckPass(User* user)
+ bool CheckPass(LocalUser* user)
{
if(IsValidHost(user->password))
{
- user->Extend("cgiirc_realhost", new std::string(user->host));
- user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
- strlcpy(user->host, user->password, 64);
- strlcpy(user->dhost, user->password, 64);
- user->InvalidateCache();
-
- bool valid = false;
- ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
- if (user->GetProtocolFamily() == AF_INET6)
- valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
- else
- valid = (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr));
-#else
- if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr))
- valid = true;
-#endif
- ServerInstance->Users->AddLocalClone(user);
- ServerInstance->Users->AddGlobalClone(user);
- user->CheckClass();
-
- if (valid)
- {
- /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
- if(NotifyOpers)
- ServerInstance->SNO->WriteToSnoMask('A', "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. */
- try
- {
-
- bool cached;
- CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
- ServerInstance->AddResolver(r, cached);
- }
- catch (...)
- {
- if (NotifyOpers)
- ServerInstance->SNO->WriteToSnoMask('A', "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)
- ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/
-
+ HandleIdentOrPass(user, user->password, true);
+ user->password.clear();
return true;
}
-
+
return false;
}
-
- bool CheckIdent(User* user)
+
+ bool CheckIdent(LocalUser* user)
{
- int ip[4];
- char* ident;
- char newip[16];
- int len = strlen(user->ident);
-
- if(len == 8)
- ident = user->ident;
- else if(len == 9 && *user->ident == '~')
- ident = user->ident+1;
- else
- return false;
-
- for(int i = 0; i < 4; i++)
- if(!HexToInt(ip[i], ident + i*2))
- return false;
+ const char* ident;
+ in_addr newip;
- 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(user->GetIPString()));
- ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
- if (user->GetProtocolFamily() == AF_INET6)
- inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);
+ if (user->ident.length() == 8)
+ ident = user->ident.c_str();
+ else if (user->ident.length() == 9 && user->ident[0] == '~')
+ ident = user->ident.c_str() + 1;
else
-#endif
- inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
- ServerInstance->Users->AddLocalClone(user);
- ServerInstance->Users->AddGlobalClone(user);
- user->CheckClass();
- try
- {
- strlcpy(user->host, newip, 16);
- strlcpy(user->dhost, newip, 16);
- strlcpy(user->ident, "~cgiirc", 8);
+ return false;
- bool cached;
- CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
- ServerInstance->AddResolver(r, cached);
- }
- catch (...)
- {
- strlcpy(user->host, newip, 16);
- strlcpy(user->dhost, newip, 16);
- strlcpy(user->ident, "~cgiirc", 8);
- user->InvalidateCache();
+ errno = 0;
+ unsigned long ipaddr = strtoul(ident, NULL, 16);
+ if (errno)
+ return false;
+ newip.s_addr = htonl(ipaddr);
+ std::string newipstr(inet_ntoa(newip));
- if(NotifyOpers)
- ServerInstance->SNO->WriteToSnoMask('A', "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);
- strlcpy(user->ident, "~cgiirc", 8);*/
+ user->ident = "~cgiirc";
+ HandleIdentOrPass(user, newipstr, false);
return true;
}
-
+
bool IsValidHost(const std::string &host)
{
- if(!host.size())
+ if(!host.size() || host.size() > 64)
return false;
-
+
for(unsigned int i = 0; i < host.size(); i++)
{
if( ((host[i] >= '0') && (host[i] <= '9')) ||
((host[i] >= 'a') && (host[i] <= 'z')) ||
((host[i] == '-') && (i > 0) && (i+1 < host.size()) && (host[i-1] != '.') && (host[i+1] != '.')) ||
((host[i] == '.') && (i > 0) && (i+1 < host.size())) )
-
+
continue;
else
return false;
}
-
- return true;
- }
- bool IsValidIP(const std::string &ip)
- {
- if(ip.size() < 7 || ip.size() > 15)
- return false;
-
- short sincedot = 0;
- short dots = 0;
-
- for(unsigned int i = 0; i < ip.size(); i++)
- {
- if((dots <= 3) && (sincedot <= 3))
- {
- if((ip[i] >= '0') && (ip[i] <= '9'))
- {
- sincedot++;
- }
- else if(ip[i] == '.')
- {
- sincedot = 0;
- dots++;
- }
- }
- else
- {
- return false;
-
- }
- }
-
- if(dots != 3)
- return false;
-
return true;
}
-
- bool HexToInt(int &out, const char* in)
- {
- char ip[3];
- ip[0] = in[0];
- ip[1] = in[1];
- ip[2] = 0;
- out = strtol(ip, NULL, 16);
-
- if(out > 255 || out < 0)
- return false;
- return true;
- }
-
- virtual ~ModuleCgiIRC()
- {
- }
-
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+ return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
}
-
+
};
MODULE_INIT(ModuleCgiIRC)