assemblyline-core 4.5.0.dev6__tar.gz → 4.5.0.dev7__tar.gz

{assemblyline-core-4.5.0.dev6 → assemblyline-core-4.5.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.0.dev6
+Version: 4.5.0.dev7
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline-core-4.5.0.dev7/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.0.dev7

{assemblyline-core-4.5.0.dev6 → assemblyline-core-4.5.0.dev7}/assemblyline_core/signature_client.py

@@ -1,11 +1,12 @@
 import logging
 
 from assemblyline.common import forge
-from assemblyline.common.isotime import iso_to_epoch
+from assemblyline.common.isotime import iso_to_epoch, now_as_iso
 from assemblyline.common.memory_zip import InMemoryZip
 from assemblyline.datastore.helper import AssemblylineDatastore
 from assemblyline.odm.messages.changes import Operation
 from assemblyline.odm.models.service import SIGNATURE_DELIMITERS
+from assemblyline.odm.models.signature import DEPLOYED_STATUSES, STALE_STATUSES, DRAFT_STATUSES
 
 
 DEFAULT_DELIMITER = "\n\n"
@@ -133,6 +134,48 @@ class SignatureClient:
 
         return {"success": 0, "errors": [], "skipped": skip_list}
 
+    def change_status(self, signature_id, status, user={}):
+        possible_statuses = DEPLOYED_STATUSES + DRAFT_STATUSES
+        if status not in possible_statuses:
+            raise ValueError(f"You cannot apply the status {status} on yara rules.")
+
+        data = self.datastore.signature.get(signature_id, as_obj=False)
+        if data:
+            if user and not CLASSIFICATION.is_accessible(user['classification'],
+                                                         data.get('classification', CLASSIFICATION.UNRESTRICTED)):
+                raise PermissionError("You are not allowed change status on this signature")
+
+            if data['status'] in STALE_STATUSES and status not in DRAFT_STATUSES:
+                raise ValueError(f"Only action available while signature in {data['status']} "
+                                 f"status is to change signature to a DRAFT status. ({', '.join(DRAFT_STATUSES)})")
+
+            if data['status'] in DEPLOYED_STATUSES and status in DRAFT_STATUSES:
+                raise ValueError(f"You cannot change the status of signature {signature_id} from "
+                                 f"{data['status']} to {status}.")
+
+            today = now_as_iso()
+            uname = user.get('uname')
+
+            if status not in ['DISABLED', 'INVALID', 'TESTING']:
+                query = f"status:{status} AND signature_id:{data['signature_id']} AND NOT id:{signature_id}"
+                others_operations = [
+                    ('SET', 'last_modified', today),
+                    ('SET', 'state_change_date', today),
+                    ('SET', 'state_change_user', uname),
+                    ('SET', 'status', 'DISABLED')
+                ]
+                self.datastore.signature.update_by_query(query, others_operations)
+
+            operations = [
+                ('SET', 'last_modified', today),
+                ('SET', 'state_change_date', today),
+                ('SET', 'state_change_user', uname),
+                ('SET', 'status', status)
+            ]
+
+            return self.datastore.signature.update(signature_id, operations), data
+        raise FileNotFoundError(f"Signature not found. ({signature_id})")
+
     def download(self, query=None, access=None) -> bytes:
         if not query:
             query = "*"

{assemblyline-core-4.5.0.dev6 → assemblyline-core-4.5.0.dev7}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-core
-Version: 4.5.0.dev6
+Version: 4.5.0.dev7
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

{assemblyline-core-4.5.0.dev6 → assemblyline-core-4.5.0.dev7}/test/test_signature_client.py

@@ -4,16 +4,18 @@ import pytest
 
 from assemblyline.odm.models.signature import Signature
 from assemblyline.odm.randomizer import random_model_obj
-from assemblyline.odm.random_data import create_signatures, wipe_signatures
+from assemblyline.odm.random_data import create_signatures, wipe_signatures, create_users, wipe_users
 from assemblyline_core.signature_client import SignatureClient
 
 
 @pytest.fixture(scope="module")
 def client(datastore_connection):
     try:
+        create_users(datastore_connection)
         create_signatures(datastore_connection)
         yield SignatureClient(datastore_connection)
     finally:
+        wipe_users(datastore_connection)
         wipe_signatures(datastore_connection)
 
 
@@ -32,11 +34,11 @@ def test_add_update_signature(client):
     added_sig = client.datastore.signature.get(key, as_obj=False)
     assert data == added_sig
 
-    # Change the signature status
-    assert client.datastore.signature.update(key,
-                                             operations=[(client.datastore.signature.UPDATE_SET, "status", "DISABLED")])
+    # Change the signature status as a user
+    success, _ = client.change_status(key, "DISABLED", client.datastore.user.get('user', as_obj=False))
+    assert success
 
-    # Update signature data
+    # Update signature data as an internal component
     new_sig_data = "NEW SIGNATURE DATA"
     data['data'] = new_sig_data
     success, key, _ = client.add_update(data)
@@ -44,7 +46,7 @@ def test_add_update_signature(client):
     assert expected_key == key
     modded_sig = client.datastore.signature.get(key, as_obj=False)
     assert modded_sig["data"] == new_sig_data
-    # Was state kept?
+    # Was state kept from user setting?
     assert "DISABLED" == modded_sig.pop('status')
 
 
@@ -74,8 +76,8 @@ def test_add_update_signature_many(client):
     assert data == added_sig
 
     # Change the signature status
-    assert client.datastore.signature.update(key,
-                                             operations=[(client.datastore.signature.UPDATE_SET, "status", "DISABLED")])
+    success, _ = client.change_status(key, "DISABLED", client.datastore.user.get('user', as_obj=False))
+    assert success
 
     # Update signature data
     new_sig_data = "NEW SIGNATURE DATA"

assemblyline-core-4.5.0.dev6/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.0.dev6