Skip to content

Commit ef8048e

Browse files
committed
Disable V1 API UI and pipelines
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 4702c06 commit ef8048e

7 files changed

Lines changed: 4 additions & 210 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/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/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ def get(self, request):
769769

770770

771771
class HomePageV2(VulnerableCodeView):
772-
template_name = "index_v2.html"
772+
template_name = "index.html"
773773

774774
def get(self, request):
775775
request_query = request.GET

vulnerablecode/urls.py

Lines changed: 1 addition & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@
1616
from drf_spectacular.views import SpectacularSwaggerView
1717
from rest_framework.routers import DefaultRouter
1818

19-
from vulnerabilities.api import AliasViewSet
20-
from vulnerabilities.api import CPEViewSet
21-
from vulnerabilities.api import PackageViewSet
22-
from vulnerabilities.api import VulnerabilityViewSet
23-
from vulnerabilities.api_v2 import CodeFixV2ViewSet
24-
from vulnerabilities.api_v2 import CodeFixViewSet
25-
from vulnerabilities.api_v2 import PackageV2ViewSet
26-
from vulnerabilities.api_v2 import PipelineScheduleV2ViewSet
27-
from vulnerabilities.api_v2 import VulnerabilityV2ViewSet
2819
from vulnerabilities.api_v3 import AdvisoryV3ViewSet
2920
from vulnerabilities.api_v3 import AffectedByAdvisoriesViewSet
3021
from vulnerabilities.api_v3 import FixingAdvisoriesViewSet
@@ -40,18 +31,12 @@
4031
from vulnerabilities.views import AltchaView
4132
from vulnerabilities.views import ApiUserCreateView
4233
from vulnerabilities.views import FixingAdvisoriesListView
43-
from vulnerabilities.views import HomePage
4434
from vulnerabilities.views import HomePageV2
45-
from vulnerabilities.views import PackageDetails
46-
from vulnerabilities.views import PackageSearch
4735
from vulnerabilities.views import PackageSearchV2
4836
from vulnerabilities.views import PackageV2Details
4937
from vulnerabilities.views import PipelineRunDetailView
5038
from vulnerabilities.views import PipelineRunListView
5139
from vulnerabilities.views import PipelineScheduleListView
52-
from vulnerabilities.views import VulnerabilityDetails
53-
from vulnerabilities.views import VulnerabilityPackagesDetails
54-
from vulnerabilities.views import VulnerabilitySearch
5540
from vulnerablecode.settings import DEBUG
5641
from vulnerablecode.settings import DEBUG_TOOLBAR
5742

@@ -63,20 +48,6 @@ def __init__(self, *args, **kwargs):
6348
self.trailing_slash = "/?"
6449

6550

66-
api_router = OptionalSlashRouter()
67-
api_router.register("packages", PackageViewSet)
68-
# `DefaultRouter` requires `basename` when registering viewsets that don't define a queryset.
69-
api_router.register("vulnerabilities", VulnerabilityViewSet, basename="vulnerability")
70-
api_router.register("cpes", CPEViewSet, basename="cpe")
71-
api_router.register("aliases", AliasViewSet, basename="alias")
72-
73-
api_v2_router = OptionalSlashRouter()
74-
api_v2_router.register("packages", PackageV2ViewSet, basename="package-v2")
75-
api_v2_router.register("vulnerabilities", VulnerabilityV2ViewSet, basename="vulnerability-v2")
76-
api_v2_router.register("codefixes", CodeFixViewSet, basename="codefix")
77-
api_v2_router.register("pipelines", PipelineScheduleV2ViewSet, basename="pipelines")
78-
api_v2_router.register("advisory-codefixes", CodeFixV2ViewSet, basename="advisory-codefix")
79-
8051
api_v3_router = OptionalSlashRouter()
8152

8253
api_v3_router.register("packages", PackageV3ViewSet, basename="package-v3")
@@ -89,15 +60,14 @@ def __init__(self, *args, **kwargs):
8960

9061
urlpatterns = [
9162
path("admin/login/", AdminLoginView.as_view(), name="admin-login"),
92-
path("api/v2/", include(api_v2_router.urls)),
9363
path("api/v3/", include(api_v3_router.urls)),
9464
path(
9565
"robots.txt",
9666
TemplateView.as_view(template_name="robots.txt", content_type="text/plain"),
9767
),
9868
path(
9969
"",
100-
HomePage.as_view(),
70+
HomePageV2.as_view(),
10171
name="home",
10272
),
10373
path(
@@ -125,11 +95,6 @@ def __init__(self, *args, **kwargs):
12595
PipelineRunDetailView.as_view(),
12696
name="run-details",
12797
),
128-
path(
129-
"v2",
130-
HomePageV2.as_view(),
131-
name="home",
132-
),
13398
path(
13499
"advisories/packages/<path:avid>",
135100
AdvisoryPackagesDetails.as_view(),
@@ -146,21 +111,11 @@ def __init__(self, *args, **kwargs):
146111
name="advisory_details",
147112
),
148113
path("altcha/", AltchaView.as_view(), name="altcha"),
149-
path(
150-
"packages/search/",
151-
PackageSearch.as_view(),
152-
name="package_search",
153-
),
154114
path(
155115
"packages/v2/search/",
156116
PackageSearchV2.as_view(),
157117
name="package_search_v2",
158118
),
159-
re_path(
160-
r"^packages/(?P<purl>pkg:.+)$",
161-
PackageDetails.as_view(),
162-
name="package_details",
163-
),
164119
re_path(
165120
r"^packages/v2/(?P<purl>pkg:.+)$",
166121
PackageV2Details.as_view(),
@@ -176,26 +131,6 @@ def __init__(self, *args, **kwargs):
176131
AffectedByAdvisoriesListView.as_view(),
177132
name="affected_by_advisories_v2",
178133
),
179-
path(
180-
"vulnerabilities/search/",
181-
VulnerabilitySearch.as_view(),
182-
name="vulnerability_search",
183-
),
184-
path(
185-
"vulnerabilities/<str:vulnerability_id>",
186-
VulnerabilityDetails.as_view(),
187-
name="vulnerability_details",
188-
),
189-
path(
190-
"vulnerabilities/<str:vulnerability_id>/packages",
191-
VulnerabilityPackagesDetails.as_view(),
192-
name="vulnerability_package_details",
193-
),
194-
path(
195-
"api/",
196-
include(api_router.urls),
197-
name="api",
198-
),
199134
path(
200135
"api/schema/",
201136
SpectacularAPIView.as_view(),

0 commit comments

Comments
 (0)