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

Fix names of NACL dec. methods

Browse source
This commit is contained in:
Petr Michalec 2017-09-17 18:37:11 +02:00
parent c1ca1c4816
commit ad05cc5d98
No known key found for this signature in database
GPG key ID: 5B8DB74408F9296A
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/renderers/nacl.py
View file

@ -22,8 +22,7 @@ To set things up, first generate a keypair. On the master, run the following:
.. code-block:: bash
# salt-call --local nacl.keygen keyfile=/root/.nacl
# salt-call --local nacl.keygen_pub keyfile_pub=/root/.nacl.pub
# salt-call --local nacl.keygen sk_file=/root/.nacl
Using encrypted pillar
@ -33,7 +32,7 @@ To encrypt secrets, copy the public key to your local machine and run:
.. code-block:: bash
$ salt-call --local nacl.enc_pub datatoenc keyfile_pub=/root/.nacl.pub
$ salt-call --local nacl.enc datatoenc pk_file=/root/.nacl.pub
To apply the renderer on a file-by-file basis add the following line to the
@ -80,7 +79,7 @@ def _decrypt_object(obj, **kwargs):
return _decrypt_object(obj.getvalue(), **kwargs)
if isinstance(obj, six.string_types):
if re.search(NACL_REGEX, obj) is not None:
return __salt__['nacl.dec_pub'](re.search(NACL_REGEX, obj).group(1), **kwargs)
return __salt__['nacl.dec'](re.search(NACL_REGEX, obj).group(1), **kwargs)
else:
return obj
elif isinstance(obj, dict):

4
tests/unit/renderers/test_nacl.py
View file

@ -38,7 +38,7 @@ class NaclTestCase(TestCase, LoaderModuleMockMixin):
secret_list = [secret]
crypted_list = [crypted]
with patch.dict(nacl.__salt__, {'nacl.dec_pub': MagicMock(return_value=secret)}):
with patch.dict(nacl.__salt__, {'nacl.dec': MagicMock(return_value=secret)}):
self.assertEqual(nacl._decrypt_object(secret), secret)
self.assertEqual(nacl._decrypt_object(crypted), secret)
self.assertEqual(nacl._decrypt_object(crypted_map), secret_map)
@ -51,5 +51,5 @@ class NaclTestCase(TestCase, LoaderModuleMockMixin):
'''
secret = 'Use more salt.'
crypted = 'NACL[MRN3cc+fmdxyQbz6WMF+jq1hKdU5X5BBI7OjK+atvHo1ll+w1gZ7XyWtZVfq9gK9rQaMfkDxmidJKwE0Mw==]'
with patch.dict(nacl.__salt__, {'nacl.dec_pub': MagicMock(return_value=secret)}):
with patch.dict(nacl.__salt__, {'nacl.dec': MagicMock(return_value=secret)}):
self.assertEqual(nacl.render(crypted), secret)