Shared script instances

src/config/constants.py

@@ -3,3 +3,4 @@
 PARAM_TYPE_EDITABLE_LIST = 'editable_list'
 FILE_TYPE_FILE = 'file'
 FILE_TYPE_DIR = 'dir'
+SHARED_ACCESS_TYPE_ALL = "ALL_USERS"

src/execution/execution_service.py

@@ -4,6 +4,7 @@
 
 from auth.authorization import Authorizer, is_same_user
 from auth.user import User
+from config.constants import SHARED_ACCESS_TYPE_ALL
 from execution.executor import ScriptExecutor
 from model import script_config
 from model.model_helper import is_empty, AccessProhibitedException
@@ -145,7 +146,11 @@ def validate_execution_id(self, execution_id, user, only_active=True, allow_when
 
     @staticmethod
     def _can_access_execution(execution_info: _ExecutionInfo, user_id):
-        return (execution_info is not None) and (is_same_user(execution_info.owner_user.user_id, user_id))
+        if execution_info is None:
+            return False
+        shared_access_type = execution_info.config.access.get('shared_access', {}).get('type')
+        return (shared_access_type == SHARED_ACCESS_TYPE_ALL or \
+                is_same_user(execution_info.owner_user.user_id, user_id))
 
     def get_user_parameter_values(self, execution_id):
         return self._get_for_executor(execution_id,

src/model/script_config.py

@@ -6,6 +6,7 @@
 
 from auth.authorization import ANY_USER
 from config.exceptions import InvalidConfigException
+from config.constants import SHARED_ACCESS_TYPE_ALL
 from model import parameter_config
 from model.model_helper import is_empty, fill_parameter_values, read_bool_from_config, InvalidValueException, \
     read_str_from_config, replace_auth_vars
@@ -180,6 +181,8 @@ def _reload_config(self):
         required_terminal = read_bool_from_config('requires_terminal', config, default=self._pty_enabled_default)
         self.requires_terminal = required_terminal
 
+        self.access = config.get('access', {})
+
         self.output_format = read_output_format(config)
 
         self.output_files = config.get('output_files', [])
@@ -386,6 +389,7 @@ def get_sorted_config(config):
                  'group',
                  'allowed_users',
                  'admin_users',
+                 'access',
                  'schedulable',
                  'include',
                  'output_files',

src/tests/execution_service_test.py

@@ -144,6 +144,13 @@ def test_can_access_different_user_reversed(self):
 
         self.assertFalse(execution_service.can_access(execution_id, DEFAULT_USER_ID))
 
+    def test_can_access_different_user_shared_access(self):
+        execution_service = self.create_execution_service()
+        execution_id = self._start(execution_service)
+        execution_service._execution_infos[execution_id].config.access = {'shared_access': {'type': 'ALL_USERS'}}
+
+        self.assertTrue(execution_service.can_access(execution_id, 'another_user'))
+
     def test_get_audit_name(self):
         execution_service = self.create_execution_service()
         execution_id = self._start(execution_service)

web-src/src/admin/components/scripts-config/ScriptConfigForm.vue

@@ -38,6 +38,11 @@
                 class="col s3 checkbox-field"/>
       <TextField v-model="includeScript" :config="includeScriptField" class="col s5 offset-s1"/>
     </div>
+
+    <div class="row">
+      <CheckBox v-model="globalInstances" :config="globalInstancesField"
+                class="col s3 checkbox-field"/>
+    </div>
   </form>
 </template>
 
@@ -56,6 +61,7 @@ import {
   nameField,
   outputFormatField,
   requiresTerminalField,
+  globalInstancesField,
   scriptPathField,
   workDirField
 } from './script-fields';
@@ -86,6 +92,7 @@ export default {
       description: null,
       workingDirectory: null,
       requiresTerminal: null,
+      globalInstances: null,
       includeScript: null,
       outputFormat: null,
       allowedUsers: [],
@@ -101,6 +108,7 @@ export default {
       allowAllAdminsField,
       outputFormatField,
       requiresTerminalField,
+      globalInstancesField,
       includeScriptField
     }
   },
@@ -125,6 +133,15 @@ export default {
         }
       });
     });
+
+    this.$watch('globalInstances', (globalInstances) => {
+      if (globalInstances) {
+        this.$set(this.value, 'access', {'shared_access': {'type': 'ALL_USERS'}});
+      } else {
+        this.$delete(this.value, 'access');
+      }
+    });
+
   },
 
   watch: {
@@ -136,13 +153,16 @@ export default {
         this.description = config['description'];
         this.workingDirectory = config['working_directory'];
         this.requiresTerminal = get(config, 'requires_terminal', true);
+        this.globalInstances = false;
+        if (config?.access?.shared_access?.type == "ALL_USERS"){
+          this.globalInstances = true;
+        }
         this.includeScript = config['include'];
         this.outputFormat = config['output_format'];
         this.updateAccessFieldInVm(config,
             'allowedUsers',
             'allowAllUsers',
             'allowed_users')
-
         this.updateAccessFieldInVm(config,
             'adminUsers',
             'allowAllAdmins',

web-src/src/admin/components/scripts-config/script-fields.js

@@ -36,4 +36,8 @@ export const requiresTerminalField = {
 export const includeScriptField = {
     name: 'Include config',
     description: 'Allows to include another shared config'
+};
+export const globalInstancesField = {
+    name: 'Shared Script Instances',
+    description: 'Allows script instances to be shared by all users'
 };

web-src/tests/unit/admin/ScriptConfig_test.js

@@ -136,5 +136,38 @@ describe('Test ScriptConfig', function () {
         });
     });
 
+    describe('Test show shared instances access', function () {
+        it('Test show shared instances access unchecked', async function () {
+            store.state.scriptConfig.scriptConfig = {};
+
+            await vueTicks();
+
+            expect(_findField('Shared Script Instances').value).toBe(false);
+        });
+
+        it('Test show shared instances access checked', async function () {
+            store.state.scriptConfig.scriptConfig = {
+                'access': {'shared_access': {'type': 'ALL_USERS'}}
+            };
+
+            await vueTicks();
+
+            expect(_findField('Shared Script Instances').value).toBe(true);
+        });
+    });
+
+    describe('Test edit global_instances', function () {
+        it('Test update global_instances manually unchecked', async function () {
+            await _setValueByUser('Shared Script Instances', false);
+
+            expect(typeof store.state.scriptConfig.scriptConfig.access).toEqual('undefined');
+        });
+
+        it('Test update global_instances manually checked', async function () {
+            await _setValueByUser('Shared Script Instances', true);
+
+            expect(store.state.scriptConfig.scriptConfig.access).toEqual({'shared_access': {'type': 'ALL_USERS'}});
+        });
+    });
 
 });