|
 |
483b06 |
From 993d41e5105653412cec40b8e2a386da802a62bb Mon Sep 17 00:00:00 2001
|
|
|
483b06 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
483b06 |
Date: Mon, 24 Apr 2017 07:10:41 +0000
|
|
|
483b06 |
Subject: [PATCH] ipa-cacert-manage: add --external-ca-type
|
|
|
483b06 |
|
|
|
483b06 |
Add the `--external-ca-type`, as known from `ipa-server-install` and
|
|
|
483b06 |
`ipa-ca-install`, to `ipa-cacert-manage`.
|
|
|
483b06 |
|
|
|
483b06 |
This allows creating IPA CA CSRs suitable for use with Microsoft CS using
|
|
|
483b06 |
`ipa-cacert-manage`:
|
|
|
483b06 |
|
|
|
483b06 |
```
|
|
|
483b06 |
ipa-cacert-manage renew --external-ca --external-ca-type=ms-cs
|
|
|
483b06 |
```
|
|
|
483b06 |
|
|
|
483b06 |
https://pagure.io/freeipa/issue/5799
|
|
|
483b06 |
|
|
|
483b06 |
Reviewed-By: David Kupka <dkupka@redhat.com>
|
|
|
483b06 |
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
|
|
|
483b06 |
---
|
|
|
483b06 |
install/tools/man/ipa-cacert-manage.1 | 3 +++
|
|
|
483b06 |
ipaserver/install/ipa_cacert_manage.py | 21 +++++++++++++++++----
|
|
|
483b06 |
2 files changed, 20 insertions(+), 4 deletions(-)
|
|
|
483b06 |
|
|
|
483b06 |
diff --git a/install/tools/man/ipa-cacert-manage.1 b/install/tools/man/ipa-cacert-manage.1
|
|
|
483b06 |
index 128edd8bd2500a09f406da8dc01a53b269007ab0..e36258d0f96aa1050fe88b05f4fe9a1a8f9a7978 100644
|
|
|
483b06 |
--- a/install/tools/man/ipa-cacert-manage.1
|
|
|
483b06 |
+++ b/install/tools/man/ipa-cacert-manage.1
|
|
|
483b06 |
@@ -78,6 +78,9 @@ Sign the renewed certificate by itself.
|
|
|
483b06 |
\fB\-\-external\-ca\fR
|
|
|
483b06 |
Sign the renewed certificate by external CA.
|
|
|
483b06 |
.TP
|
|
|
483b06 |
+\fB\-\-external\-ca\-type\fR=\fITYPE\fR
|
|
|
483b06 |
+Type of the external CA. Possible values are "generic", "ms-cs". Default value is "generic". Use "ms-cs" to include template name required by Microsoft Certificate Services (MS CS) in the generated CSR.
|
|
|
483b06 |
+.TP
|
|
|
483b06 |
\fB\-\-external\-cert\-file\fR=\fIFILE\fR
|
|
|
483b06 |
File containing the IPA CA certificate and the external CA certificate chain. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times.
|
|
|
483b06 |
.RE
|
|
|
483b06 |
diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py
|
|
|
483b06 |
index 6d28c62b36b3909c9a3d95a5c6c84d1779fe4c33..3b732e4dcbb5c9b4dfbb9e3608bc7d7afd3e10c2 100644
|
|
|
483b06 |
--- a/ipaserver/install/ipa_cacert_manage.py
|
|
|
483b06 |
+++ b/ipaserver/install/ipa_cacert_manage.py
|
|
|
483b06 |
@@ -54,6 +54,12 @@ class CACertManage(admintool.AdminTool):
|
|
|
483b06 |
"--self-signed", dest='self_signed',
|
|
|
483b06 |
action='store_true',
|
|
|
483b06 |
help="Sign the renewed certificate by itself")
|
|
|
483b06 |
+ ext_cas = ("generic", "ms-cs")
|
|
|
483b06 |
+ renew_group.add_option(
|
|
|
483b06 |
+ "--external-ca-type", dest="external_ca_type",
|
|
|
483b06 |
+ type="choice", choices=ext_cas,
|
|
|
483b06 |
+ metavar="{{{0}}}".format(",".join(ext_cas)),
|
|
|
483b06 |
+ help="Type of the external CA. Default: generic")
|
|
|
483b06 |
renew_group.add_option(
|
|
|
483b06 |
"--external-ca", dest='self_signed',
|
|
|
483b06 |
action='store_false',
|
|
|
483b06 |
@@ -179,7 +185,12 @@ class CACertManage(admintool.AdminTool):
|
|
|
483b06 |
def renew_external_step_1(self, ca):
|
|
|
483b06 |
print("Exporting CA certificate signing request, please wait")
|
|
|
483b06 |
|
|
|
483b06 |
- self.resubmit_request('dogtag-ipa-ca-renew-agent-reuse')
|
|
|
483b06 |
+ if self.options.external_ca_type == 'ms-cs':
|
|
|
483b06 |
+ profile = 'SubCA'
|
|
|
483b06 |
+ else:
|
|
|
483b06 |
+ profile = ''
|
|
|
483b06 |
+
|
|
|
483b06 |
+ self.resubmit_request('dogtag-ipa-ca-renew-agent-reuse', profile)
|
|
|
483b06 |
|
|
|
483b06 |
print(("The next step is to get %s signed by your CA and re-run "
|
|
|
483b06 |
"ipa-cacert-manage as:" % paths.IPA_CA_CSR))
|
|
|
483b06 |
@@ -286,11 +297,11 @@ class CACertManage(admintool.AdminTool):
|
|
|
483b06 |
|
|
|
483b06 |
print("CA certificate successfully renewed")
|
|
|
483b06 |
|
|
|
483b06 |
- def resubmit_request(self, ca='dogtag-ipa-ca-renew-agent'):
|
|
|
483b06 |
+ def resubmit_request(self, ca='dogtag-ipa-ca-renew-agent', profile=''):
|
|
|
483b06 |
timeout = api.env.startup_timeout + 60
|
|
|
483b06 |
|
|
|
483b06 |
self.log.debug("resubmitting certmonger request '%s'", self.request_id)
|
|
|
483b06 |
- certmonger.resubmit_request(self.request_id, ca=ca, profile='')
|
|
|
483b06 |
+ certmonger.resubmit_request(self.request_id, ca=ca, profile=profile)
|
|
|
483b06 |
try:
|
|
|
483b06 |
state = certmonger.wait_for_request(self.request_id, timeout)
|
|
|
483b06 |
except RuntimeError:
|
|
|
483b06 |
@@ -304,7 +315,9 @@ class CACertManage(admintool.AdminTool):
|
|
|
483b06 |
"please check the request manually" % self.request_id)
|
|
|
483b06 |
|
|
|
483b06 |
self.log.debug("modifying certmonger request '%s'", self.request_id)
|
|
|
483b06 |
- certmonger.modify(self.request_id, ca='dogtag-ipa-ca-renew-agent')
|
|
|
483b06 |
+ certmonger.modify(self.request_id,
|
|
|
483b06 |
+ ca='dogtag-ipa-ca-renew-agent',
|
|
|
483b06 |
+ profile='')
|
|
|
483b06 |
|
|
|
483b06 |
def install(self):
|
|
|
483b06 |
print("Installing CA certificate, please wait")
|
|
|
483b06 |
--
|
|
|
483b06 |
2.9.3
|
|
|
483b06 |
|