diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-02-11 18:12:02 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-02-14 16:43:48 -0500 |
commit | dab452442d1425332369d00d95be4cd1b460407f (patch) | |
tree | 3740676d970c6877f0956f77381f595fe607fa11 /ipalib/plugins/service.py | |
parent | 0e4f0528cfbf771ad9b52d329c2ad26720ee4e66 (diff) | |
download | freeipa-dab452442d1425332369d00d95be4cd1b460407f.tar.gz freeipa-dab452442d1425332369d00d95be4cd1b460407f.tar.xz freeipa-dab452442d1425332369d00d95be4cd1b460407f.zip |
The --out option wasn't working at all with cert-show.
Also fix some related problems in write_certificate(), handle
either a DER or base64-formatted incoming certificate and don't
explode if the filename is None.
ticket 954
Diffstat (limited to 'ipalib/plugins/service.py')
-rw-r--r-- | ipalib/plugins/service.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index cab1f7b27..970ed0437 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -231,6 +231,8 @@ def check_writable_file(filename): Determine if the file is writable. If the file doesn't exist then open the file to test writability. """ + if filename is None: + raise errors.FileError(reason='Filename is empty') try: if file_exists(filename): if not os.access(filename, os.W_OK): @@ -255,6 +257,12 @@ def write_certificate(cert, filename): """ Check to see if the certificate should be written to a file and do so. """ + if cert and util.isvalid_base64(cert): + try: + cert = base64.b64decode(cert) + except Exception, e: + raise errors.Base64DecodeError(reason=str(e)) + try: fp = open(filename, 'w') fp.write(make_pem(base64.b64encode(cert))) |