fc16e6ca2c
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=132
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From b10ca8ee857e14915ac83a8614521495b42b5d2b Mon Sep 17 00:00:00 2001
|
|
From: Erik Johnson <palehose@gmail.com>
|
|
Date: Fri, 24 Aug 2018 10:35:55 -0500
|
|
Subject: [PATCH] Fixes: CVE-2018-15750, CVE-2018-15751
|
|
|
|
Ensure that tokens are hex to avoid hanging/errors in cherrypy
|
|
|
|
Add empty token salt-api integration tests
|
|
|
|
Handle Auth exceptions in run_job
|
|
|
|
Update tornado test to correct authentication message
|
|
---
|
|
salt/netapi/rest_cherrypy/app.py | 7 -------
|
|
tests/integration/netapi/rest_tornado/test_app.py | 4 ++--
|
|
2 files changed, 2 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py
|
|
index 40ee976b25..f9ca908115 100644
|
|
--- a/salt/netapi/rest_cherrypy/app.py
|
|
+++ b/salt/netapi/rest_cherrypy/app.py
|
|
@@ -1174,13 +1174,6 @@ class LowDataAdapter(object):
|
|
except (TypeError, ValueError):
|
|
raise cherrypy.HTTPError(401, 'Invalid token')
|
|
|
|
- if 'token' in chunk:
|
|
- # Make sure that auth token is hex
|
|
- try:
|
|
- int(chunk['token'], 16)
|
|
- except (TypeError, ValueError):
|
|
- raise cherrypy.HTTPError(401, 'Invalid token')
|
|
-
|
|
if client:
|
|
chunk['client'] = client
|
|
|
|
diff --git a/tests/integration/netapi/rest_tornado/test_app.py b/tests/integration/netapi/rest_tornado/test_app.py
|
|
index a6829bdd4f..da96012b41 100644
|
|
--- a/tests/integration/netapi/rest_tornado/test_app.py
|
|
+++ b/tests/integration/netapi/rest_tornado/test_app.py
|
|
@@ -240,8 +240,8 @@ class TestSaltAPIHandler(_SaltnadoIntegrationTestCase):
|
|
self.assertIn('jid', ret[0]) # the first 2 are regular returns
|
|
self.assertIn('jid', ret[1])
|
|
self.assertIn('Failed to authenticate', ret[2]) # bad auth
|
|
- self.assertEqual(ret[0]['minions'], sorted(['minion', 'sub_minion']))
|
|
- self.assertEqual(ret[1]['minions'], sorted(['minion', 'sub_minion']))
|
|
+ self.assertEqual(ret[0]['minions'], sorted(['minion', 'sub_minion', 'localhost']))
|
|
+ self.assertEqual(ret[1]['minions'], sorted(['minion', 'sub_minion', 'localhost']))
|
|
|
|
def test_simple_local_async_post_no_tgt(self):
|
|
low = [{'client': 'local_async',
|
|
--
|
|
2.17.1
|
|
|
|
|