Merge branch 'v3-fixes' into 'main'

v3.0.1

See merge request isard/isardvdi!319

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.0.1] - 2021-08-27
+
+### Fixed
+
+- Temporary desktops didn't start
+- Some temporary desktops logout user as the allowed filter had a bug
+
+### Removed
+
+- Removed unused BACKEND variables from isardvdi.cfg
+
 ## [3.0.0] - 2021-08-25 | Gran Paradiso
 
 *Note*: it is possible to upgrade from version `2.0.0-rc1` to `3.0.0`, but we don't assure you everything will work (though it probably will). For a stable installation, start from scratch. 

api/src/api/libv2/api_socketio_domains.py

@@ -86,7 +86,8 @@ def run(self):
                             data=c['old_val']
                         else:
                             if not c['new_val']['id'].startswith('_'): continue
-                            if c['new_val']['status'] not in ['Creating','Shutting-down','Stopping','Stopped','Starting','Started','Failed']: continue
+                            if c['new_val']['status'] not in ['Creating','CreatingAndStarting','Shutting-down','Stopping','Stopped','Starting','Started','Failed']: continue
+
                             if c['new_val']['kind'] != 'desktop':
                                 item='template'
                             else:

api/src/api/views/decorators.py

@@ -121,9 +121,18 @@ def allowedTemplateId(payload,template_id):
     alloweds=template['allowed']
     if payload['role_id'] == 'admin': return True
     if payload['role_id'] == 'manager' and payload['category_id'] == template['category']: return True
-    if alloweds['categories'] and payload['category_id'] in alloweds['categories']: return True
-    if alloweds['groups'] and payload['group_id'] in alloweds['groups']: return True
-    if alloweds['users'] and payload['user_id'] in alloweds['users']: return True
+    if alloweds['roles'] != False:
+        if alloweds['roles'] == []: return True
+        if payload['role_id'] in alloweds['roles']: return True
+    if alloweds['categories'] != False:
+        if alloweds['categories'] == []: return True
+        if payload['category_id'] in alloweds['categories']: return True
+    if alloweds['groups'] != False:
+        if alloweds['groups'] == []: return True
+        if payload['group_id'] in alloweds['groups']: return True
+    if alloweds['users'] != False:
+        if alloweds['groups'] == []: return True
+        if payload['user_id'] in alloweds['users']: return True
     return False
 
 # def allowedId(payload,category_id, alloweds):

isardvdi.cfg.example

@@ -227,35 +227,6 @@ AUTHENTICATION_DB_HOST=isard-db
 ###################### BACKEND config
 
 BACKEND_HOST=localhost
-BACKEND_REDIS_HOST=isard-redis
-BACKEND_REDIS_PASSWORD=
-BACKEND_AUTH_AUTOREGISTRATION=true
-
-## Github Login
-# Create your Github OAuth credentials at https://github.com/settings/developers
-# Homepage URL: https://domain.tld
-# Authorization callback URL: https://domain.tld/callback/github
-# Change BACKEND_HOST to domain.tld
-# BACKEND_AUTH_GITHUB_HOST=api.github.com
-# BACKEND_AUTH_GITHUB_ID=id
-# BACKEND_AUTH_GITHUB_SECRET=secret
-
-## Google Login
-# Create your Google OAUTH credentials at https://console.developers.google.com/apis/credentials
-# Authorized redirect URIs: https://domain.tld/callback/google
-# Change BACKEND_HOST to domain.tld
-# BACKEND_AUTH_GOOGLE_ID=id
-# BACKEND_AUTH_GOOGLE_SECRET=secret
-
-# BACKEND_AUTH_SAML_CERT_PATH=/keys/saml.cert
-# BACKEND_AUTH_SAML_KEY_PATH=/keys/saml.key
-# BACKEND_AUTH_SAML_IDP_URL=https://<yoursamlserver
-# BACKEND_AUTH_SAML_IDP_METADATA_PATH=/metadata/shibboleth.xml
-# BACKEND_AUTH_SAML_CALLBACK_URL=https://<yourdomain>
-# BACKEND_AUTH_SAML_ATTR_ID=uid
-# BACKEND_AUTH_SAML_ATTR_NAME=displayName
-BACKEND_ISARD_API_HOST=isard-api
-BACKEND_MANTEINANCE_ADMINS=admin
 
 # VIDEO config
 ###########################################################