cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

letsencrypt: fix account key detection for keys created by openssl_privatekey (#35534)

Browse source 
* Fixing key detection if key was generated with openssl_privatekey.

* Fixing error formatting.
This commit is contained in:
Felix Fontein 2018-01-31 08:24:08 +01:00 committed by ansibot
parent 311918828f
commit 2c482847ce
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/web_infrastructure/letsencrypt.py
View file

@ -566,8 +566,14 @@ class ACMEAccount(object):
if m is not None:
account_key_type = m.group(1).lower()
break
if account_key_type is None:
# This happens for example if openssl_privatekey created this key
# (as opposed to the OpenSSL binary). For now, we assume this is
# an RSA key.
# FIXME: add some kind of auto-detection
account_key_type = "rsa"
if account_key_type not in ("rsa", "ec"):
return 'unknown key type "%s" % account_key_type', {}
return 'unknown key type "%s"' % account_key_type, {}
openssl_keydump_cmd = [self._openssl_bin, account_key_type, "-in", key, "-noout", "-text"]
dummy, out, dummy = self.module.run_command(openssl_keydump_cmd, check_rc=True)