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

Merge pull request #41566 from morganwillcock/certutil

Browse source 
win_certutil: workaround for reading serial numbers with non-English languages
This commit is contained in:
Mike Place 2017-06-21 10:40:28 -05:00 • committed by GitHub
commit 66f8c83c93
2 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/win_certutil.py
View file

@ -42,9 +42,10 @@ def get_cert_serial(cert_file):
salt '*' certutil.get_cert_serial <certificate name>
'''
cmd = "certutil.exe -verify {0}".format(cert_file)
cmd = "certutil.exe -silent -verify {0}".format(cert_file)
out = __salt__['cmd.run'](cmd)
matches = re.search(r"Serial: (.*)", out)
# match serial number by paragraph to work with multiple languages
matches = re.search(r":\s*(\w*)\r\n\r\n", out)
if matches is not None:
return matches.groups()[0].strip()
else:
@ -66,7 +67,8 @@ def get_stored_cert_serials(store):
'''
cmd = "certutil.exe -store {0}".format(store)
out = __salt__['cmd.run'](cmd)
matches = re.findall(r"Serial Number: (.*)\r", out)
# match serial numbers by header position to work with multiple languages
matches = re.findall(r"={16}\r\n.*:\s*(\w*)\r\n", out)
return matches

49
tests/unit/modules/win_certutil_test.py
View file

@ -25,34 +25,54 @@ class CertUtilTestCase(TestCase):
'''
Test getting the serial number from a certificate
'''
expected = 'XYZABC'
mock = MagicMock(return_value='CertInfo\r\nSerial: XYZABC\r\nOtherStuff')
expected = '180720d39cd2db3244ba037417241e90'
mock = MagicMock(return_value=(
'CertInfo\r\n'
'Cert Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
'\r\n'
'OtherStuff'))
with patch.dict(certutil.__salt__, {'cmd.run': mock}):
out = certutil.get_cert_serial('/path/to/cert.cer')
mock.assert_called_once_with('certutil.exe -verify /path/to/cert.cer')
mock.assert_called_once_with(
'certutil.exe -silent -verify /path/to/cert.cer')
self.assertEqual(expected, out)
def test_get_serials(self):
'''
Test getting the all the serial numbers from a store
Test getting all the serial numbers from a store
'''
expected = ['XYZABC', '123456']
mock = MagicMock(return_value='CertInfo\r\nSerial Number: XYZABC\r\nSerial Number: 123456\r\n')
expected = ['180720d39cd2db3244ba037417241e90',
'1768ac4e5b72bf1d0df0df118b34b959']
mock = MagicMock(return_value=(
'CertInfo\r\n'
'================ Certificate 0 ================\r\n'
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
'OtherStuff\r\n'
'\r\n'
'================ Certificate 1 ================\r\n'
'Serial Number: 1768ac4e5b72bf1d0df0df118b34b959\r\n'
'OtherStuff'))
with patch.dict(certutil.__salt__, {'cmd.run': mock}):
out = certutil.get_stored_cert_serials('TrustedPublisher')
mock.assert_called_once_with('certutil.exe -store TrustedPublisher')
mock.assert_called_once_with(
'certutil.exe -store TrustedPublisher')
self.assertEqual(expected, out)
def test_add_store(self):
'''
Test adding a certificate to a specific store
'''
cmd_mock = MagicMock(return_value='CertInfo\r\nSerial: XYZABC\r\nOtherStuff')
cmd_mock = MagicMock(return_value=(
'CertInfo\r\n'
'================ Certificate 0 ================\r\n'
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
'OtherStuff'))
cache_mock = MagicMock(return_value='/tmp/cert.cer')
with patch.dict(certutil.__salt__, {'cmd.run': cmd_mock,
'cp.cache_file': cache_mock}):
certutil.add_store('salt://path/to/file', 'TrustedPublisher')
cmd_mock.assert_called_once_with('certutil.exe -addstore TrustedPublisher /tmp/cert.cer')
cmd_mock.assert_called_once_with(
'certutil.exe -addstore TrustedPublisher /tmp/cert.cer')
cache_mock.assert_called_once_with('salt://path/to/file', 'base')
@patch('salt.modules.win_certutil.get_cert_serial')
@ -60,13 +80,18 @@ class CertUtilTestCase(TestCase):
'''
Test removing a certificate to a specific store
'''
cmd_mock = MagicMock(return_value='CertInfo\r\nSerial: XYZABC\r\nOtherStuff')
cmd_mock = MagicMock(return_value=(
'CertInfo\r\n'
'================ Certificate 0 ================\r\n'
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
'OtherStuff'))
cache_mock = MagicMock(return_value='/tmp/cert.cer')
cert_serial_mock.return_value = "ABCDEF"
cert_serial_mock.return_value = 'ABCDEF'
with patch.dict(certutil.__salt__, {'cmd.run': cmd_mock,
'cp.cache_file': cache_mock}):
certutil.del_store('salt://path/to/file', 'TrustedPublisher')
cmd_mock.assert_called_once_with('certutil.exe -delstore TrustedPublisher ABCDEF')
cmd_mock.assert_called_once_with(
'certutil.exe -delstore TrustedPublisher ABCDEF')
cache_mock.assert_called_once_with('salt://path/to/file', 'base')