X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_geoip.cpp;h=939752875e886ffa78ecdf7af1be71edf30163e7;hb=44f42a13de52c8025942ddab42f51feb36821782;hp=13b35fdfbd6586bf15ce78b48494da206ffcd157;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 13b35fdfb..939752875 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -1,86 +1,86 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
 #include <GeoIP.h>
 
+#ifdef WINDOWS
+# pragma comment(lib, "GeoIP.lib")
+#endif
+
 /* $ModDesc: Provides a way to restrict users by country using GeoIP lookup */
 /* $LinkerFlags: -lGeoIP */
 
 class ModuleGeoIP : public Module
 {
-	GeoIP * gi;
-
-	bool banunknown;
-
-	std::map<std::string, std::string> GeoBans;
-
+	LocalStringExt ext;
+	GeoIP* gi;
 
  public:
-	ModuleGeoIP() 	{
-		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-
-		gi = GeoIP_new(GEOIP_STANDARD);
+	ModuleGeoIP() : ext("geoip_cc", this), gi(NULL)
+	{
 	}
 
-	virtual ~ModuleGeoIP()
+	void init()
 	{
+		gi = GeoIP_new(GEOIP_STANDARD);
+		if (gi == NULL)
+				throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?");
+
+		ServerInstance->Modules->AddService(ext);
+		Implementation eventlist[] = { I_OnSetConnectClass };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	virtual Version GetVersion()
+	~ModuleGeoIP()
 	{
-		return Version("Provides a way to restrict users by country using GeoIP lookup", VF_VENDOR, API_VERSION);
+		GeoIP_delete(gi);
 	}
 
-	virtual void OnRehash(User* user)
+	Version GetVersion()
 	{
-		GeoBans.clear();
-
-		ConfigReader conf;
-
-		banunknown = conf.ReadFlag("geoip", "banunknown", 0);
-
-		for (int i = 0; i < conf.Enumerate("geoban"); ++i)
-		{
-			std::string countrycode = conf.ReadValue("geoban", "country", i);
-			std::string reason = conf.ReadValue("geoban", "reason", i);
-			GeoBans[countrycode] = reason;
-		}
+		return Version("Provides a way to assign users to connect classes by country using GeoIP lookup", VF_VENDOR);
 	}
 
-	virtual ModResult OnUserRegister(User* user)
+	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
 	{
-		/* only do lookups on local users */
-		if (IS_LOCAL(user))
+		std::string* cc = ext.get(user);
+		if (!cc)
 		{
 			const char* c = GeoIP_country_code_by_addr(gi, user->GetIPString());
-			if (c)
-			{
-				std::map<std::string, std::string>::iterator x = GeoBans.find(c);
-				if (x != GeoBans.end())
-					ServerInstance->Users->QuitUser(user,  x->second);
-			}
-			else
-			{
-				if (banunknown)
-					ServerInstance->Users->QuitUser(user, "Could not identify your country of origin. Access denied.");
-			}
+			if (!c)
+				c = "UNK";
+			cc = new std::string(c);
+			ext.set(user, cc);
 		}
-		return MOD_RES_PASSTHRU;
+		std::string geoip = myclass->config->getString("geoip");
+		if (geoip.empty())
+			return MOD_RES_PASSTHRU;
+		irc::commasepstream list(geoip);
+		std::string country;
+		while (list.GetToken(country))
+			if (country == *cc)
+				return MOD_RES_PASSTHRU;
+		return MOD_RES_DENY;
 	}
 };