Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:fix-mitre-url
into launchpad:master.
Commit message:
Change cve.mitre.org to cve.org
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/490167
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~enriqueesanchz/launchpad:fix-mitre-url into launchpad:master.
diff --git a/lib/lp/bugs/doc/bug-change.rst b/lib/lp/bugs/doc/bug-change.rst
index 466306b..e930702 100644
--- a/lib/lp/bugs/doc/bug-change.rst
+++ b/lib/lp/bugs/doc/bug-change.rst
@@ -424,7 +424,7 @@ when a CVE is linked to a bug.
'whatchanged': 'cve linked'}
>>> print(bug_cve_linked.getBugNotification()["text"])
- ** CVE added: https://cve.mitre.org/cgi-bin/cvename.cgi?name=1999-8979
+ ** CVE added: https://cve.org/CVERecord?id=CVE-1999-8979
And when a CVE is unlinked from a bug.
@@ -437,7 +437,7 @@ And when a CVE is unlinked from a bug.
'whatchanged': 'cve unlinked'}
>>> print(bug_cve_unlinked.getBugNotification()["text"])
- ** CVE removed: https://cve.mitre.org/cgi-bin/cvename.cgi?name=1999-8979
+ ** CVE removed: https://cve.org/CVERecord?id=CVE-1999-8979
BugAttachmentChange
diff --git a/lib/lp/bugs/doc/bugnotifications.rst b/lib/lp/bugs/doc/bugnotifications.rst
index 4b4d755..99a9a49 100644
--- a/lib/lp/bugs/doc/bugnotifications.rst
+++ b/lib/lp/bugs/doc/bugnotifications.rst
@@ -369,7 +369,7 @@ this document:
>>> latest_notification.is_comment
False
>>> print(latest_notification.message.text_contents)
- ** CVE added: https://cve.mitre.org/cgi-bin/cvename.cgi?name=2004-0276
+ ** CVE added: https://cve.org/CVERecord?id=CVE-2004-0276
Expiring notifications
diff --git a/lib/lp/bugs/model/cve.py b/lib/lp/bugs/model/cve.py
index 8e06697..3bf1194 100644
--- a/lib/lp/bugs/model/cve.py
+++ b/lib/lp/bugs/model/cve.py
@@ -93,9 +93,7 @@ class Cve(StormBase, BugLinkTargetMixin):
@property
def url(self):
"""See ICve."""
- return (
- "https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"; % self.sequence
- )
+ return "https://cve.org/CVERecord?id=CVE-%s"; % self.sequence
@property
def displayname(self):
diff --git a/lib/lp/bugs/stories/webservice/xx-bug.rst b/lib/lp/bugs/stories/webservice/xx-bug.rst
index b45bb61..8e8b155 100644
--- a/lib/lp/bugs/stories/webservice/xx-bug.rst
+++ b/lib/lp/bugs/stories/webservice/xx-bug.rst
@@ -2110,7 +2110,7 @@ The collection of all CVEs is available at the top level.
sequence: '2005-2737'
status: 'Candidate'
title: 'CVE-2005-2737 (Candidate)'
- url: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=2005-2737'
+ url: 'https://cve.org/CVERecord?id=CVE-2005-2737'
web_link: 'http://bugs.launchpad.test/bugs/cve/2005-2737'
---
...
@@ -2148,7 +2148,7 @@ And for every bug we can look at the CVEs linked to it.
sequence: '1999-8979'
status: 'Entry'
title: 'CVE-1999-8979 (Entry)'
- url: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=1999-8979'
+ url: 'https://cve.org/CVERecord?id=CVE-1999-8979'
web_link: 'http://bugs.launchpad.test/bugs/cve/1999-8979'
---
diff --git a/lib/lp/bugs/templates/cve-index.pt b/lib/lp/bugs/templates/cve-index.pt
index 222160b..52a79e0 100644
--- a/lib/lp/bugs/templates/cve-index.pt
+++ b/lib/lp/bugs/templates/cve-index.pt
@@ -40,7 +40,7 @@
<div style="margin-top: 1em">
See the <img src="/@@/link" />
- <a tal:attributes="href context/url">CVE page on Mitre.org</a>
+ <a tal:attributes="href context/url">CVE page on cve.org</a>
for more details.
</div>
diff --git a/lib/lp/bugs/templates/cve-portlet-details.pt b/lib/lp/bugs/templates/cve-portlet-details.pt
index 6319ccf..add9968 100644
--- a/lib/lp/bugs/templates/cve-portlet-details.pt
+++ b/lib/lp/bugs/templates/cve-portlet-details.pt
@@ -11,7 +11,7 @@
<span tal:replace="context/status/title">Candidate</span><br />
See the
<img src="/@@/link" />
- <a tal:attributes="href context/url">CVE page on Mitre.org</a> for
+ <a tal:attributes="href context/url">CVE page on cve.org</a> for
more details.
<br />
diff --git a/lib/lp/bugs/templates/cveset-portlet-details.pt b/lib/lp/bugs/templates/cveset-portlet-details.pt
index 47d2e45..0ff2b04 100644
--- a/lib/lp/bugs/templates/cveset-portlet-details.pt
+++ b/lib/lp/bugs/templates/cveset-portlet-details.pt
@@ -5,7 +5,7 @@
class="portlet" id="portlet-details">
<div>
Launchpad includes full support for
- <a href="https://cve.mitre.org/";>the CVE framework</a>.
+ <a href="https://cve.org/";>the CVE framework</a>.
We update the Launchpad CVE database daily to ensure it includes details of
all known vulnerabilities.
</div>
diff --git a/lib/lp/bugs/tests/test_bugchanges.py b/lib/lp/bugs/tests/test_bugchanges.py
index 1067d89..d03eaab 100644
--- a/lib/lp/bugs/tests/test_bugchanges.py
+++ b/lib/lp/bugs/tests/test_bugchanges.py
@@ -865,8 +865,7 @@ class TestBugChanges(TestCaseWithFactory):
cve_linked_notification = {
"text": (
- "** CVE added: https://cve.mitre.org/";
- "cgi-bin/cvename.cgi?name=1999-8979"
+ "** CVE added: https://cve.org/"; "CVERecord?id=CVE-1999-8979"
),
"person": self.user,
}
@@ -898,8 +897,7 @@ class TestBugChanges(TestCaseWithFactory):
cve_unlinked_notification = {
"text": (
- "** CVE removed: https://cve.mitre.org/";
- "cgi-bin/cvename.cgi?name=1999-8979"
+ "** CVE removed: https://cve.org/"; "CVERecord?id=CVE-1999-8979"
),
"person": self.user,
}
diff --git a/lib/lp/registry/help/sharing.html b/lib/lp/registry/help/sharing.html
index 3bb4edf..3a4e63f 100644
--- a/lib/lp/registry/help/sharing.html
+++ b/lib/lp/registry/help/sharing.html
@@ -56,7 +56,7 @@
Visible if you're involved in fixing and deploying critical
vulnerability and exploits
(<a class="sprite external-link"
- href="https://cve.mitre.org/";>CVEs</a>). Embargo will be lifted
+ href="https://cve.org/";>CVEs</a>). Embargo will be lifted
after the fixes have been made, so that the information is visible
to anyone who may need to ensure that their version is secure.
</dd>
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
