Version bump

apiserver/config/basic.py

@@ -19,7 +19,7 @@ from pyparsing import (
 
 from apiserver.utilities import json
 
-EXTRA_CONFIG_PATHS = ("/opt/clearml/config",)
+EXTRA_CONFIG_PATHS = ("/opt/trains/config", "/opt/clearml/config")
 DEFAULT_PREFIXES = ("clearml", "trains")
 EXTRA_CONFIG_PATH_SEP = ":" if platform.system() != "Windows" else ";"
 

apiserver/requirements.txt

@@ -12,7 +12,7 @@ funcsigs==1.0.2
 furl>=2.0.0
 gunicorn>=19.7.1
 humanfriendly==4.18
-jinja2==2.10.1
+jinja2==2.11.3
 jsonmodels>=2.3
 jsonschema>=2.6.0
 luqum>=0.10.0

apiserver/schema/services/login.conf

@@ -93,3 +93,19 @@ supported_modes {
         }
     }
 }
+
+logout {
+    authorize: false
+    allow_roles = [ "*" ]
+    "2.13" {
+        description: """ Logout (including SSO, if used)) """
+        request {
+            type: object
+            additionalProperties: false
+        }
+        response {
+            type: object
+            additionalProperties: false
+        }
+    }
+}

apiserver/services/auth.py

@@ -41,14 +41,12 @@ def login(call: APICall, *_, **__):
     )
 
     # Add authorization cookie
-    call.result.cookies[
-        config.get("apiserver.auth.session_auth_cookie_name")
-    ] = call.result.data_model.token
+    call.result.set_auth_cookie(call.result.data_model.token)
 
 
 @endpoint("auth.logout", min_version="2.2")
 def logout(call: APICall, *_, **__):
-    call.result.cookies[config.get("apiserver.auth.session_auth_cookie_name")] = None
+    call.result.set_auth_cookie(None)
 
 
 @endpoint(

apiserver/services/login/__init__.py

@@ -1,5 +1,3 @@
-from jsonmodels.fields import BoolField
-
 from apiserver.apimodels.login import (
     GetSupportedModesRequest,
     GetSupportedModesResponse,
@@ -35,3 +33,8 @@ def supported_modes(call: APICall, _, __: GetSupportedModesRequest):
         ),
         authenticated=call.auth is not None,
     )
+
+
+@endpoint("login.logout", min_version="2.13")
+def logout(call: APICall, _, __):
+    call.result.set_auth_cookie(None)

apiserver/version.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"

docs/apiserver.conf

@@ -1,8 +1,10 @@
 auth {
     # Fixed users login credentials
     # No other user will be able to login
+    # Note: password may be bcrypt-hashed (generate using `python3 -c 'import bcrypt,base64; print(base64.b64encode(bcrypt.hashpw("password".encode(), bcrypt.gensalt())))'`)
     fixed_users {
         enabled: true
+        pass_hashed: false
         users: [
             {
                 username: "jane"