summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-02-13 16:41:24 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-02-13 16:41:24 +0000
commit6655a0d80e988c06188e8d7f5a4bb965884ba88f (patch)
tree3197969d4e3a30e187530df6018a3ea76b4246a2 /src/modules
parent753f492c4f71bd4445a77e292370b6e7735010a9 (diff)
Change GeoIP to be a connect block matcher
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12450 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_geoip.cpp68
1 files changed, 29 insertions, 39 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 4632da22b..cdd269003 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -21,62 +21,52 @@
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);
-
+ ModuleGeoIP() : ext("geoip_cc", this)
+ {
gi = GeoIP_new(GEOIP_STANDARD);
}
- virtual ~ModuleGeoIP()
+ void init()
{
+ 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);
+ 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(LocalUser* user)
+ ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
{
- 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
+ std::string* cc = ext.get(user);
+ if (!cc)
{
- if (banunknown)
- ServerInstance->Users->QuitUser(user, "Could not identify your country of origin. Access denied.");
+ const char* c = GeoIP_country_code_by_addr(gi, user->GetIPString());
+ 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;
}
};