assemblyline-core 4.7.5.dev146__tar.gz → 4.7.5.dev153__tar.gz

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/PKG-INFO

@@ -1,18 +1,19 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev146
+Version: 4.7.5.dev153
 Summary: Assemblyline 4 - Core components
-Home-page: https://github.com/CybercentreCanada/assemblyline-core/
-Author: CCCS Assemblyline development team
-Author-email: assemblyline@cyber.gc.ca
-License: MIT
-Keywords: assemblyline automated malware analysis gc canada cse-cst cse cst cyber cccs
+Author-email: CCCS Assemblyline development team <assemblyline@cyber.gc.ca>
+License-Expression: MIT
+Project-URL: Repository, https://github.com/CybercentreCanada/assemblyline-core/
+Keywords: assemblyline,automated,malware,analysis,gc,canada,cse-cst,cse,cst,cyber,cccs
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
 Requires-Dist: assemblyline
@@ -21,18 +22,7 @@ Requires-Dist: kubernetes==36.0.3
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: assemblyline_client; extra == "test"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary
 
 [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?sanitize=true)](https://discord.gg/GUAy9wErNu)
 [![](https://img.shields.io/discord/908084610158714900)](https://discord.gg/GUAy9wErNu)

assemblyline_core-4.7.5.dev153/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.5.dev153

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/assemblyline_core/scaler/controllers/kubernetes_ctl.py

@@ -1127,9 +1127,14 @@ class KubernetesController(ControllerInterface):
                     not_valid_before=(datetime.utcnow() - timedelta(days=1)),
                     not_valid_after=(datetime.utcnow() + timedelta(days=CERTIFICATE_VALIDITY_PERIOD)),
                     public_key=cert_key.public_key(),
-                    serial_number=x509.random_serial_number()).add_extension(
-                        x509.SubjectAlternativeName([x509.DNSName(deployment_name)]),
-                    critical=False).sign(rootca_pk, hashes.SHA256())
+                    serial_number=x509.random_serial_number()
+                ).add_extension(
+                    x509.SubjectAlternativeName([x509.DNSName(deployment_name)]),
+                    critical=False
+                ).add_extension(
+                    x509.AuthorityKeyIdentifier.from_issuer_public_key(rootca_cert.public_key()),
+                    critical=False
+                ).sign(rootca_pk, hashes.SHA256())
 
                 return V1Secret(metadata=V1ObjectMeta(name=cert_secret_name, namespace=self.namespace),
                                 type='kubernetes.io/tls',

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/assemblyline_core/updater/run_updater.py

@@ -625,7 +625,7 @@ class ServiceUpdater(ThreadedCoreBase):
             # Clear out any old dead containers
             self.controller.cleanup_stale()
 
-            self.log.info("[CI] Done installing services, waiting {UPDATE_CHECK_INTERVAL} seconds for next install...")
+            self.log.info(f"[CI] Done installing services, waiting {UPDATE_CHECK_INTERVAL} seconds for next install...")
             time.sleep(UPDATE_CHECK_INTERVAL)
 
     def container_updates(self):

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/assemblyline_core.egg-info/PKG-INFO

@@ -1,18 +1,19 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev146
+Version: 4.7.5.dev153
 Summary: Assemblyline 4 - Core components
-Home-page: https://github.com/CybercentreCanada/assemblyline-core/
-Author: CCCS Assemblyline development team
-Author-email: assemblyline@cyber.gc.ca
-License: MIT
-Keywords: assemblyline automated malware analysis gc canada cse-cst cse cst cyber cccs
+Author-email: CCCS Assemblyline development team <assemblyline@cyber.gc.ca>
+License-Expression: MIT
+Project-URL: Repository, https://github.com/CybercentreCanada/assemblyline-core/
+Keywords: assemblyline,automated,malware,analysis,gc,canada,cse-cst,cse,cst,cyber,cccs
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
 Requires-Dist: assemblyline
@@ -21,18 +22,7 @@ Requires-Dist: kubernetes==36.0.3
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: assemblyline_client; extra == "test"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary
 
 [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?sanitize=true)](https://discord.gg/GUAy9wErNu)
 [![](https://img.shields.io/discord/908084610158714900)](https://discord.gg/GUAy9wErNu)

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/assemblyline_core.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENCE.md
 README.md
-setup.cfg
-setup.py
+pyproject.toml
 assemblyline_core/VERSION
 assemblyline_core/__init__.py
 assemblyline_core/badlist_client.py

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/assemblyline_core.egg-info/top_level.txt

@@ -1 +1,2 @@
 assemblyline_core
+pipelines

assemblyline_core-4.7.5.dev153/pyproject.toml

@@ -0,0 +1,69 @@
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "assemblyline-core"
+description = "Assemblyline 4 - Core components"
+readme = { file = "README.md", content-type = "text/markdown" }
+license = "MIT"
+requires-python = ">=3.11"
+dynamic = ["version"]
+authors = [
+    { name = "CCCS Assemblyline development team", email = "assemblyline@cyber.gc.ca" },
+]
+keywords = [
+    "assemblyline",
+    "automated",
+    "malware",
+    "analysis",
+    "gc",
+    "canada",
+    "cse-cst",
+    "cse",
+    "cst",
+    "cyber",
+    "cccs",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+dependencies = [
+    "assemblyline",
+    "docker",
+    "kubernetes==36.0.3",
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "assemblyline_client",
+]
+
+[project.urls]
+Repository = "https://github.com/CybercentreCanada/assemblyline-core/"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.dynamic]
+version = { file = ["assemblyline_core/VERSION"] }
+
+[tool.setuptools.packages.find]
+exclude = ["deployment*", "test*"]
+
+[tool.setuptools.package-data]
+"*" = [
+    "*classification.yml",
+    "*.magic",
+    "VERSION",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["test"]

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/setup.cfg

@@ -1,6 +1,3 @@
-[tool:pytest]
-testpaths = test
-
 [egg_info]
 tag_build = 
 tag_date = 0

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/test/test_replay.py

@@ -1,5 +1,6 @@
 import collections
 import json
+from time import sleep
 import os
 import random
 import tarfile
@@ -287,6 +288,11 @@ def test_replay_single_data_collection(datastore, creator, creator_worker, loade
 
     # Test replay creator
     getattr(creator.client, f'setup_{collection}_input_queue')(once=True)
+
+    # Wait at least a second to make sure the item gets queued
+    sleep(1)
+
+    # Assert that the message has been received and queued for tasking
     assert creator.client.queues[collection].length() == 1
     assert creator.client.queues[collection].peek_next()['id'] == item.id
     # Test replay creator worker

{assemblyline_core-4.7.5.dev146 → assemblyline_core-4.7.5.dev153}/test/test_signature_client.py

@@ -1,4 +1,3 @@
-import json
 import random
 import pytest
 

assemblyline_core-4.7.5.dev146/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.5.dev146

assemblyline_core-4.7.5.dev146/setup.py

@@ -1,55 +0,0 @@
-
-import os
-
-from setuptools import find_packages, setup
-
-# Try to load the version from a datafile in the package
-package_version = "4.0.0.dev0"
-package_version_path = os.path.join(os.path.dirname(__file__), 'assemblyline_core', 'VERSION')
-if os.path.exists(package_version_path):
-    with open(package_version_path) as package_version_file:
-        package_version = package_version_file.read().strip()
-
-# read the contents of your README file
-this_directory = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name="assemblyline-core",
-    version=package_version,
-    description="Assemblyline 4 - Core components",
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url="https://github.com/CybercentreCanada/assemblyline-core/",
-    author="CCCS Assemblyline development team",
-    author_email="assemblyline@cyber.gc.ca",
-    license="MIT",
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Libraries',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-    ],
-    keywords="assemblyline automated malware analysis gc canada cse-cst cse cst cyber cccs",
-    packages=find_packages(exclude=['deployment/*', 'test/*']),
-    install_requires=[
-        'assemblyline',
-        'docker',
-        'kubernetes==36.0.3',
-    ],
-    extras_require={
-        'test': [
-            'pytest',
-            'assemblyline_client'
-        ]
-    },
-    tests_require=[
-        'pytest',
-    ],
-    package_data={
-        '': ["*classification.yml", "*.magic", "VERSION"]
-    }
-)