hostname =~ Resolv::IPv4::Regex && (hostname.split(".").map { |e| e.to_i }.max <= 255)
end
- def self.geoiptool(ip)
+ def self.geoiptool(bot, ip)
url = "http://www.geoiptool.com/en/?IP="
regexes = {
:country => %r{Country:.*?<a href=".*?" target="_blank"> (.*?)</a>}m,
:lon => %r{Longitude:.*?<td align="left" class="arial_bold">(.*?)</td>}m
}
res = {}
- raw = Irc::Utils.bot.httputil.get_response(url+ip)
+ raw = bot.httputil.get_response(url+ip)
raw = raw.decompress_body(raw.raw_body)
- regexes.each { |key, regex| res[key] = Iconv.conv('utf-8', 'ISO-8859-1', raw.scan(regex).to_s) }
+ regexes.each { |key, regex| res[key] = raw.scan(regex).join('') }
return res
end
- def self.kapsi(ip)
- url = "http://lakka.kapsi.fi:40086/lookup.yaml?host="
- yaml = Irc::Utils.bot.httputil.get(url+ip)
- return YAML::load(yaml)
- end
-
IPINFODB_URL = "http://api.ipinfodb.com/v2/ip_query.php?key=%{key}&ip=%{ip}"
- def self.ipinfodb(ip)
+ def self.ipinfodb(bot, ip)
+ key = bot.config['geoip.ipinfodb_key']
+ return if not key or key.empty?
url = IPINFODB_URL % {
:ip => ip,
- :key => Irc::Utils.bot.config['geoip.ipinfodb_key']
+ :key => key
}
debug "Requesting #{url}"
- xml = Irc::Utils.bot.httputil.get(url)
+ xml = bot.httputil.get(url)
if xml
obj = REXML::Document.new(xml)
end
JUMP_TABLE = {
- "ipinfodb" => Proc.new { |ip| ipinfodb(ip) },
- "kapsi" => Proc.new { |ip| kapsi(ip) },
- "geoiptool" => Proc.new { |ip| geoiptool(ip) },
+ "ipinfodb" => Proc.new { |bot, ip| ipinfodb(bot, ip) },
+ "geoiptool" => Proc.new { |bot, ip| geoiptool(bot, ip) },
}
- def self.resolve(hostname, api)
+ def self.resolve(bot, hostname, api)
raise InvalidHostError unless valid_host?(hostname)
begin
raise BadAPIError unless JUMP_TABLE.key?(api)
- return JUMP_TABLE[api].call(ip)
+ return JUMP_TABLE[api].call(bot, ip)
end
end
class GeoIpPlugin < Plugin
Config.register Config::ArrayValue.new('geoip.sources',
- :default => [ "ipinfodb", "kapsi", "geoiptool" ],
- :desc => "Which API to use for lookups. Supported values: ipinfodb, kapsi, geoiptool")
+ :default => [ "ipinfodb", "geoiptool" ],
+ :desc => "Which API to use for lookups. Supported values: ipinfodb, geoiptool")
Config.register Config::StringValue.new('geoip.ipinfodb_key',
:default => "",
:desc => "API key for the IPinfoDB geolocation service")
begin
apis = @bot.config['geoip.sources']
apis.compact.each { |api|
- geo = GeoIP::resolve(host, api)
- if geo[:country] != ""
+ geo = GeoIP::resolve(@bot, host, api)
+ if geo and geo[:country] != ""
break
end
}