Minor changes into keycloak addition

Author: aarranz

1.3/Dockerfile

@@ -10,7 +10,7 @@ ENV LOGLEVEL=info
 
 RUN apt-get update && \
     apt-get install -y libmemcached-dev gosu && \
-    pip install --no-cache-dir social-auth-app-django "gunicorn==19.3.0" "psycopg2==2.6" pylibmc pysolr "elasticsearch==2.4.1" wirecloud-keycloak && \
+    pip install --no-cache-dir social-auth-app-django "gunicorn==19.3.0" "psycopg2==2.6" pylibmc pysolr "elasticsearch==2.4.1" && \
     rm -rf /var/lib/apt/lists/* && \
     gosu nobody true
 
@@ -21,7 +21,7 @@ COPY ./docker-entrypoint.sh /
 COPY ./manage.py /usr/local/bin/
 
 RUN adduser --system --group --shell /bin/bash wirecloud && \
-    pip install --no-cache-dir channels asgi_ipc asgi_redis asgi_rabbitmq && \
+    pip install --no-cache-dir channels asgi_ipc asgi_redis asgi_rabbitmq wirecloud_keycloak && \
     mkdir -p /opt/wirecloud_instance /var/www/static && \
     cd /opt && \
     wirecloud-admin startproject wirecloud_instance wirecloud_instance && \

1.3/docker-compose.yml

@@ -53,7 +53,7 @@ services:
             - FORWARDED_ALLOW_IPS=*
             - ELASTICSEARCH2_URL=http://elasticsearch:9200/
             - MEMCACHED_LOCATION=memcached:11211
-            # Uncomment the following environment variables to enable IDM integration
+            # Uncomment the following environment variables to enable FIWARE IDM integration
             #- FIWARE_IDM_SERVER=${FIWARE_IDM_SERVER}
             #- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
             #- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}

1.3/settings.py

@@ -126,23 +126,39 @@
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'wirecloud_instance.wsgi.application'
 
-# FIWARE IdM configuration
-IDM_AUTH = None
-if os.environ.get('FIWARE_IDM_SERVER', '').strip() != '':
-    FIWARE_IDM_SERVER = os.environ.get('FIWARE_IDM_SERVER', '').strip()
-    FIWARE_IDM_PUBLIC_URL = os.environ.get('FIWARE_IDM_PUBLIC_URL', FIWARE_IDM_SERVER).strip()
-    SOCIAL_AUTH_FIWARE_KEY = os.environ.get('SOCIAL_AUTH_FIWARE_KEY', '').strip()
-    SOCIAL_AUTH_FIWARE_SECRET = os.environ.get('SOCIAL_AUTH_FIWARE_SECRET', '').strip()
-    IDM_AUTH = 'fiware' if FIWARE_IDM_SERVER and SOCIAL_AUTH_FIWARE_KEY and SOCIAL_AUTH_FIWARE_SECRET else None
-
-elif os.environ.get('KEYCLOAK_IDM_SERVER', '').strip() != '':
-    KEYCLOAK_IDM_SERVER = os.environ.get('KEYCLOAK_IDM_SERVER', '').strip()
-    KEYCLOAK_REALM = os.environ.get('KEYCLOAK_REALM', '').strip()
-    KEYCLOAK_KEY = os.environ.get('KEYCLOAK_KEY', '').strip()
-    KEYCLOAK_GLOBAL_ROLE = os.environ.get('KEYCLOAK_GLOBAL_ROLE', '').strip() == 'True'
-    SOCIAL_AUTH_KEYCLOAK_KEY = os.environ.get('SOCIAL_AUTH_KEYCLOAK_KEY', '').strip()
-    SOCIAL_AUTH_KEYCLOAK_SECRET = os.environ.get('SOCIAL_AUTH_KEYCLOAK_SECRET', '').strip()
-    IDM_AUTH = 'keycloak' if KEYCLOAK_IDM_SERVER and KEYCLOAK_REALM and KEYCLOAK_KEY and SOCIAL_AUTH_KEYCLOAK_KEY and SOCIAL_AUTH_KEYCLOAK_SECRET else None
+
+# Handle some basic settings
+
+## String settings
+STRING_SETTINGS = (
+    "FIWARE_IDM_SERVER",
+    "FIWARE_IDM_PUBLIC_URL",
+    "SOCIAL_AUTH_FIWARE_KEY",
+    "SOCIAL_AUTH_FIWARE_SECRET",
+    "KEYCLOAK_SERVER",
+    "KEYCLOAK_REALM",
+    "KEYCLOAK_KEY",
+    "SOCIAL_AUTH_KEYCLOAK_KEY",
+    "SOCIAL_AUTH_KEYCLOAK_SECRET",
+)
+for setting in STRING_SETTINGS:
+    value = os.environ.get(setting, "").strip()
+    if value != "":
+        locals()[setting] = value
+
+## Boolean settings
+BOOLEAN_SETTINGS = (
+    "KEYCLOAK_GLOBAL_ROLE",
+)
+for setting in BOOLEAN_SETTINGS:
+    value = os.environ.get(setting, "").strip()
+    if value != "":
+        locals()[setting] = value.lower() == "true"
+
+
+# FIWARE & Keycloak configuration
+IDM_AUTH = 'fiware' if "FIWARE_IDM_SERVER" in locals() and "SOCIAL_AUTH_FIWARE_KEY" in locals() and "SOCIAL_AUTH_FIWARE_SECRET" in locals() else None
+IDM_AUTH = 'keycloak' if "KEYCLOAK_IDM_SERVER" in locals() and "KEYCLOAK_REALM" in locals() and "KEYCLOAK_KEY" in locals() and "SOCIAL_AUTH_KEYCLOAK_KEY" in locals() and "SOCIAL_AUTH_KEYCLOAK_SECRET" in locals() else IDM_AUTH
 
 if IDM_AUTH == 'fiware':
     INSTALLED_APPS += (

1.3/urls.py

@@ -9,7 +9,6 @@
 from wirecloud.commons import authentication as wc_auth
 from wirecloud.fiware import views as wc_fiware
 from wirecloud.keycloak import views as wc_keycloak
-
 import wirecloud.platform.urls
 
 admin.autodiscover()