Skip to content

Commit 99a2ae0

Browse files
committed
chore: test with 12hr default frequency on staging
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 2497ddd commit 99a2ae0

7 files changed

Lines changed: 80 additions & 74 deletions

File tree

vulnerabilities/importers/__init__.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -159,37 +159,37 @@
159159
collect_fix_commits_v2.CollectGitFixCommitsPipeline,
160160
collect_fix_commits_v2.CollectJenkinsFixCommitsPipeline,
161161
collect_fix_commits_v2.CollectGitlabFixCommitsPipeline,
162-
github_importer.GitHubAPIImporterPipeline,
163-
gitlab_importer.GitLabImporterPipeline,
164-
github_osv.GithubOSVImporter,
165-
pypa_importer.PyPaImporterPipeline,
166-
npm_importer.NpmImporterPipeline,
167-
nginx_importer.NginxImporterPipeline,
168-
pysec_importer.PyPIImporterPipeline,
169-
apache_tomcat.ApacheTomcatImporter,
170-
postgresql.PostgreSQLImporter,
171-
debian.DebianImporter,
172-
curl.CurlImporter,
173-
epss.EPSSImporter,
174-
vulnrichment.VulnrichImporter,
175-
alpine_linux_importer.AlpineLinuxImporterPipeline,
176-
apache_kafka.ApacheKafkaImporter,
177-
ruby.RubyImporter,
178-
redhat.RedhatImporter,
179-
archlinux.ArchlinuxImporter,
180-
debian_oval.DebianOvalImporter,
181-
retiredotnet.RetireDotnetImporter,
182-
apache_httpd.ApacheHTTPDImporter,
183-
mozilla.MozillaImporter,
184-
gentoo.GentooImporter,
185-
istio.IstioImporter,
186-
project_kb_msr2019.ProjectKBMSRImporter,
187-
suse_scores.SUSESeverityScoreImporter,
188-
elixir_security.ElixirSecurityImporter,
189-
xen.XenImporter,
190-
ubuntu_usn.UbuntuUSNImporter,
191-
fireeye.FireyeImporter,
192-
oss_fuzz.OSSFuzzImporter,
162+
# github_importer.GitHubAPIImporterPipeline,
163+
# gitlab_importer.GitLabImporterPipeline,
164+
# github_osv.GithubOSVImporter,
165+
# pypa_importer.PyPaImporterPipeline,
166+
# npm_importer.NpmImporterPipeline,
167+
# nginx_importer.NginxImporterPipeline,
168+
# pysec_importer.PyPIImporterPipeline,
169+
# apache_tomcat.ApacheTomcatImporter,
170+
# postgresql.PostgreSQLImporter,
171+
# debian.DebianImporter,
172+
# curl.CurlImporter,
173+
# epss.EPSSImporter,
174+
# vulnrichment.VulnrichImporter,
175+
# alpine_linux_importer.AlpineLinuxImporterPipeline,
176+
# apache_kafka.ApacheKafkaImporter,
177+
# ruby.RubyImporter,
178+
# redhat.RedhatImporter,
179+
# archlinux.ArchlinuxImporter,
180+
# debian_oval.DebianOvalImporter,
181+
# retiredotnet.RetireDotnetImporter,
182+
# apache_httpd.ApacheHTTPDImporter,
183+
# mozilla.MozillaImporter,
184+
# gentoo.GentooImporter,
185+
# istio.IstioImporter,
186+
# project_kb_msr2019.ProjectKBMSRImporter,
187+
# suse_scores.SUSESeverityScoreImporter,
188+
# elixir_security.ElixirSecurityImporter,
189+
# xen.XenImporter,
190+
# ubuntu_usn.UbuntuUSNImporter,
191+
# fireeye.FireyeImporter,
192+
# oss_fuzz.OSSFuzzImporter,
193193
]
194194
)
195195

vulnerabilities/improvers/__init__.py

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
from vulnerabilities.pipelines import enhance_with_metasploit
1717
from vulnerabilities.pipelines import flag_ghost_packages
1818
from vulnerabilities.pipelines import populate_vulnerability_summary_pipeline
19-
from vulnerabilities.pipelines.v2_improvers import archive_urls
20-
from vulnerabilities.pipelines.v2_improvers import collect_ssvc_trees
19+
from vulnerabilities.pipelines.v2_improvers import archive_urls as archive_urls_v2
20+
from vulnerabilities.pipelines.v2_improvers import collect_ssvc_trees as collect_ssvc_trees_v2
2121
from vulnerabilities.pipelines.v2_improvers import compute_advisory_todo as compute_advisory_todo_v2
2222
from vulnerabilities.pipelines.v2_improvers import compute_package_risk as compute_package_risk_v2
2323
from vulnerabilities.pipelines.v2_improvers import enhance_with_exploitdb as exploitdb_v2
24-
from vulnerabilities.pipelines.v2_improvers import enhance_with_github_poc
24+
from vulnerabilities.pipelines.v2_improvers import (
25+
enhance_with_github_poc as enhance_with_github_poc_v2,
26+
)
2527
from vulnerabilities.pipelines.v2_improvers import enhance_with_kev as enhance_with_kev_v2
2628
from vulnerabilities.pipelines.v2_improvers import (
2729
enhance_with_metasploit as enhance_with_metasploit_v2,
@@ -30,9 +32,13 @@
3032
from vulnerabilities.pipelines.v2_improvers import (
3133
group_advisories_for_packages as group_advisories_for_packages_v2,
3234
)
33-
from vulnerabilities.pipelines.v2_improvers import mark_unfurl_version_range
34-
from vulnerabilities.pipelines.v2_improvers import reference_collect_commits
35-
from vulnerabilities.pipelines.v2_improvers import relate_severities
35+
from vulnerabilities.pipelines.v2_improvers import (
36+
mark_unfurl_version_range as mark_unfurl_version_range_v2,
37+
)
38+
from vulnerabilities.pipelines.v2_improvers import (
39+
reference_collect_commits as reference_collect_commits_v2,
40+
)
41+
from vulnerabilities.pipelines.v2_improvers import relate_severities as relate_severities_v2
3642
from vulnerabilities.pipelines.v2_improvers import unfurl_version_range as unfurl_version_range_v2
3743
from vulnerabilities.utils import create_registry
3844

@@ -44,36 +50,36 @@
4450
enhance_with_metasploit_v2.MetasploitImproverPipeline,
4551
compute_package_risk_v2.ComputePackageRiskPipeline,
4652
unfurl_version_range_v2.UnfurlVersionRangePipeline,
47-
collect_ssvc_trees.CollectSSVCPipeline,
48-
relate_severities.RelateSeveritiesPipeline,
49-
archive_urls.ArchiveImproverPipeline,
53+
collect_ssvc_trees_v2.CollectSSVCPipeline,
54+
relate_severities_v2.RelateSeveritiesPipeline,
55+
archive_urls_v2.ArchiveImproverPipeline,
5056
compute_advisory_todo_v2.ComputeToDo,
51-
reference_collect_commits.CollectReferencesFixCommitsPipeline,
52-
enhance_with_github_poc.GithubPocsImproverPipeline,
53-
mark_unfurl_version_range.MarkUnfurlVersionRangePipeline,
54-
valid_versions.GitHubBasicImprover,
55-
valid_versions.GitLabBasicImprover,
56-
valid_versions.NginxBasicImprover,
57-
valid_versions.ApacheHTTPDImprover,
58-
valid_versions.DebianBasicImprover,
59-
valid_versions.NpmImprover,
60-
valid_versions.ElixirImprover,
61-
valid_versions.ApacheTomcatImprover,
62-
valid_versions.ApacheKafkaImprover,
63-
valid_versions.IstioImprover,
64-
valid_versions.DebianOvalImprover,
65-
valid_versions.OSSFuzzImprover,
66-
valid_versions.RubyImprover,
67-
valid_versions.GithubOSVImprover,
68-
vulnerability_status.VulnerabilityStatusImprover,
69-
valid_versions.CurlImprover,
70-
flag_ghost_packages.FlagGhostPackagePipeline,
71-
enhance_with_kev.VulnerabilityKevPipeline,
72-
enhance_with_metasploit.MetasploitImproverPipeline,
73-
enhance_with_exploitdb.ExploitDBImproverPipeline,
74-
compute_package_risk.ComputePackageRiskPipeline,
75-
compute_package_version_rank.ComputeVersionRankPipeline,
76-
populate_vulnerability_summary_pipeline.PopulateVulnerabilitySummariesPipeline,
57+
reference_collect_commits_v2.CollectReferencesFixCommitsPipeline,
58+
enhance_with_github_poc_v2.GithubPocsImproverPipeline,
59+
mark_unfurl_version_range_v2.MarkUnfurlVersionRangePipeline,
7760
group_advisories_for_packages_v2.GroupAdvisoriesForPackages,
61+
# valid_versions.GitHubBasicImprover,
62+
# valid_versions.GitLabBasicImprover,
63+
# valid_versions.NginxBasicImprover,
64+
# valid_versions.ApacheHTTPDImprover,
65+
# valid_versions.DebianBasicImprover,
66+
# valid_versions.NpmImprover,
67+
# valid_versions.ElixirImprover,
68+
# valid_versions.ApacheTomcatImprover,
69+
# valid_versions.ApacheKafkaImprover,
70+
# valid_versions.IstioImprover,
71+
# valid_versions.DebianOvalImprover,
72+
# valid_versions.OSSFuzzImprover,
73+
# valid_versions.RubyImprover,
74+
# valid_versions.GithubOSVImprover,
75+
# vulnerability_status.VulnerabilityStatusImprover,
76+
# valid_versions.CurlImprover,
77+
# flag_ghost_packages.FlagGhostPackagePipeline,
78+
# enhance_with_kev.VulnerabilityKevPipeline,
79+
# enhance_with_metasploit.MetasploitImproverPipeline,
80+
# enhance_with_exploitdb.ExploitDBImproverPipeline,
81+
# compute_package_risk.ComputePackageRiskPipeline,
82+
# compute_package_version_rank.ComputeVersionRankPipeline,
83+
# populate_vulnerability_summary_pipeline.PopulateVulnerabilitySummariesPipeline,
7884
]
7985
)

vulnerabilities/migrations/0136_alter_pipelineschedule_run_interval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def revert_convert_hours_to_minutes(apps, schema_editor):
3030
model_name="pipelineschedule",
3131
name="run_interval",
3232
field=models.PositiveSmallIntegerField(
33-
default=1440,
33+
default=720,
3434
help_text="Number of minutes to wait between run of this pipeline.",
3535
validators=[
3636
django.core.validators.MinValueValidator(

vulnerabilities/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2309,7 +2309,7 @@ class ExecutionPriority(models.IntegerChoices):
23092309
43200, message="Interval must be at most 43200 minutes (i.e 30 days)."
23102310
),
23112311
],
2312-
default=1440,
2312+
default=720,
23132313
help_text=("Number of minutes to wait between run of this pipeline."),
23142314
)
23152315

vulnerabilities/pipelines/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class VulnerableCodePipeline(PipelineDefinition, BasePipelineRun):
146146
# To rerun onetime pipeline reset is_active field to True via migration.
147147
run_once = False
148148
# Interval between runs in minutes.
149-
run_interval = 1440
149+
run_interval = 720
150150
run_priority = PipelineSchedule.ExecutionPriority.DEFAULT
151151

152152
def on_failure(self):
@@ -181,7 +181,7 @@ class VulnerableCodeBaseImporterPipeline(VulnerableCodePipeline):
181181
# To rerun onetime pipeline reset is_active field to True via migration.
182182
run_once = False
183183
# Interval between runs in minutes.
184-
run_interval = 1440
184+
run_interval = 720
185185
run_priority = PipelineSchedule.ExecutionPriority.DEFAULT
186186

187187
@classmethod
@@ -291,7 +291,7 @@ class VulnerableCodeBaseImporterPipelineV2(VulnerableCodePipeline):
291291
# To rerun onetime pipeline reset is_active field to True via migration.
292292
run_once = False
293293
# Interval between runs in minutes.
294-
run_interval = 1440
294+
run_interval = 720
295295
run_priority = PipelineSchedule.ExecutionPriority.DEFAULT
296296

297297
@classmethod

vulnerabilities/schedules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def update_pipeline_schedule():
9797
PipelineSchedule.objects.exclude(pipeline_id__in=pipelines.keys()).delete()
9898
for id, pipeline_class in pipelines.items():
9999
run_once = getattr(pipeline_class, "run_once", False)
100-
run_interval = getattr(pipeline_class, "run_interval", 1440)
100+
run_interval = getattr(pipeline_class, "run_interval", 720)
101101
run_priority = getattr(
102102
pipeline_class, "run_priority", PipelineSchedule.ExecutionPriority.DEFAULT
103103
)

vulnerabilities/tests/test_api_v2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ def test_schedule_update_anon_user_not_permitted(self, mock_create_new_job):
756756

757757
self.assertNotEqual(response.status_code, status.HTTP_200_OK)
758758
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
759-
self.assertEqual(self.schedule1.run_interval, 1440)
759+
self.assertEqual(self.schedule1.run_interval, 720)
760760

761761
@patch("vulnerabilities.models.PipelineSchedule.create_new_job")
762762
def test_schedule_update_with_staff_token_not_permitted(self, mock_create_new_job):
@@ -771,7 +771,7 @@ def test_schedule_update_with_staff_token_not_permitted(self, mock_create_new_jo
771771

772772
self.assertNotEqual(response.status_code, status.HTTP_200_OK)
773773
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
774-
self.assertEqual(self.schedule1.run_interval, 1440)
774+
self.assertEqual(self.schedule1.run_interval, 720)
775775

776776
@patch("vulnerabilities.models.PipelineSchedule.create_new_job")
777777
def test_schedule_update_with_staff_session_permitted(self, mock_create_new_job):

0 commit comments

Comments
 (0)