Skip to content

Commit 66eb1bf

Browse files
TG1999TG1999
authored
Merge pull request #2358 from aboutcode-org/disable_v1_api_ui_pipelines
Disable v1 API, UI & pipelines
2 parents 8523bdf + ca8a6b3 commit 66eb1bf

15 files changed

Lines changed: 2668 additions & 2922 deletions

File tree

‎vulnerabilities/importers/__init__.py‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,7 @@
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

10-
from vulnerabilities.importers import apache_httpd
11-
from vulnerabilities.importers import apache_kafka
12-
from vulnerabilities.importers import apache_tomcat
13-
from vulnerabilities.importers import archlinux
14-
from vulnerabilities.importers import curl
15-
from vulnerabilities.importers import debian
16-
from vulnerabilities.importers import debian_oval
17-
from vulnerabilities.importers import elixir_security
18-
from vulnerabilities.importers import epss
19-
from vulnerabilities.importers import fireeye
20-
from vulnerabilities.importers import gentoo
21-
from vulnerabilities.importers import github_osv
22-
from vulnerabilities.importers import istio
23-
from vulnerabilities.importers import mozilla
24-
from vulnerabilities.importers import oss_fuzz
25-
from vulnerabilities.importers import postgresql
26-
from vulnerabilities.importers import project_kb_msr2019
27-
from vulnerabilities.importers import redhat
28-
from vulnerabilities.importers import retiredotnet
29-
from vulnerabilities.importers import ruby
30-
from vulnerabilities.importers import suse_scores
31-
from vulnerabilities.importers import ubuntu_usn
32-
from vulnerabilities.importers import vulnrichment
33-
from vulnerabilities.importers import xen
3410
from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
35-
from vulnerabilities.pipelines import alpine_linux_importer
36-
from vulnerabilities.pipelines import github_importer
37-
from vulnerabilities.pipelines import gitlab_importer
38-
from vulnerabilities.pipelines import nginx_importer
39-
from vulnerabilities.pipelines import npm_importer
40-
from vulnerabilities.pipelines import pypa_importer
41-
from vulnerabilities.pipelines import pysec_importer
4211
from vulnerabilities.pipelines.v2_importers import alpine_linux_importer as alpine_linux_importer_v2
4312
from vulnerabilities.pipelines.v2_importers import aosp_importer as aosp_importer_v2
4413
from vulnerabilities.pipelines.v2_importers import apache_httpd_importer as apache_httpd_v2
@@ -159,37 +128,6 @@
159128
collect_fix_commits_v2.CollectGitFixCommitsPipeline,
160129
collect_fix_commits_v2.CollectJenkinsFixCommitsPipeline,
161130
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,
193131
]
194132
)
195133

‎vulnerabilities/improvers/__init__.py‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

10-
from vulnerabilities.improvers import valid_versions
11-
from vulnerabilities.improvers import vulnerability_status
12-
from vulnerabilities.pipelines import compute_package_risk
13-
from vulnerabilities.pipelines import compute_package_version_rank
14-
from vulnerabilities.pipelines import enhance_with_exploitdb
15-
from vulnerabilities.pipelines import enhance_with_kev
16-
from vulnerabilities.pipelines import enhance_with_metasploit
17-
from vulnerabilities.pipelines import flag_ghost_packages
18-
from vulnerabilities.pipelines import populate_vulnerability_summary_pipeline
1910
from vulnerabilities.pipelines.v2_improvers import archive_urls
2011
from vulnerabilities.pipelines.v2_improvers import collect_ssvc_trees
2112
from vulnerabilities.pipelines.v2_improvers import compute_advisory_todo as compute_advisory_todo_v2
@@ -51,29 +42,6 @@
5142
reference_collect_commits.CollectReferencesFixCommitsPipeline,
5243
enhance_with_github_poc.GithubPocsImproverPipeline,
5344
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,
7745
group_advisories_for_packages_v2.GroupAdvisoriesForPackages,
7846
]
7947
)

‎vulnerabilities/pipelines/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/templates/index.html‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@
1010
<div class="container">
1111
<div class="columns is-centered mb-5 mt-2">
1212
<div class="column is-full-tablet is-full-desktop">
13-
{% include "package_search_box.html" %}
14-
</div>
15-
</div>
16-
<div class="columns is-centered mb-5">
17-
<div class="column is-full-tablet is-full-desktop">
18-
{% include "vulnerability_search_box.html" %}
13+
{% include "package_search_box_v2.html" %}
1914
</div>
2015
</div>
2116
<div class="notification is-info is-light has-text-centered">
@@ -33,9 +28,6 @@
3328
</a>
3429
</p>
3530
</div>
36-
<div class="notification is-info is-light has-text-centered">
37-
ATTENTION: We will be deprecating V1 and V2 API by 30th June 2026. V3 endpoint is live now. Please migrate to V3 API before the deprecation date. For more details, please refer to this <a href="https://aboutcode-org.github.io/www.aboutcode.org/blog/vcio-migration-announcement-aboutcode" target="_blank" class="has-text-link is-underlined">blog</a>.
38-
</div>
3931
</div>
4032
</section>
4133
{% endblock %}

‎vulnerabilities/templates/index_v2.html‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎vulnerabilities/templates/navbar.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@
2020
</div>
2121
<div class="navbar-menu">
2222
<div class="navbar-start">
23-
<a class="navbar-item {% active_item 'package_search' %}" href="{% url 'package_search' %}">
23+
<a class="navbar-item {% active_item 'package_search' %}" href="{% url 'package_search_v2' %}">
2424
Packages
2525
</a>
26-
<a class="navbar-item {% active_item 'vulnerability_search' %}" href="{% url 'vulnerability_search' %}">
27-
Vulnerabilities
28-
</a>
29-
<a class="navbar-item {% active_item 'package_search_v2' %}" href="{% url 'package_search_v2' %}">
30-
V2
31-
</a>
3226
<a class="navbar-item" href="https://vulnerablecode.readthedocs.io/en/latest/" target="_blank">
3327
Documentation
3428
</a>

‎vulnerabilities/templates/package_details_v2.html‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@
3232
<span>Essentials</span>
3333
</a>
3434
</li>
35-
<!-- <li data-tab="history">
36-
<a>
37-
<span>
38-
History ({{ history|length }})
39-
</span>
40-
</a>
41-
</li> -->
4235
</ul>
4336
</div>
4437

@@ -381,55 +374,6 @@
381374
</div>
382375
</div>
383376
</div>
384-
<!-- <div class="tab-div content" data-content="history"> -->
385-
<!-- <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
386-
<thead>
387-
<tr>
388-
<th> <span
389-
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
390-
data-tooltip="The date that the package was reported to be fixing or affected by the vulnerability.">
391-
Date </span> </th>
392-
<th>
393-
<span
394-
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
395-
data-tooltip="The process that reported this package is fixing or affected by">
396-
Actor
397-
</span>
398-
</th>
399-
<th> <span
400-
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
401-
data-tooltip="Fixing or Affected by"> Action </span> </th>
402-
<th> <span
403-
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
404-
data-tooltip="Vulnerability fixed by or affecting the package."> Vulnerability </span>
405-
</th>
406-
<th>
407-
<span
408-
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
409-
data-tooltip="The public service that published the advisory or related information."> Source </span>
410-
</th>
411-
<th>
412-
<span
413-
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
414-
data-tooltip="The version of VulnerableCode that performed the action. ">
415-
VulnerableCode Version
416-
</span>
417-
</th>
418-
</tr>
419-
</thead>
420-
{% for log in history %}
421-
<tr>
422-
<td class="is-break-word wrap-strings">{{ log.get_iso_time }}</td>
423-
<td class="is-break-word wrap-strings">{{ log.actor_name }}</td>
424-
<td class="is-break-word wrap-strings">{{ log.get_action_type_label }}</td>
425-
<td class="is-break-word wrap-strings"> <a href="/vulnerabilities/{{log.related_vulnerability}}"
426-
target="_self">{{ log.related_vulnerability }}</a></td>
427-
<td class="is-break-word wrap-strings"> <a href="{{ log.source_url }}"
428-
target="_blank">{{log.source_url }}</a></td>
429-
<td class="is-break-word wrap-strings"> {{ log.software_version }} </td>
430-
</tr>
431-
{% endfor %}
432-
</table> -->
433377
</div>
434378
</div>
435379
</div>

0 commit comments

Comments
 (0)