Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update model to support post data as freeform text #1900

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −6
Open

Update model to support post data as freeform text #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1479013
Update model to support post data as freeform text
cccs-rs Mar 4, 2025
903bd12
Mark post_data field as optional
cccs-rs Mar 7, 2025
dc09979
Update field for posting data
cccs-rs Mar 8, 2025
8e22713
Assign a default value to field
cccs-rs Mar 9, 2025
19fc41a
Remove default; fix on frontend
cccs-rs Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions assemblyline/odm/models/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

Expand Down Expand Up @@ -94,8 +98,8 @@ class UpdateSource(odm.Model):
description="Update check interval, in seconds, for this source")
ignore_cache: bool = odm.Boolean(default=False,
description="Ignore source caching and forcefully fetch from source")
post_data: dict = odm.Mapping(odm.Any(), default={}, index=False, store=False,
description="Data that's sent in a POST request (`fetch_method=\"POST\"`)")
data: str = odm.Optional(odm.Text(), index=False, store=False,
description="Data that's sent in a POST request (`fetch_method=\"POST\"`)")



Expand Down
5 changes: 2 additions & 3 deletions assemblyline/odm/models/service_delta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:<br>[Service - DependencyConfig](../service/#dependencyconfig)"
REF_DOCKER_CONFIG = "Refer to:<br>[Service - DockerConfig](../service/#dockerconfig)"
Expand Down Expand Up @@ -58,7 +57,7 @@ class UpdateSourceDelta(odm.Model):
configuration = odm.Optional(odm.Mapping(odm.Any(), default={}), description=REF_UPDATE_SOURCE)
update_interval = odm.Optional(odm.Integer(min=0), description=REF_UPDATE_SOURCE)
ignore_cache = odm.Optional(odm.Boolean(default=False), description=REF_UPDATE_SOURCE)
post_data = odm.Optional(odm.Mapping(odm.Any(), default={}), description=REF_UPDATE_SOURCE)
data = odm.Optional(odm.Text(), description=REF_UPDATE_SOURCE)


@ odm.model(index=False, store=False)
Expand Down