Skip to content

avoid throwing exception on decrypt failure #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thperapp merged 2 commits into from
Nov 13, 2025
Merged

avoid throwing exception on decrypt failure #2128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42b00ac
avoid throwing exception on decrypt failure
thperapp Nov 13, 2025
aa5701b
add additional comments and error handling
thperapp Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions Utils/HandlerUtil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,24 +201,21 @@ def _parse_config(self, ctxt):
cms_cmd = 'openssl cms -inform DER -decrypt -recip {0} -inkey {1}'.format(cert,pkey)
smime_cmd = 'openssl smime -inform DER -decrypt -recip {0} -inkey {1}'.format(cert,pkey)

protected_settings_str = None
protected_settings_str = ''
for decrypt_cmd in [cms_cmd, smime_cmd]:
try:
session = subprocess.Popen([decrypt_cmd], shell=True,
stdin=subprocess.PIPE,
stderr=subprocess.STDOUT,
stdout=subprocess.PIPE)
output = session.communicate(unencodedSettings)
# success only if return code is 0 and we have output
if session.returncode == 0 and output[0]:
protected_settings_str = output[0]
# waagent.RunSendStdin returns a tuple (return code, stdout)
output = waagent.RunSendStdin(decrypt_cmd, unencodedSettings)
if output and output[0] == 0 and output[1]:
protected_settings_str = output[1]
if decrypt_cmd == cms_cmd:
self.log('Decrypted protectedSettings using openssl cms.')
else:
self.log('Decrypted protectedSettings using openssl smime fallback.')
break
else:
self.log('Attempt to decrypt protectedSettings with "{0}" failed (rc={1}).'.format(decrypt_cmd, session.returncode))
rc = output[0] if output else 'N/A'
self.log('Attempt to decrypt protectedSettings with "{0}" failed (rc={1}).'.format(decrypt_cmd, rc))
except OSError:
pass

Expand Down