|
 |
9ad913 |
From 964a4d858e7f30e62691e6e0a1abdcd55cc68405 Mon Sep 17 00:00:00 2001
|
|
|
9ad913 |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
9ad913 |
Date: Fri, 25 Jan 2019 16:18:59 +0100
|
|
|
9ad913 |
Subject: [PATCH] Optimize cert remove case
|
|
|
9ad913 |
|
|
|
9ad913 |
The cert_remove and mod subcommands for service and host now pass in the
|
|
|
9ad913 |
name to cert_find() to benefit from special cases.
|
|
|
9ad913 |
|
|
|
9ad913 |
See: https://pagure.io/freeipa/issue/7835
|
|
|
9ad913 |
Signed-off-by: Christian Heimes <cheimes@redhat.com>
|
|
|
9ad913 |
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
9ad913 |
---
|
|
|
9ad913 |
ipaserver/plugins/host.py | 8 ++++++--
|
|
|
9ad913 |
ipaserver/plugins/service.py | 7 +++++--
|
|
|
9ad913 |
2 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
9ad913 |
|
|
|
9ad913 |
diff --git a/ipaserver/plugins/host.py b/ipaserver/plugins/host.py
|
|
|
9ad913 |
index 306105d67a58fd4343933349db70a1d786eaa4b2..c74a3e58f8af6b33e284ba54b5763a684d91bac3 100644
|
|
|
9ad913 |
--- a/ipaserver/plugins/host.py
|
|
|
9ad913 |
+++ b/ipaserver/plugins/host.py
|
|
|
9ad913 |
@@ -899,7 +899,9 @@ class host_mod(LDAPUpdate):
|
|
|
9ad913 |
old_certs = entry_attrs_old.get('usercertificate', [])
|
|
|
9ad913 |
removed_certs = set(old_certs) - set(certs)
|
|
|
9ad913 |
for cert in removed_certs:
|
|
|
9ad913 |
- rm_certs = api.Command.cert_find(certificate=cert)['result']
|
|
|
9ad913 |
+ rm_certs = api.Command.cert_find(
|
|
|
9ad913 |
+ certificate=cert,
|
|
|
9ad913 |
+ host=keys)['result']
|
|
|
9ad913 |
revoke_certs(rm_certs)
|
|
|
9ad913 |
|
|
|
9ad913 |
if certs:
|
|
|
9ad913 |
@@ -1335,7 +1337,9 @@ class host_remove_cert(LDAPRemoveAttributeViaOption):
|
|
|
9ad913 |
assert isinstance(dn, DN)
|
|
|
9ad913 |
|
|
|
9ad913 |
for cert in options.get('usercertificate', []):
|
|
|
9ad913 |
- revoke_certs(api.Command.cert_find(certificate=cert)['result'])
|
|
|
9ad913 |
+ revoke_certs(api.Command.cert_find(
|
|
|
9ad913 |
+ certificate=cert,
|
|
|
9ad913 |
+ host=keys)['result'])
|
|
|
9ad913 |
|
|
|
9ad913 |
return dn
|
|
|
9ad913 |
|
|
|
9ad913 |
diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py
|
|
|
9ad913 |
index be31f810275214eb28a3f6b7ed9e6dc8ec808ae0..d176adddff8d2590d64ba4059018606ff1eb8d48 100644
|
|
|
9ad913 |
--- a/ipaserver/plugins/service.py
|
|
|
9ad913 |
+++ b/ipaserver/plugins/service.py
|
|
|
9ad913 |
@@ -703,7 +703,8 @@ class service_mod(LDAPUpdate):
|
|
|
9ad913 |
removed_certs = set(old_certs) - set(certs)
|
|
|
9ad913 |
for cert in removed_certs:
|
|
|
9ad913 |
rm_certs = api.Command.cert_find(
|
|
|
9ad913 |
- certificate=cert.public_bytes(x509.Encoding.DER))['result']
|
|
|
9ad913 |
+ certificate=cert.public_bytes(x509.Encoding.DER),
|
|
|
9ad913 |
+ service=keys)['result']
|
|
|
9ad913 |
revoke_certs(rm_certs)
|
|
|
9ad913 |
|
|
|
9ad913 |
if certs:
|
|
|
9ad913 |
@@ -983,7 +984,9 @@ class service_remove_cert(LDAPRemoveAttributeViaOption):
|
|
|
9ad913 |
assert isinstance(dn, DN)
|
|
|
9ad913 |
|
|
|
9ad913 |
for cert in options.get('usercertificate', []):
|
|
|
9ad913 |
- revoke_certs(api.Command.cert_find(certificate=cert)['result'])
|
|
|
9ad913 |
+ revoke_certs(api.Command.cert_find(
|
|
|
9ad913 |
+ certificate=cert,
|
|
|
9ad913 |
+ service=keys)['result'])
|
|
|
9ad913 |
|
|
|
9ad913 |
return dn
|
|
|
9ad913 |
|
|
|
9ad913 |
--
|
|
|
9ad913 |
2.20.1
|
|
|
9ad913 |
|