Hotfix/config studies -> master (#852)

replica of PR #846 (already merged in staging) to master
* Added switch to disable studies in webserver config

Author: pcrespov

services/web/server/src/simcore_service_webserver/application_config.py

@@ -45,6 +45,7 @@ def create_schema():
             "client_outdir": T.String(),
             "log_level": T.Enum(*logging._nameToLevel.keys()), # pylint: disable=protected-access
             "testing": T.Bool(),
+            "studies_access_enabled": T.Bool(),
         }),
         db_config.CONFIG_SECTION_NAME: db_config.schema,
         director_config.CONFIG_SECTION_NAME: director_config.schema,

services/web/server/src/simcore_service_webserver/config/host-dev-config.yaml

@@ -4,7 +4,8 @@ main:
   host: 127.0.0.1
   log_level: INFO
   port: 8080
-  testing: true
+  testing: True
+  studies_access_enabled: True
 db:
   enabled: True
   init_tables: True

services/web/server/src/simcore_service_webserver/config/server-defaults.yaml

@@ -5,6 +5,7 @@ main:
   log_level: DEBUG
   port: 8080
   testing: true
+  studies_access_enabled: True
 director:
   host: director
   port: 8001

services/web/server/src/simcore_service_webserver/config/server-docker-dev.yaml

@@ -7,6 +7,7 @@ main:
   client_outdir: ${SIMCORE_WEB_OUTDIR}
   log_level: DEBUG
   testing: True
+  studies_access_enabled: False
 director:
   host: ${DIRECTOR_HOST}
   port: ${DIRECTOR_PORT}

services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml

@@ -7,6 +7,7 @@ main:
   client_outdir: ${SIMCORE_WEB_OUTDIR}
   log_level: INFO
   testing: False
+  studies_access_enabled: False
 director:
   host: ${DIRECTOR_HOST}
   port: ${DIRECTOR_PORT}

services/web/server/src/simcore_service_webserver/config/server-template.yaml

@@ -6,6 +6,7 @@ main:
   client_outdir: ${SIMCORE_WEB_OUTDIR}
   log_level: DEBUG
   testing: True
+  studies_access_enabled: False
 director:
   host: ${DIRECTOR_HOST}
   port: ${DIRECTOR_PORT}

services/web/server/src/simcore_service_webserver/studies_access.py

@@ -19,6 +19,8 @@
 
 from aiohttp import web
 
+from servicelib.application_keys import APP_CONFIG_KEY
+
 from .resources import resources
 from .security_api import is_anonymous, remember
 from .statics import INDEX_RESOURCE_NAME
@@ -196,15 +198,20 @@ async def access_study(request: web.Request) -> web.Response:
     raise response
 
 
-
-
 def setup(app: web.Application):
 
+    cfg = app[APP_CONFIG_KEY]["main"]
+    if not cfg["studies_access_enabled"]:
+        log.warning("'%s' setup explicitly disabled in config", __name__)
+        return False
+
     # TODO: make sure that these routes are filtered properly in active middlewares
     app.router.add_routes([
         web.get(r"/study/{id}", access_study, name="study"),
     ])
 
+    return True
+
 
 # alias
 setup_studies_access = setup

services/web/server/tests/unit/with_postgres/config.yaml

@@ -4,7 +4,8 @@ main:
   host: 127.0.0.1
   log_level: DEBUG
   port: 8080
-  testing: true
+  testing: True
+  studies_access_enabled: True
 director:
   enabled: False
   host: director

services/web/server/tests/unit/with_postgres/test_access_to_studies.py

@@ -79,8 +79,8 @@ def client(loop, aiohttp_client, aiohttp_unused_port, app_cfg, postgres_service,
     setup_rest(app, debug=True) # TODO: why should we need this??
     setup_login(app)
     setup_users(app)
-    assert setup_projects(app)
-    setup_studies_access(app)
+    assert setup_projects(app), "Shall not skip this setup"
+    assert setup_studies_access(app), "Shall not skip this setup"
 
     assert studies_access.SHARABLE_TEMPLATE_STUDY_IDS, "Did u change the name again?"
     monkeypatch.setattr(studies_access, 'SHARABLE_TEMPLATE_STUDY_IDS', [SHARED_STUDY_UUID, ])