* | 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-2008 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 <vector>
-#include <string>
-#include <stdlib.h>
+#include "inspircd.h"
+
+#ifndef WINDOWS
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "dns.h"
-#include "inspircd.h"
+#endif
/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
+enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
-enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST };
-
+/** Holds a CGI site's details
+ */
class CGIhost : public classbase
{
public:
std::string hostmask;
CGItype type;
+ std::string password;
- CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST)
- : hostmask(mask), type(t)
+ CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &spassword ="")
+ : hostmask(mask), type(t), password(spassword)
{
}
};
-
typedef std::vector<CGIhost> CGIHostlist;
+/*
+ * WEBIRC
+ * This is used for the webirc method of CGIIRC auth, and is (really) the best way to do these things.
+ * Syntax: WEBIRC password client hostname ip
+ * Where password is a shared key, client is the name of the "client" and version (e.g. cgiirc), hostname
+ * is the resolved host of the client issuing the command and IP is the real IP of the client.
+ *
+ * How it works:
+ * To tie in with the rest of cgiirc module, and to avoid race conditions, /webirc is only processed locally
+ * and simply sets metadata on the user, which is later decoded on full connect to give something meaningful.
+ */
+class CommandWebirc : public Command
+{
+ CGIHostlist Hosts;
+ bool notify;
+ public:
+ CommandWebirc(InspIRCd* Instance, CGIHostlist &cHosts, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), Hosts(cHosts), notify(bnotify)
+ {
+ this->source = "m_cgiirc.so";
+ this->syntax = "password client hostname ip";
+ }
+ CmdResult Handle(const char* const* parameters, int pcnt, 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(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()));
+ 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;
+ }
+ }
+ }
+ return CMD_FAILURE;
+ }
+};
+
+
+/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+ */
class CGIResolver : public Resolver
{
std::string typ;
int theirfd;
- userrec* them;
+ User* 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* 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)
+ virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
{
+ if (resultnum)
+ return;
+
/* 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());
+ 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());
strlcpy(them->host, result.c_str(), 63);
strlcpy(them->dhost, result.c_str(), 63);
strlcpy(them->ident, "~cgiirc", 8);
+ them->InvalidateCache();
}
}
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());
+ 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());
}
}
class ModuleCgiIRC : public Module
{
-
+ CommandWebirc* mycommand;
bool NotifyOpers;
CGIHostlist Hosts;
public:
- ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me)
+ ModuleCgiIRC(InspIRCd* Me) : Module(Me)
{
- OnRehash("");
- }
+ OnRehash(NULL,"");
+ mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
+ ServerInstance->AddCommand(mycommand);
- void Implements(char* List)
- {
- List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCleanup] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = 1;
+ Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
+ ServerInstance->Modules->Attach(eventlist, this, 7);
}
+
- virtual Priority Prioritize()
+ virtual void Prioritize()
{
- // We want to get here before m_cloaking and m_hostchange etc
- return PRIORITY_FIRST;
+ ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_FIRST);
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
ConfigReader Conf(ServerInstance);
{
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);
if(hostmask.length())
{
- Hosts.push_back(CGIhost(hostmask));
-
- if(type == "pass")
- Hosts.back().type = PASS;
- else if(type == "ident")
- Hosts.back().type = IDENT;
- else if(type == "passfirst")
- Hosts.back().type = PASSFIRST;
+ if (type == "webirc" && !password.length()) {
+ ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+ }
+ else
+ {
+ CGItype cgitype = INVALID;
+ if (type == "pass")
+ cgitype = PASS;
+ else if (type == "ident")
+ cgitype = IDENT;
+ else if (type == "passfirst")
+ cgitype = PASSFIRST;
+ else if (type == "webirc")
+ {
+ cgitype = WEBIRC;
+ }
+
+ if (cgitype == INVALID)
+ cgitype = PASS;
+
+ Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
+ }
}
else
{
- log(DEBUG, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+ ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
continue;
}
}
{
if(target_type == TYPE_USER)
{
- userrec* user = (userrec*)item;
+ User* user = (User*)item;
std::string* realhost;
std::string* realip;
}
}
- virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
+ virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
{
if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
{
{
if(target_type == TYPE_USER)
{
- userrec* dest = (userrec*)target;
+ User* dest = (User*)target;
std::string* bleh;
if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))
{
}
}
- virtual void OnUserQuit(userrec* user, const std::string &message)
+ virtual void OnUserDisconnect(User* user)
{
OnCleanup(TYPE_USER, user);
}
- virtual void OnUserRegister(userrec* user)
- {
- log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,user->GetIPString());
-
+ virtual int OnUserRegister(User* user)
+ {
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());
-
+ {
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());
-
if(iter->type == PASS)
{
CheckPass(user); // We do nothing if it fails so...
// If the ident lookup fails, try the password.
CheckPass(user);
}
-
- return;
+ else if(iter->type == WEBIRC)
+ {
+ // We don't need to do anything here
+ }
+ return 0;
}
}
+ return 0;
}
- bool CheckPass(userrec* user)
+ 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)
{
- 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(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 (insp_aton(user->password, (insp_inaddr*)&((sockaddr_in6*)&user->ip)->sin6_addr))
+ 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 (insp_aton(user->password, (insp_inaddr*)&((sockaddr_in*)&user->ip)->sin_addr))
+ 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. */
- 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);
+ 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. */
- 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)
+ catch (...)
{
if (NotifyOpers)
- ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
+ 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->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/
+ 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);*/
return true;
}
- else
- {
- log(DEBUG, "m_cgiirc.so: User's password was not a valid host");
- }
return false;
}
- bool CheckIdent(userrec* user)
+ bool CheckIdent(User* user)
{
int ip[4];
char* ident;
user->Extend("cgiirc_realhost", new std::string(user->host));
user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+ ServerInstance->Users->RemoveCloneCounts(user);
#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);
+ if (user->GetProtocolFamily() == AF_INET6)
+ inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);
+ else
#endif
-
+ inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
+ ServerInstance->Users->AddLocalClone(user);
+ ServerInstance->Users->AddGlobalClone(user);
+ user->CheckClass();
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);
+ strlcpy(user->host, newip, 16);
+ strlcpy(user->dhost, newip, 16);
+ strlcpy(user->ident, "~cgiirc", 8);
+
+ bool cached;
+ CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
+ ServerInstance->AddResolver(r, cached);
}
- catch (ModuleException& e)
+ catch (...)
{
strlcpy(user->host, newip, 16);
strlcpy(user->dhost, newip, 16);
strlcpy(user->ident, "~cgiirc", 8);
+ user->InvalidateCache();
if(NotifyOpers)
- ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
+ 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);
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_VENDOR);
+ return Version(1,1,0,0,VF_VENDOR,API_VERSION);
}
};
-class ModuleCgiIRCFactory : public ModuleFactory
-{
- public:
- ModuleCgiIRCFactory()
- {
- }
-
- ~ModuleCgiIRCFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleCgiIRC(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleCgiIRCFactory;
-}
+MODULE_INIT(ModuleCgiIRC)
projects / user / henk / code / inspircd.git / blobdiff