#include "inspircd.h"
+enum
+{
+ // Either the ident looup has not started yet or the user is registered.
+ IDENT_UNKNOWN = 0,
+
+ // Ident lookups are not enabled and a user has been marked as being skipped.
+ IDENT_SKIPPED,
+
+ // Ident looups are not enabled and a user has been an insecure ident prefix.
+ IDENT_PREFIXED,
+
+ // An ident lookup was done and an ident was found.
+ IDENT_FOUND,
+
+ // An ident lookup was done but no ident was found
+ IDENT_MISSING
+};
+
/* --------------------------------------------------------------
* Note that this is the third incarnation of m_ident. The first
* two attempts were pretty crashy, mainly due to the fact we tried
{
private:
unsigned int timeout;
- bool NoLookupPrefix;
- SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
+ bool prefixunqueried;
+ SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> socket;
+ LocalIntExt state;
static void PrefixIdent(LocalUser* user)
{
public:
ModuleIdent()
- : ext("ident_socket", ExtensionItem::EXT_USER, this)
+ : socket("ident_socket", ExtensionItem::EXT_USER, this)
+ , state("ident_state", ExtensionItem::EXT_USER, this)
{
}
{
ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
timeout = tag->getDuration("timeout", 5, 1, 60);
- NoLookupPrefix = tag->getBool("nolookupprefix", false);
+ prefixunqueried = tag->getBool("prefixunqueried");
}
void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
{
- IdentRequestSocket* isock = ext.get(user);
+ IdentRequestSocket* isock = socket.get(user);
if (isock)
{
// If an ident lookup request was in progress then cancel it.
isock->Close();
- ext.unset(user);
+ socket.unset(user);
}
// The ident protocol requires that clients are connecting over a protocol with ports.
ConfigTag* tag = user->MyClass->config;
if (!tag->getBool("useident", true))
+ {
+ state.set(user, IDENT_SKIPPED);
return;
+ }
user->WriteNotice("*** Looking up your ident...");
try
{
isock = new IdentRequestSocket(user);
- ext.set(user, isock);
+ socket.set(user, isock);
}
catch (ModuleException &e)
{
ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE
{
/* Does user have an ident socket attached at all? */
- IdentRequestSocket *isock = ext.get(user);
+ IdentRequestSocket* isock = socket.get(user);
if (!isock)
{
- if (NoLookupPrefix)
+ if (prefixunqueried && state.get(user) == IDENT_SKIPPED)
+ {
PrefixIdent(user);
+ state.set(user, IDENT_PREFIXED);
+ }
return MOD_RES_PASSTHRU;
}
if (ServerInstance->Time() >= compare)
{
/* Ident timeout */
+ state.set(user, IDENT_MISSING);
PrefixIdent(user);
user->WriteNotice("*** Ident lookup timed out, using " + user->ident + " instead.");
}
/* wooo, got a result (it will be good, or bad) */
else if (isock->result.empty())
{
+ state.set(user, IDENT_MISSING);
PrefixIdent(user);
user->WriteNotice("*** Could not find your ident, using " + user->ident + " instead.");
}
else
{
+ state.set(user, IDENT_FOUND);
user->ChangeIdent(isock->result);
user->WriteNotice("*** Found your ident, '" + user->ident + "'");
}
isock->Close();
- ext.unset(user);
+ socket.unset(user);
return MOD_RES_PASSTHRU;
}
ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
{
- if (myclass->config->getBool("requireident") && user->ident[0] == '~')
+ if (myclass->config->getBool("requireident") && state.get(user) != IDENT_FOUND)
return MOD_RES_DENY;
return MOD_RES_PASSTHRU;
}
+
+ void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
+ {
+ // Clear this as it is no longer necessary.
+ state.unset(user);
+ }
};
MODULE_INIT(ModuleIdent)