X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=d20c9d8dd9cc0308f4de73bf2aaeb370e182f41a;hb=f91a61fa22b239384c31526fd11da1e3030aaa96;hp=66bd8835ade5067f23fe9470cf985cce63192f90;hpb=939cb0ba987f927f1ad900d45f98ba6d8e03e9d4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 66bd8835a..d20c9d8dd 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -74,17 +74,15 @@
 class IdentRequestSocket : public EventHandler
 {
  private:
-	User *user;			/* User we are attached to */
-	InspIRCd* ServerInstance;	/* Server instance */
+	LocalUser *user;			/* User we are attached to */
 	bool done;			/* True if lookup is finished */
 	std::string result;		/* Holds the ident string if done */
  public:
 	time_t age;
 
-	IdentRequestSocket(InspIRCd *Server, User* u) : user(u), ServerInstance(Server), result(u->ident)
+	IdentRequestSocket(LocalUser* u) : user(u), result(u->ident)
 	{
 		age = ServerInstance->Time();
-		socklen_t size = 0;
 
 		SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0));
 
@@ -111,7 +109,7 @@ class IdentRequestSocket : public EventHandler
 		}
 
 		/* Attempt to bind (ident requests must come from the ip the query is referring to */
-		if (ServerInstance->SE->Bind(GetFd(), &bindaddr.sa, size) < 0)
+		if (ServerInstance->SE->Bind(GetFd(), bindaddr) < 0)
 		{
 			this->Close();
 			throw ModuleException("failed to bind()");
@@ -120,7 +118,7 @@ class IdentRequestSocket : public EventHandler
 		ServerInstance->SE->NonBlocking(GetFd());
 
 		/* Attempt connection (nonblocking) */
-		if (ServerInstance->SE->Connect(this, &connaddr.sa, size) == -1 && errno != EINPROGRESS)
+		if (ServerInstance->SE->Connect(this, &connaddr.sa, connaddr.sa_size()) == -1 && errno != EINPROGRESS)
 		{
 			this->Close();
 			throw ModuleException("connect() failed");
@@ -277,51 +275,41 @@ class IdentRequestSocket : public EventHandler
 class ModuleIdent : public Module
 {
 	int RequestTimeout;
-	ConfigReader *Conf;
 	SimpleExtItem<IdentRequestSocket> ext;
  public:
-	ModuleIdent(InspIRCd *Me) : Module(Me), ext("ident_socket", this)
+	ModuleIdent() : ext("ident_socket", this)
 	{
-		Conf = new ConfigReader(ServerInstance);
 		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect };
+		Implementation eventlist[] = {
+			I_OnRehash, I_OnUserRegister, I_OnCheckReady,
+			I_OnUserDisconnect, I_OnSetConnectClass
+		};
 		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
 	~ModuleIdent()
 	{
-		delete Conf;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for RFC1413 ident lookups", VF_VENDOR, API_VERSION);
+		return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
 	}
 
 	virtual void OnRehash(User *user)
 	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
+		ConfigReader Conf;
 
-		RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
+		RequestTimeout = Conf.ReadInteger("ident", "timeout", 0, true);
 		if (!RequestTimeout)
 			RequestTimeout = 5;
 	}
 
-	virtual ModResult OnUserRegister(User *user)
+	virtual ModResult OnUserRegister(LocalUser *user)
 	{
-		for (int j = 0; j < Conf->Enumerate("connect"); j++)
-		{
-			std::string hostn = Conf->ReadValue("connect","allow",j);
-			/* XXX: Fixme: does not respect port, limit, etc */
-			if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
-			{
-				bool useident = Conf->ReadFlag("connect", "useident", "yes", j);
-
-				if (!useident)
-					return MOD_RES_PASSTHRU;
-			}
-		}
+		ConfigTag* tag = user->MyClass->config;
+		if (!tag->getBool("useident", true))
+			return MOD_RES_PASSTHRU;
 
 		/* 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. */
@@ -333,7 +321,7 @@ class ModuleIdent : public Module
 
 		try
 		{
-			IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user);
+			IdentRequestSocket *isock = new IdentRequestSocket(IS_LOCAL(user));
 			ext.set(user, isock);
 		}
 		catch (ModuleException &e)
@@ -348,7 +336,7 @@ class ModuleIdent : public Module
 	 * creating a Timer object and especially better than creating a
 	 * Timer per ident lookup!
 	 */
-	virtual ModResult OnCheckReady(User *user)
+	virtual ModResult OnCheckReady(LocalUser *user)
 	{
 		/* Does user have an ident socket attached at all? */
 		IdentRequestSocket *isock = ext.get(user);
@@ -399,14 +387,21 @@ class ModuleIdent : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+	{
+		if (myclass->config->getBool("requireident") && user->ident[0] == '~')
+			return MOD_RES_DENY;
+		return MOD_RES_PASSTHRU;
+	}
+
 	virtual void OnCleanup(int target_type, void *item)
 	{
 		/* Module unloading, tidy up users */
 		if (target_type == TYPE_USER)
-			OnUserDisconnect((User*)item);
+			OnUserDisconnect((LocalUser*)item);
 	}
 
-	virtual void OnUserDisconnect(User *user)
+	virtual void OnUserDisconnect(LocalUser *user)
 	{
 		/* User disconnect (generic socket detatch event) */
 		IdentRequestSocket *isock = ext.get(user);