Merge pull request #12 from IN-CORE/release-1.3.0

created release 1.3.0

.gitignore

@@ -60,3 +60,6 @@ helm/incore/templates/secrets.yaml
 
 # ip database
 IP2LOCATION-LITE-DB5.BIN
+
+# env file
+*.env

CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 From version 1.2.0 the file IP2LOCATION-LITE-DB5.BIN is no longer part of the docker image and will need to be downloaded (after registration) from [ip2location](https://lite.ip2location.com/database/ip-country?lang=en_US) and be placed in /srv/incore_auth.
 
+# [1.3.0] - 2021-21-08
+## Added
+- IP2Location's file location as variable
+
+## Changed
+- Removed adding X-Userinfo from response headers
+
 # [1.2.1] - 2021-10-29
 
 ## Fixed

Dockerfile

@@ -34,7 +34,8 @@ ENV FLASK_APP="app.py" \
     KEYCLOAK_AUDIENCE="" \
     INFLUXDB_V2_URL="" \
     INFLUXDB_V2_ORG="" \
-    INFLUXDB_V2_TOKEN=""
+    INFLUXDB_V2_TOKEN="" \
+    INFLUXDB_V2_FILE_LOCATION="data/IP2LOCATION-LITE-DB5.BIN"
 
 #CMD ["python", "-m", "flask", "run", "--host", "0.0.0.0"]
 CMD ["gunicorn", "app:app", "--config", "/srv/incore_auth/gunicorn.config.py"]

incore_auth/app.py

@@ -12,6 +12,11 @@
 from jose import jwt
 from jose.exceptions import JWTError, ExpiredSignatureError, JWTClaimsError
 from urllib.parse import unquote_plus
+from dotenv import load_dotenv
+
+# Load .env file
+load_dotenv()
+CONTRIBUTION_DB_NAME = os.getenv('INFLUXDB_V2_FILE_LOCATION', 'data/IP2LOCATION-LITE-DB5.BIN')
 
 config = json.load(open("config.json"))
 app = Flask(__name__)
@@ -22,7 +27,7 @@
 
 # setup database for geolocation
 try:
-    geolocation = IP2Location.IP2Location("IP2LOCATION-LITE-DB5.BIN")
+    geolocation = IP2Location.IP2Location(CONTRIBUTION_DB_NAME)
 except:
     app.logger.exception("No IP2Location database found.")
     geolocation = None
@@ -276,16 +281,10 @@ def verify_token():
     elif request.cookies.get('Authorization') is not None:
         response.headers['Authorization'] = unquote_plus(request.cookies['Authorization'])
 
-    # TODO this need checking, does this allow me to impersonate anybody?
-    if request.headers.get('X-UserInfo') is not None:
-        response.headers['X-UserInfo'] = request.headers.get('x-UserInfo')
-    elif request.cookies.get('x-UserInfo') is not None:
-        response.headers['X-UserInfo'] = request.headers.get('x-UserInfo')
-
     if request.headers.get('X-UserGroup') is not None:
         response.headers['X-UserGroup'] = request.headers.get('x-UserGroup')
-    elif request.cookies.get('x-UserInfo') is not None:
-        response.headers['X-UserGroup'] = request.headers.get('x-UserGroup')
+    elif request.cookies.get('X-UserGroup') is not None:
+        response.headers['X-UserGroup'] = request.cookies['X-UserGroup']
 
     return response
 

incore_auth/requirements.txt

@@ -6,3 +6,4 @@ python-jose==3.1.0
 influxdb-client==1.14.0
 IP2Location==8.5.1
 geohash2==1.1
+python-dotenv==0.10.3