| 1 |
commit: b70b15b4f896770a085d72382bd702c0524254a4 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Feb 7 16:43:13 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 9 22:37:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70b15b4 |
| 7 |
|
| 8 |
sys-cluster/heat: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3870 |
| 11 |
|
| 12 |
sys-cluster/heat/files/CVE-2016-9185.patch | 53 ------------------------------ |
| 13 |
1 file changed, 53 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-cluster/heat/files/CVE-2016-9185.patch b/sys-cluster/heat/files/CVE-2016-9185.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 7b6bd86b81..0000000000 |
| 18 |
--- a/sys-cluster/heat/files/CVE-2016-9185.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,53 +0,0 @@ |
| 21 |
-From 02dfb1a64f8a545a6dfed15245ac54c8ea835b81 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Daniel Gonzalez <daniel@××××××××××××××××××.de> |
| 23 |
-Date: Mon, 17 Oct 2016 10:22:42 +0200 |
| 24 |
-Subject: Prevent template validate from scanning ports |
| 25 |
- |
| 26 |
-The template validation method in the heat API allows to specify the |
| 27 |
-template to validate using a URL with the 'template_url' parameter. |
| 28 |
- |
| 29 |
-By entering invalid http URLs, like 'http://localhost:22' it is |
| 30 |
-possible to scan ports by evaluating the error message of the request. |
| 31 |
- |
| 32 |
-For example, the request |
| 33 |
- |
| 34 |
-curl -H "Content-Type: application/json" -H "X-Auth-Token: <TOKEN>" \ |
| 35 |
--X POST -d '{"template_url": "http://localhost:22"}' \ |
| 36 |
-http://127.0.0.1:8004/v1/<TENANT_ID>/validate |
| 37 |
- |
| 38 |
-causes the following error message to be returned to the user: |
| 39 |
- |
| 40 |
-"Could not retrieve template: Failed to retrieve template: |
| 41 |
-('Connection aborted.', |
| 42 |
-BadStatusLine('SSH-2.0-OpenSSH_7.2p2 Ubuntu-4ubuntu2.1\\r\\n',))" |
| 43 |
- |
| 44 |
-This could be misused by tenants to gain knowledge about the internal |
| 45 |
-network the heat API runs in. |
| 46 |
- |
| 47 |
-To prevent this information leak, this patch alters the error message |
| 48 |
-to not include such details when the url scheme is not 'file'. |
| 49 |
- |
| 50 |
-SecurityImpact |
| 51 |
- |
| 52 |
-Closes-Bug: #1606500 |
| 53 |
- |
| 54 |
-Change-Id: Id1f86f41c1e6c028d889eca7ccbb9cde67631950 |
| 55 |
-(cherry picked from commit eab9a33ce760c55695a5beb2e541487588b08c98) |
| 56 |
---- |
| 57 |
- heat/common/urlfetch.py | 3 ++- |
| 58 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 59 |
- |
| 60 |
-diff --git a/heat/common/urlfetch.py b/heat/common/urlfetch.py |
| 61 |
-index 7efd968..8a7deae 100644 |
| 62 |
---- a/heat/common/urlfetch.py |
| 63 |
-+++ b/heat/common/urlfetch.py |
| 64 |
-@@ -75,4 +75,5 @@ def get(url, allowed_schemes=('http', 'https')): |
| 65 |
- return result |
| 66 |
- |
| 67 |
- except exceptions.RequestException as ex: |
| 68 |
-- raise URLFetchError(_('Failed to retrieve template: %s') % ex) |
| 69 |
-+ LOG.info(_LI('Failed to retrieve template: %s') % ex) |
| 70 |
-+ raise URLFetchError(_('Failed to retrieve template from %s') % url) |
| 71 |
--- |
| 72 |
-cgit v0.12 |
| 73 |
- |
Archives