From f8c7271467d84159743d02b1b699fb41bea7e079 Mon Sep 17 00:00:00 2001
From: Andreas Muehlemann <andreas.muehlemann@switch.ch>
Date: Wed, 7 Dec 2016 14:18:21 +0100
Subject: [PATCH] added config option to geoip_country.py

---
 misp_modules/modules/expansion/geoip_country.cfg |  2 ++
 misp_modules/modules/expansion/geoip_country.py  | 13 +++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 misp_modules/modules/expansion/geoip_country.cfg

diff --git a/misp_modules/modules/expansion/geoip_country.cfg b/misp_modules/modules/expansion/geoip_country.cfg
new file mode 100644
index 0000000..ab12f90
--- /dev/null
+++ b/misp_modules/modules/expansion/geoip_country.cfg
@@ -0,0 +1,2 @@
+[defaults]
+database=/opt/misp-modules/var/GeoIP.dat
diff --git a/misp_modules/modules/expansion/geoip_country.py b/misp_modules/modules/expansion/geoip_country.py
index 01e95de..069f20a 100644
--- a/misp_modules/modules/expansion/geoip_country.py
+++ b/misp_modules/modules/expansion/geoip_country.py
@@ -1,5 +1,6 @@
 import json, pygeoip
 import sys, logging
+import ConfigParser
 
 log = logging.getLogger('geoip_country')
 log.setLevel(logging.DEBUG)
@@ -21,7 +22,9 @@ moduleinfo = {'version': '0.1', 'author': 'Andreas Muehlemann',
 moduleconfig = ['database']
 
 # get current db from http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-gi = pygeoip.GeoIP('/opt/misp-modules/var/GeoIP.dat')
+config = ConfigParser.ConfigParser()
+config.read('./geoip_contry.cfg')
+gi = pygeoip.GeoIP(config.get('defaults', 'database')
 
 def handler(q=False):
     if q is False:
@@ -41,12 +44,6 @@ def handler(q=False):
 
     log.debug(toquery)
 
-    #if request.get('config'):
-    #    if request['config'].get('database'):
-    #        gi = pygeoip.GeoIP(request['config'].get('database'))
-    #else:
-    #    gi = pygeoip.GeoIP('/opt/misp-modules/var/GeoIP.dat')
-
     try:
         answer = gi.country_code_by_addr(toquery)
     except:
@@ -55,7 +52,7 @@ def handler(q=False):
 
     r = {'results': [{'types': mispattributes['output'],
                       'values': [str(answer)]}]}
-                     
+
     return r
 
 def introspection():