From d1a92026b74ace51ff651ca6da2e97ec152b42a8 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Fri, 23 Oct 2020 18:35:26 -0400 Subject: [PATCH] Merge pull request #9027 from hashicorp/release/1.8.5 Merge back release/1.8.5 --- .changelog/8774.txt | 5 ++--- .changelog/9024.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.changelog/8774.txt b/.changelog/8774.txt index 35f641a61..09b85ef1c 100644 --- a/.changelog/8774.txt +++ b/.changelog/8774.txt @@ -1,4 +1,3 @@ ```release-note:improvement -api: The `v1/connect/ca/roots` endpoint now accepts a `pem=true` query parameter and will return a PEM encoded certificate chain of - all the certificates that would normally be in the JSON version of the response. -``` \ No newline at end of file +api: The `v1/connect/ca/roots` endpoint now accepts a `pem=true` query parameter and will return a PEM encoded certificate chain of all the certificates that would normally be in the JSON version of the response. +``` diff --git a/.changelog/9024.txt b/.changelog/9024.txt index f6475a6e0..40053d99b 100644 --- a/.changelog/9024.txt +++ b/.changelog/9024.txt @@ -1,3 +1,3 @@ ```release-note:security -Fix Consul Enterprise Namespace Config Entry Replication DoS. Previously an operator with service:write ACL permissions in a Consul Enterprise cluster could write a malicious config entry that caused infinite raft writes due to issues with the namespace replication logic. [CVE-2020-25201] (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-25201) +Fix Consul Enterprise Namespace Config Entry Replication DoS. Previously an operator with service:write ACL permissions in a Consul Enterprise cluster could write a malicious config entry that caused infinite raft writes due to issues with the namespace replication logic. [[CVE-2020-25201](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-25201)] ```