diff --git a/.env.example b/.env.example index d3d6e92..37161b8 100644 --- a/.env.example +++ b/.env.example @@ -18,7 +18,7 @@ ARANGODB_PASSWORD= MAX_PAGE_SIZE= DEFAULT_PAGE_SIZE= # R2 PATHS -NVD_BUCKET_ROOT_PATH=https://cve2stix.vulmatch.com/cve2stix-action-output/ +CVE2STIX_BUCKET_ROOT_PATH=https://cve2stix.vulmatch.com/ # arango_cve_processor envs NVD_API_KEY= CTIBUTLER_HOST= \ No newline at end of file diff --git a/.env.markdown b/.env.markdown index 0c4bf98..52317f3 100644 --- a/.env.markdown +++ b/.env.markdown @@ -68,4 +68,4 @@ Arango CTI Processor uses the NVD API to join objects. To avoid running in NVD A All of the knowledgebases are stored on Cloudflare R2. The variables in this part of the config should not be changed. -* `NVD_BUCKET_ROOT_PATH`: `https://cve2stix.vulmatch.com/cve2stix-action-output/` \ No newline at end of file +* `CVE2STIX_BUCKET_ROOT_PATH`: `https://cve2stix.vulmatch.com/` \ No newline at end of file diff --git a/vulmatch/settings.py b/vulmatch/settings.py index fceba4b..23ac1a3 100644 --- a/vulmatch/settings.py +++ b/vulmatch/settings.py @@ -189,4 +189,4 @@ ARANGODB_HOST_URL = os.getenv("ARANGODB_HOST_URL") ARANGODB_DATABASE = "vulmatch" -NVD_BUCKET_ROOT_PATH = os.environ["NVD_BUCKET_ROOT_PATH"] \ No newline at end of file +CVE2STIX_BUCKET_ROOT_PATH = os.environ["CVE2STIX_BUCKET_ROOT_PATH"] \ No newline at end of file diff --git a/vulmatch/worker/tasks.py b/vulmatch/worker/tasks.py index 4267cda..4733911 100644 --- a/vulmatch/worker/tasks.py +++ b/vulmatch/worker/tasks.py @@ -57,7 +57,7 @@ def run_nvd_task(data, job: Job, nvd_type='cve'): temp_dir = str(Path(tempfile.gettempdir())/f"vulmatch/nvd-{nvd_type}--{str(job.id)}") tasks = [] for d in dates: - url = urljoin(settings.NVD_BUCKET_ROOT_PATH, daily_url(d, nvd_type)) + url = urljoin(settings.CVE2STIX_BUCKET_ROOT_PATH, daily_url(d, nvd_type)) task = download_file.si(url, temp_dir, job_id=job.id) task |= upload_file.s(f'nvd_{nvd_type}', stix2arango_note=f"vulmatch-{nvd_type}-date={d.strftime('%Y-%m-%d')}", job_id=job.id, params=job.parameters) task.set_immutable(True)