From cf77807ca7d2767a59e935c717dcc65ce52c70f3 Mon Sep 17 00:00:00 2001
From: cccs-rs <62077998+cccs-rs@users.noreply.github.com>
Date: Sat, 8 Mar 2025 20:24:24 +0000
Subject: [PATCH 1/2] Add a default pattern to UpdateConfig
---
assemblyline/odm/models/service.py | 7 ++++++-
assemblyline/odm/models/service_delta.py | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/assemblyline/odm/models/service.py b/assemblyline/odm/models/service.py
index 8076e21f3..04bde7783 100644
--- a/assemblyline/odm/models/service.py
+++ b/assemblyline/odm/models/service.py
@@ -1,9 +1,13 @@
from __future__ import annotations
+
from typing import Optional as Opt
from assemblyline import odm
from assemblyline.common import forge
-from assemblyline.common.constants import DEFAULT_SERVICE_ACCEPTS, DEFAULT_SERVICE_REJECTS
+from assemblyline.common.constants import (
+ DEFAULT_SERVICE_ACCEPTS,
+ DEFAULT_SERVICE_REJECTS,
+)
Classification = forge.get_classification()
@@ -109,6 +113,7 @@ class UpdateConfig(odm.Model):
default="double_new_line",
description="Delimiter used when given a list of signatures")
custom_delimiter = odm.Optional(odm.Keyword(), description="Custom delimiter definition")
+ default_pattern = odm.Text(description="Default pattern used for matching files")
@ odm.model(index=False, store=False, description="Submission Parameters for Service")
diff --git a/assemblyline/odm/models/service_delta.py b/assemblyline/odm/models/service_delta.py
index dfee952c7..7df9cb647 100644
--- a/assemblyline/odm/models/service_delta.py
+++ b/assemblyline/odm/models/service_delta.py
@@ -1,8 +1,7 @@
from __future__ import annotations
from assemblyline import odm
-from assemblyline.odm.models.service import SIGNATURE_DELIMITERS, FETCH_METHODS
-
+from assemblyline.odm.models.service import FETCH_METHODS, SIGNATURE_DELIMITERS
REF_DEPENDENCY_CONFIG = "Refer to:
[Service - DependencyConfig](../service/#dependencyconfig)"
REF_DOCKER_CONFIG = "Refer to:
[Service - DockerConfig](../service/#dockerconfig)"
@@ -84,6 +83,7 @@ class UpdateConfigDelta(odm.Model):
wait_for_update = odm.Optional(odm.Boolean(), description=REF_UPDATE_CONFIG)
signature_delimiter = odm.Optional(odm.Enum(values=SIGNATURE_DELIMITERS.keys()), description=REF_UPDATE_CONFIG)
custom_delimiter = odm.Optional(odm.Keyword(), description=REF_UPDATE_CONFIG)
+ default_pattern = odm.Optional(odm.Text(), description=REF_UPDATE_CONFIG)
@ odm.model(index=False, store=False)
From 0fd63b5de7df6e3ebc014a5dfe10716197d2f611 Mon Sep 17 00:00:00 2001
From: cccs-rs <62077998+cccs-rs@users.noreply.github.com>
Date: Sat, 8 Mar 2025 20:27:23 +0000
Subject: [PATCH 2/2] Add a default pattern for field
---
assemblyline/odm/models/service.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assemblyline/odm/models/service.py b/assemblyline/odm/models/service.py
index 04bde7783..8298300b9 100644
--- a/assemblyline/odm/models/service.py
+++ b/assemblyline/odm/models/service.py
@@ -113,7 +113,7 @@ class UpdateConfig(odm.Model):
default="double_new_line",
description="Delimiter used when given a list of signatures")
custom_delimiter = odm.Optional(odm.Keyword(), description="Custom delimiter definition")
- default_pattern = odm.Text(description="Default pattern used for matching files")
+ default_pattern = odm.Text(default=".*", description="Default pattern used for matching files")
@ odm.model(index=False, store=False, description="Submission Parameters for Service")