assemblyline-core 4.5.1.dev264__tar.gz → 4.5.1.dev268__tar.gz

{assemblyline-core-4.5.1.dev264 → assemblyline-core-4.5.1.dev268}/PKG-INFO

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

assemblyline-core-4.5.1.dev268/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.1.dev268

{assemblyline-core-4.5.1.dev264 → assemblyline-core-4.5.1.dev268}/assemblyline_core/badlist_client.py

@@ -42,8 +42,6 @@ class BadlistClient:
 
             hashed_value = f"{tag_data['type']}: {tag_data['value']}".encode('utf8')
             data['hashes'] = {
-                'md5': hashlib.md5(hashed_value).hexdigest(),
-                'sha1': hashlib.sha1(hashed_value).hexdigest(),
                 'sha256': hashlib.sha256(hashed_value).hexdigest()
             }
 
@@ -60,7 +58,7 @@ class BadlistClient:
         data['added'] = data['updated'] = now_as_iso()
 
         # Find the best hash to use for the key
-        for hash_key in ['sha256', 'sha1', 'md5']:
+        for hash_key in ['sha256', 'sha1', 'md5', 'tlsh', 'ssdeep']:
             qhash = data['hashes'].get(hash_key, None)
             if qhash:
                 break

{assemblyline-core-4.5.1.dev264 → assemblyline-core-4.5.1.dev268}/assemblyline_core/safelist_client.py

@@ -41,8 +41,6 @@ class SafelistClient:
 
             hashed_value = f"{tag_data['type']}: {tag_data['value']}".encode('utf8')
             data['hashes'] = {
-                'md5': hashlib.md5(hashed_value).hexdigest(),
-                'sha1': hashlib.sha1(hashed_value).hexdigest(),
                 'sha256': hashlib.sha256(hashed_value).hexdigest()
             }
 
@@ -58,8 +56,6 @@ class SafelistClient:
 
             hashed_value = f"signature: {sig_data['name']}".encode('utf8')
             data['hashes'] = {
-                'md5': hashlib.md5(hashed_value).hexdigest(),
-                'sha1': hashlib.sha1(hashed_value).hexdigest(),
                 'sha256': hashlib.sha256(hashed_value).hexdigest()
             }
 
@@ -77,7 +73,7 @@ class SafelistClient:
         data['added'] = data['updated'] = now_as_iso()
 
         # Find the best hash to use for the key
-        for hash_key in ['sha256', 'sha1', 'md5']:
+        for hash_key in ['sha256', 'sha1', 'md5', 'tlsh', 'ssdeep']:
             qhash = data['hashes'].get(hash_key, None)
             if qhash:
                 break

{assemblyline-core-4.5.1.dev264 → assemblyline-core-4.5.1.dev268}/assemblyline_core.egg-info/PKG-INFO

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

{assemblyline-core-4.5.1.dev264 → assemblyline-core-4.5.1.dev268}/test/test_badlist_client.py

@@ -138,11 +138,7 @@ def test_badlist_add_tag(client):
             'network': None
         },
         'dtl': 15,
-        'hashes': {'md5': hashlib.md5(hashed_value).hexdigest(),
-                   'sha1': hashlib.sha1(hashed_value).hexdigest(),
-                   'sha256': expected_qhash,
-                   'ssdeep': None,
-                   'tlsh': None},
+        'hashes': {'sha256': expected_qhash},
         'tag': {'type': tag_type,
                 'value': tag_value},
         'sources': [BAD_SOURCE, ADMIN_SOURCE],
@@ -187,6 +183,9 @@ def test_badlist_add_tag(client):
     for source in ds_sl['sources']:
         source['classification'] = CLASSIFICATION.normalize_classification(source['classification'])
 
+    for hashtype in ['md5', 'sha1', 'ssdeep', 'tlsh']:
+        ds_sl['hashes'].pop(hashtype, None)
+
     # Test rest
     assert ds_sl == sl_data_original
 

{assemblyline-core-4.5.1.dev264 → assemblyline-core-4.5.1.dev268}/test/test_safelist_client.py

@@ -128,9 +128,7 @@ def test_safelist_add_tag(client):
     # Generate a random safelist
     sl_data = {
         'dtl': 15,
-        'hashes': {'md5': hashlib.md5(hashed_value).hexdigest(),
-                   'sha1': hashlib.sha1(hashed_value).hexdigest(),
-                   'sha256': expected_qhash},
+        'hashes': {'sha256': expected_qhash},
         'tag': {'type': tag_type,
                 'value': tag_value},
         'sources': [NSRL_SOURCE, ADMIN_SOURCE],
@@ -177,6 +175,9 @@ def test_safelist_add_tag(client):
     for source in ds_sl['sources']:
         source['classification'] = CLASSIFICATION.normalize_classification(source['classification'])
 
+    for hashtype in ['md5', 'sha1']:
+        ds_sl['hashes'].pop(hashtype, None)
+
     # Test rest
     assert ds_sl == sl_data_original
 
@@ -188,9 +189,7 @@ def test_safelist_add_signature(client):
 
     # Generate a random safelist
     sl_data = {
-        'hashes': {'md5': hashlib.md5(hashed_value).hexdigest(),
-                   'sha1': hashlib.sha1(hashed_value).hexdigest(),
-                   'sha256': expected_qhash},
+        'hashes': {'sha256': expected_qhash},
         'signature': {'name': sig_name},
         'sources': [ADMIN_SOURCE],
         'type': 'signature'
@@ -234,6 +233,9 @@ def test_safelist_add_signature(client):
     for source in ds_sl['sources']:
         source['classification'] = CLASSIFICATION.normalize_classification(source['classification'])
 
+    for hashtype in ['md5', 'sha1']:
+        ds_sl['hashes'].pop(hashtype, None)
+
     # Test rest
     assert ds_sl == sl_data_original
 

assemblyline-core-4.5.1.dev264/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.1.dev264