From d91e12942d062cd54990f37b49d3ec072b937ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= Date: Thu, 13 Apr 2017 15:42:38 +0000 Subject: [PATCH] Tagging fixes --- certidude/api/tag.py | 5 ++++- certidude/authority.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/certidude/api/tag.py b/certidude/api/tag.py index 4887494..6c4a154 100644 --- a/certidude/api/tag.py +++ b/certidude/api/tag.py @@ -56,7 +56,10 @@ class TagDetailResource(object): tags = set(getxattr(path, "user.xdg.tags").decode("utf-8").split(",")) except IOError: tags = set() - tags.remove(tag) + try: + tags.remove(tag) + except KeyError: + pass if "=" in tag: tags.add("%s=%s" % (tag.split("=")[0], value)) else: diff --git a/certidude/authority.py b/certidude/authority.py index 80bc30c..73d236a 100644 --- a/certidude/authority.py +++ b/certidude/authority.py @@ -123,6 +123,7 @@ def revoke(common_name): attachments=(attach_cert,), serial_number="%x" % cert.serial, common_name=common_name) + return revoked_path def server_flags(cn): if config.USER_ENROLLMENT_ALLOWED and not config.USER_MULTIPLE_CERTIFICATES: @@ -317,7 +318,7 @@ def _sign(csr, buf, overwrite=False): revoked_path = os.path.join(config.REVOKED_DIR, "%x.pem" % prev.serial) os.rename(signed_path, revoked_path) else: - revoke(common_name.value) + revoked_path = revoke(common_name.value) else: raise EnvironmentError("Will not overwrite existing certificate")