assemblyline-core 4.6.1.dev58__tar.gz → 4.6.1.dev60__tar.gz

{assemblyline_core-4.6.1.dev58 → assemblyline_core-4.6.1.dev60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.6.1.dev58
+Version: 4.6.1.dev60
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.6.1.dev60/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.6.1.dev60

{assemblyline_core-4.6.1.dev58 → assemblyline_core-4.6.1.dev60}/assemblyline_core/plumber/run_plumber.py

@@ -11,7 +11,7 @@ from copy import deepcopy
 from typing import Optional
 
 from assemblyline.common.constants import service_queue_name
-from assemblyline.common.forge import get_config, get_service_queue
+from assemblyline.common.forge import get_service_queue
 from assemblyline.common.isotime import DAY_IN_SECONDS, now_as_iso
 from assemblyline.odm.models.apikey import get_apikey_id
 from assemblyline.odm.models.error import Error
@@ -204,7 +204,9 @@ class Plumber(CoreBase):
         if self.config.auth.apikey_max_dtl is not None:
             expiry_ts = now_as_iso(self.config.auth.apikey_max_dtl * DAY_IN_SECONDS)
 
-        for user in self.datastore.user.stream_search(query="*", fl="*", as_obj=False):
+        changes_made = False
+        for user in self.datastore.user.stream_search(query="*", fl="uname,apikeys,type,roles", as_obj=False):
+            changes_made = True
             uname = user['uname']
             apikeys = user['apikeys']
 
@@ -216,11 +218,11 @@ class Plumber(CoreBase):
                 if old_apikey['acl'] == ["C"]:
 
                     roles = [r for r in old_apikey['roles']
-                                if r in load_roles(user['type'], user['roles'])]
+                                if r in load_roles(user['type'], user.get('roles'))]
 
                 else:
                     roles = [r for r in load_roles_form_acls(old_apikey['acl'], roles)
-                            if r in load_roles(user['type'], user['roles'])]
+                            if r in load_roles(user['type'], user.get('roles'))]
                 new_apikey = {
                     "password": old_apikey['password'],
                     "acl": old_apikey['acl'],
@@ -231,12 +233,13 @@ class Plumber(CoreBase):
                 }
                 self.datastore.apikey.save(key_id, new_apikey)
 
-            user['apikeys'] = {}
-            self.datastore.user.save(uname, user)
+        if changes_made:
+            # Commit changes made to indices
+            self.datastore.apikey.commit()
 
-        # Commit changes made to indices
-        self.datastore.user.commit()
-        self.datastore.apikey.commit()
+            # Update permissions for API keys based on submission customization
+            self.datastore.apikey.update_by_query('roles:"submission_create" AND NOT roles:"submission_customize"',
+                                                  [(self.datastore.apikey.UPDATE_APPEND, 'roles', 'submission_customize')])
 
     def migrate_user_settings(self):
         service_list = self.datastore.list_all_services(as_obj=False)

{assemblyline_core-4.6.1.dev58 → assemblyline_core-4.6.1.dev60}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.6.1.dev58
+Version: 4.6.1.dev60
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.6.1.dev58/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.6.1.dev58