*/
#include "inspircd.h"
-#include "users.h"
-#include "modules.h"
-#include "dns.h"
+
#ifndef WINDOWS
#include <sys/socket.h>
#include <netinet/in.h>
/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
-enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
+enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
/** Holds a CGI site's details
};
typedef std::vector<CGIhost> CGIHostlist;
-class cmd_webirc : public command_t
+class CommandWebirc : public Command
{
InspIRCd* Me;
CGIHostlist Hosts;
bool notify;
public:
- cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : command_t(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)
+ CommandWebirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : Command(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)
{
this->source = "m_cgiirc.so";
this->syntax = "password client hostname ip";
}
- CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle(const char** parameters, int pcnt, User *user)
{
if(user->registered == REG_ALL)
return CMD_FAILURE;
{
std::string typ;
int theirfd;
- userrec* them;
+ User* them;
bool notify;
public:
- CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)
+ CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
: Resolver(ServerInstance, 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)
+ 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->SE->GetRef(theirfd)))
{
class ModuleCgiIRC : public Module
{
- cmd_webirc* mycommand;
+ CommandWebirc* mycommand;
bool NotifyOpers;
CGIHostlist Hosts;
public:
{
OnRehash(NULL,"");
- mycommand=new cmd_webirc(Me, Hosts, NotifyOpers);
+ mycommand=new CommandWebirc(Me, Hosts, NotifyOpers);
ServerInstance->AddCommand(mycommand);
}
return PRIORITY_FIRST;
}
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
ConfigReader Conf(ServerInstance);
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;
- else if(type == "webirc") {
- Hosts.back().type = WEBIRC;
- if(password.length())
- Hosts.back().password=password;
- else
+ if (type == "webirc" && !password.length()) {
ServerInstance->Log(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
{
{
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, bool displayable)
+ 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, const std::string &oper_message)
+ virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
{
OnCleanup(TYPE_USER, user);
}
- virtual int OnUserRegister(userrec* user)
+ virtual int OnUserRegister(User* user)
{
for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
{
return 0;
}
- virtual void OnUserConnect(userrec* user)
+ virtual void OnUserConnect(User* user)
{
std::string *webirc_hostname, *webirc_ip;
if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
{
bool valid=false;
+ user->RemoveCloneCounts();
#ifdef IPV6
valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
delete webirc_ip;
user->InvalidateCache();
user->Shrink("cgiirc_webirc_ip");
+ ServerInstance->AddLocalClone(user);
+ ServerInstance->AddGlobalClone(user);
+ user->CheckClass();
}
}
- bool CheckPass(userrec* user)
+ bool CheckPass(User* user)
{
if(IsValidHost(user->password))
{
user->InvalidateCache();
bool valid = false;
+ user->RemoveCloneCounts();
#ifdef IPV6
if (user->GetProtocolFamily() == AF_INET6)
valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr))
valid = true;
#endif
+ ServerInstance->AddLocalClone(user);
+ ServerInstance->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. */
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()));
+ user->RemoveCloneCounts();
#ifdef IPV6
if (user->GetProtocolFamily() == AF_INET6)
inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);
else
- inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
-#else
- inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
#endif
-
+ inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
+ ServerInstance->AddLocalClone(user);
+ ServerInstance->AddGlobalClone(user);
+ user->CheckClass();
try
{
strlcpy(user->host, newip, 16);
};
-class ModuleCgiIRCFactory : public ModuleFactory
-{
- public:
- ModuleCgiIRCFactory()
- {
- }
-
- ~ModuleCgiIRCFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleCgiIRC(Me);
- }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleCgiIRCFactory;
-}
+MODULE_INIT(ModuleCgiIRC)