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.

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

API should suggest an update_interval for sources based on global settings #1117

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
22 changes: 15 additions & 7 deletions assemblyline_ui/api/v4/signature.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import re
from hashlib import sha256

from assemblyline_core.signature_client import SignatureClient
from flask import request
from hashlib import sha256

from assemblyline.common import forge
from assemblyline.common.isotime import now_as_iso
from assemblyline.datastore.exceptions import VersionConflictException
from assemblyline.odm.messages.changes import Operation
from assemblyline.odm.models.user import ROLES
from assemblyline.remote.datatypes.events import EventSender
from assemblyline.remote.datatypes.hash import Hash
from assemblyline.remote.datatypes.lock import Lock
from assemblyline.remote.datatypes.events import EventSender
from assemblyline_core.signature_client import SignatureClient
from assemblyline_ui.api.base import api_login, make_api_response, make_file_response, make_subapi_blueprint
from assemblyline_ui.config import LOGGER, STORAGE, config, CLASSIFICATION as Classification
from assemblyline_ui.api.base import (
api_login,
make_api_response,
make_file_response,
make_subapi_blueprint,
)
from assemblyline_ui.config import CLASSIFICATION as Classification
from assemblyline_ui.config import LOGGER, STORAGE, config
from assemblyline_ui.helper.signature import append_source_status

SUB_API = 'signature'
Expand Down Expand Up @@ -525,8 +531,10 @@ def get_signature_sources(**_):
if 'update_interval' not in s:
s['update_interval'] = service['update_config']['update_interval_seconds']
append_source_status(service)
out[service['name']] = dict(sources=service['update_config']['sources'],
generates_signatures=service['update_config']['generates_signatures'])
out[service['name']] = {
key: service['update_config'][key]
for key in ['sources', 'generates_signatures', 'update_interval_seconds', 'default_pattern']
}

# Save the signature
return make_api_response(out)
Expand Down