* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
/* $ModDesc: Provides support for RFC1413 ident lookups */
-class IdentRequestSocket : public InspSocket
+class IdentRequestSocket : public EventHandler
{
private:
- userrec *user;
+
+ User *user;
+ InspIRCd* ServerInstance;
+ bool done;
+ std::string result;
+
public:
- IdentRequestSocket(InspIRCd *Server, userrec *user, int timeout, const std::string &bindip)
- : InspSocket(Server, user->GetIPString(), 113, false, timeout, bindip), user(user)
+
+ IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident)
{
-
- }
+ /* connect here on instantiation, throw on immediate failure */
+
+ socklen_t size = 0;
+
+#ifdef IPV6
+ bool v6 = false;
+ if ((bindip.empty()) || bindip.find(':') != std::string::npos)
+ v6 = true;
+
+ if (v6)
+ SetFd(socket(AF_INET6, SOCK_STREAM, 0));
+ else
+#endif
+ SetFd(socket(AF_INET, SOCK_STREAM, 0));
+
+ if (GetFd() == -1)
+ throw ModuleException("Could not create socket");
+
+ sockaddr* s = new sockaddr[2];
+ sockaddr* addr = new sockaddr[2];
- virtual bool OnConnected()
+#ifdef IPV6
+ if (v6)
+ {
+ in6_addr addy;
+ in6_addr n;
+ if (inet_pton(AF_INET6, user->GetIPString(), &addy) > 0)
+ {
+ ((sockaddr_in6*)addr)->sin6_family = AF_INET6;
+ memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy));
+ ((sockaddr_in6*)addr)->sin6_port = htons(113);
+ size = sizeof(sockaddr_in6);
+ inet_pton(AF_INET6, IP.c_str(), &n);
+ memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6));
+ ((sockaddr_in6*)s)->sin6_port = 0;
+ ((sockaddr_in6*)s)->sin6_family = AF_INET6;
+ }
+ }
+ else
+#endif
+ {
+ in_addr addy;
+ in_addr n;
+ if (inet_aton(user->GetIPString(), &addy) > 0)
+ {
+ ((sockaddr_in*)addr)->sin_family = AF_INET;
+ ((sockaddr_in*)addr)->sin_addr = addy;
+ ((sockaddr_in*)addr)->sin_port = htons(113);
+ inet_aton(bindip.c_str(), &n);
+ ((sockaddr_in*)s)->sin_addr = n;
+ ((sockaddr_in*)s)->sin_port = 0;
+ ((sockaddr_in*)s)->sin_family = AF_INET;
+ }
+ }
+
+ if (ServerInstance->SE->Bind(GetFd(), s, size) < 0)
+ {
+ this->Close();
+ delete[] s;
+ throw ModuleException("failed to bind()");
+ }
+
+ delete[] s;
+ ServerInstance->SE->NonBlocking(GetFd());
+
+ if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1 && errno != EINPROGRESS)
+ {
+ this->Close();
+ delete[] addr;
+ throw ModuleException("connect() failed");
+ }
+
+ delete[] addr;
+
+ if (!ServerInstance->SE->AddFd(this))
+ {
+ this->Close();
+ throw ModuleException("out of fds");
+ }
+
+ ServerInstance->SE->WantWrite(this);
+ }
+
+ virtual void OnConnected()
{
/* Both sockaddr_in and sockaddr_in6 can be safely casted to sockaddr, especially since the
* only members we use are in a part of the struct that should always be identical (at the
* byte level). */
- Instance->Log(DEBUG, "Sending ident request to %s", user->GetIPString());
-
#ifndef IPV6
sockaddr_in laddr, raddr;
#else
sockaddr_in6 laddr, raddr;
#endif
-
+
socklen_t laddrsz = sizeof(laddr);
socklen_t raddrsz = sizeof(raddr);
-
+
if ((getsockname(user->GetFd(), (sockaddr*) &laddr, &laddrsz) != 0) || (getpeername(user->GetFd(), (sockaddr*) &raddr, &raddrsz) != 0))
- {
- // Error
- return false;
- }
-
+ return;
+
char req[32];
-
+
#ifndef IPV6
- snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin_port), ntohs(laddr.sin_port));
+ int req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin_port), ntohs(laddr.sin_port));
#else
- snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin6_port), ntohs(laddr.sin6_port));
+ int req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin6_port), ntohs(laddr.sin6_port));
#endif
- this->Write(req);
-
- return true;
+ if (ServerInstance->SE->Send(this, req, req_size, 0) < req_size)
+ done = true;
}
- virtual void OnClose()
+ virtual void HandleEvent(EventType et, int errornum = 0)
{
- /* There used to be a check against the fd table here, to make sure the user hadn't been
- * deleted but not yet had their socket closed or something along those lines, dated june
- * 2006. Since we added the global cull list and such, I don't *think* that is necessary
- * anymore. If you're getting odd crashes here, that's probably why ;) -Special */
+ switch (et)
+ {
+ case EVENT_READ:
+ /* fd readable event, received ident response */
+ ReadResponse();
+ break;
+ case EVENT_WRITE:
+ /* fd writeable event, successfully connected! */
+ OnConnected();
+ break;
+ case EVENT_ERROR:
+ /* fd error event, ohshi- */
+ done = true;
+ break;
+ }
+ }
- if (*user->ident == '~' && user->GetExt("ident_socket"))
- user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead", user->ident);
+ void Close()
+ {
+ ServerInstance->SE->Close(GetFd());
+ ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
+ }
- user->Shrink("ident_socket");
- Instance->next_call = Instance->Time();
+ bool HasResult()
+ {
+ return done;
}
-
- virtual void OnError(InspSocketError e)
+
+ const char* GetResult()
{
- // Quick check to make sure that this hasn't been sent ;)
- if (*user->ident == '~' && user->GetExt("ident_socket"))
- user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead", user->ident);
-
- user->Shrink("ident_socket");
- Instance->next_call = Instance->Time();
+ return result.c_str();
}
-
- virtual bool OnDataReady()
+
+ void ReadResponse()
{
- char *ibuf = this->Read();
- if (!ibuf)
- return false;
-
// We don't really need to buffer for incomplete replies here, since IDENT replies are
// extremely short - there is *no* sane reason it'd be in more than one packet
-
+
+ char ibuf[MAXBUF];
+ int recvresult = ServerInstance->SE->Recv(this, ibuf, MAXBUF-1, 0);
+
+ /* Cant possibly be a valid response shorter than 3 chars */
+ if (recvresult < 3)
+ {
+ done = true;
+ return;
+ }
+
irc::sepstream sep(ibuf, ':');
std::string token;
for (int i = 0; sep.GetToken(token); i++)
// We only really care about the 4th portion
if (i < 3)
continue;
-
+
char ident[IDENTMAX + 2];
-
+
// Truncate the ident at any characters we don't like, skip leading spaces
int k = 0;
for (const char *j = token.c_str(); *j && (k < IDENTMAX + 1); j++)
{
if (*j == ' ')
continue;
-
+
// Rules taken from InspIRCd::IsIdent
if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
{
ident[k++] = *j;
continue;
}
-
+
break;
}
-
+
ident[k] = '\0';
-
+
// Redundant check with IsIdent, in case that changes and this doesn't (paranoia!)
- if (*ident && Instance->IsIdent(ident))
+ if (*ident && ServerInstance->IsIdent(ident))
{
- strlcpy(user->ident, ident, IDENTMAX);
- user->WriteServ("NOTICE Auth :*** Found your ident: %s", user->ident);
- Instance->next_call = Instance->Time();
+ result = ident;
+ ServerInstance->next_call = ServerInstance->Time();
}
-
+
break;
}
-
- return false;
+
+ done = true;
+ return;
}
};
{
private:
int RequestTimeout;
- std::string IdentBindIP;
public:
ModuleIdent(InspIRCd *Me)
- : Module::Module(Me)
+ : Module(Me)
{
OnRehash(NULL, "");
}
- virtual ~ModuleIdent()
- {
- }
-
virtual Version GetVersion()
{
return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION);
List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnCleanup] = List[I_OnUserDisconnect] = 1;
}
- virtual void OnRehash(userrec *user, const std::string ¶m)
+ virtual void OnRehash(User *user, const std::string ¶m)
{
ConfigReader MyConf(ServerInstance);
RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true);
if (!RequestTimeout)
RequestTimeout = 5;
- IdentBindIP = MyConf.ReadValue("ident", "bind", 0);
}
- virtual int OnUserRegister(userrec *user)
+ virtual int OnUserRegister(User *user)
{
- /* userrec::ident is currently the username field from USER; with m_ident loaded, that
+ /* User::ident is currently the username field from USER; with m_ident loaded, that
* should be preceded by a ~. The field is actually IDENTMAX+2 characters wide. */
memmove(user->ident + 1, user->ident, IDENTMAX);
user->ident[0] = '~';
// Ensure that it is null terminated
user->ident[IDENTMAX + 1] = '\0';
-
+
user->WriteServ("NOTICE Auth :*** Looking up your ident...");
-
- IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user, RequestTimeout, IdentBindIP);
+
+ // Get the IP that the user is connected to, and bind to that for the outgoing connection
+ #ifndef IPV6
+ sockaddr_in laddr;
+ #else
+ sockaddr_in6 laddr;
+ #endif
+ socklen_t laddrsz = sizeof(laddr);
+
+ if (getsockname(user->GetFd(), (sockaddr*) &laddr, &laddrsz) != 0)
+ {
+ user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident);
+ return 0;
+ }
+
+ #ifndef IPV6
+ const char *ip = inet_ntoa(laddr.sin_addr);
+ #else
+ char ip[INET6_ADDRSTRLEN + 1];
+ inet_ntop(laddr.sin6_family, &laddr.sin6_addr, ip, INET6_ADDRSTRLEN);
+ #endif
+
+ IdentRequestSocket *isock = NULL;
+ try
+ {
+ isock = new IdentRequestSocket(ServerInstance, user, ip);
+ }
+ catch (ModuleException &e)
+ {
+ return 0;
+ }
+
user->Extend("ident_socket", isock);
return 0;
}
-
- virtual bool OnCheckReady(userrec *user)
+
+ virtual bool OnCheckReady(User *user)
{
- return (!user->GetExt("ident_socket"));
+ /* Does user have an ident socket attached at all? */
+ IdentRequestSocket *isock = NULL;
+ if (!user->GetExt("ident_socket", isock))
+ return true;
+
+ if (isock->age < ServerInstance->Time() - RequestTimeout)
+ {
+ /* Ident timeout */
+ user->WriteServ("NOTICE Auth :*** Ident request timed out.");
+ OnUserDisconnect(user);
+ return true;
+ }
+
+ /* Got a result yet? */
+ if (!isock->HasResult())
+ return false;
+
+ /* wooo, got a result! */
+ user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", isock->GetResult());
+ strlcpy(user->ident, isock->GetResult(), IDENTMAX+1);
+ return true;
}
-
+
virtual void OnCleanup(int target_type, void *item)
{
+ /* Module unloading, tidy up users */
if (target_type == TYPE_USER)
- {
- IdentRequestSocket *isock;
- userrec *user = (userrec*)item;
- if (user->GetExt("ident_socket", isock))
- isock->Close();
- }
+ OnUserDisconnect((User*)item);
}
-
- virtual void OnUserDisconnect(userrec *user)
+
+ virtual void OnUserDisconnect(User *user)
{
- IdentRequestSocket *isock;
- if (user->GetExt("ident_socket", isock))
+ /* User disconnect (generic socket detatch event) */
+ IdentRequestSocket *isock = NULL;
+ if (user->Extend("ident_socket", isock))
+ {
isock->Close();
+ delete isock;
+ user->Shrink("ident_socket");
+ }
}
};
MODULE_INIT(ModuleIdent);
+
projects / user / henk / code / inspircd.git / blobdiff