saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

RemotePillar raises an exception on bad data

Browse source 
If the master returns a bad pillar data response the pillar client
should raise an exception. This changes RemotePillar and
AsyncRemotePillar classes to use the same logic for validating pillar
data from the master. Fixes CVE-2024-37088 by causing salt-call to fail
with a non zero exit code rather than continuing to execute a state when
pillar data rendering fails on the master.
This commit is contained in:
Daniel A. Wozniak 2024-07-12 15:13:37 -07:00 • committed by Daniel Wozniak
parent b8a2e80c4d
commit a504c4cd73
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/pillar/__init__.py
View file

@ -196,6 +196,15 @@ class RemotePillarMixin:
log.trace("ext_pillar_extra_data = %s", extra_data)
return extra_data
def validate_return(self, data):
if not isinstance(data, dict):
msg = "Got a bad pillar from master, type {}, expecting dict: {}".format(
type(data).__name__, data
)
log.error(msg)
# raise an exception! Pillar isn't empty, we can't sync it!
raise SaltClientError(msg)
class AsyncRemotePillar(RemotePillarMixin):
"""
@ -275,14 +284,7 @@ class AsyncRemotePillar(RemotePillarMixin):
except Exception: # pylint: disable=broad-except
log.exception("Exception getting pillar:")
raise SaltClientError("Exception getting pillar.")
if not isinstance(ret_pillar, dict):
msg = "Got a bad pillar from master, type {}, expecting dict: {}".format(
type(ret_pillar).__name__, ret_pillar
)
log.error(msg)
# raise an exception! Pillar isn't empty, we can't sync it!
raise SaltClientError(msg)
self.validate_return(ret_pillar)
raise salt.ext.tornado.gen.Return(ret_pillar)
def destroy(self):
@ -373,14 +375,7 @@ class RemotePillar(RemotePillarMixin):
except Exception: # pylint: disable=broad-except
log.exception("Exception getting pillar:")
raise SaltClientError("Exception getting pillar.")
if not isinstance(ret_pillar, dict):
log.error(
"Got a bad pillar from master, type %s, expecting dict: %s",
type(ret_pillar).__name__,
ret_pillar,
)
return {}
self.validate_return(ret_pillar)
return ret_pillar
def destroy(self):