mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Up until now, Bytes parameter was used for certificate parameters throughout the framework. However, the Bytes parameter does nothing special for certificates, like validation, so this had to be done for each of the parameters which were supposed to represent a certificate. This commit introduces a special Certificate parameter which takes care of certificate validation so this does not have to be done separately. It also makes sure that the certificates represented by this parameter are always converted to DER format so that we can work with them in a unified manner throughout the framework. This commit also makes it possible to pass bytes directly during instantiation of the Certificate parameter and they are still represented correctly after their conversion in the _convert_scalar() method. https://pagure.io/freeipa/issue/4985 Reviewed-By: Fraser Tweedale <ftweedal@redhat.com> Reviewed-By: Rob Crittenden <rcritten@redhat.com> Reviewed-By: Martin Basti <mbasti@redhat.com>
215 lines
7.2 KiB
Python
215 lines
7.2 KiB
Python
# Authors:
|
|
# Andrew Wnuk <awnuk@redhat.com>
|
|
# Jason Gerard DeRose <jderose@redhat.com>
|
|
# John Dennis <jdennis@redhat.com>
|
|
#
|
|
# Copyright (C) 2009 Red Hat
|
|
# see file 'COPYING' for use and warranty information
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import base64
|
|
|
|
import six
|
|
|
|
from ipaclient import csrgen
|
|
from ipaclient.frontend import MethodOverride
|
|
from ipalib import errors
|
|
from ipalib import x509
|
|
from ipalib import util
|
|
from ipalib.parameters import File, Flag, Str
|
|
from ipalib.plugable import Registry
|
|
from ipalib.text import _
|
|
|
|
if six.PY3:
|
|
unicode = str
|
|
|
|
register = Registry()
|
|
|
|
|
|
class CertRetrieveOverride(MethodOverride):
|
|
takes_options = (
|
|
Str(
|
|
'certificate_out?',
|
|
doc=_('Write certificate (chain if --chain used) to file'),
|
|
include='cli',
|
|
cli_metavar='FILE',
|
|
),
|
|
)
|
|
|
|
def forward(self, *args, **options):
|
|
if 'certificate_out' in options:
|
|
certificate_out = options.pop('certificate_out')
|
|
try:
|
|
util.check_writable_file(certificate_out)
|
|
except errors.FileError as e:
|
|
raise errors.ValidationError(name='certificate-out',
|
|
error=str(e))
|
|
else:
|
|
certificate_out = None
|
|
|
|
result = super(CertRetrieveOverride, self).forward(*args, **options)
|
|
|
|
if certificate_out is not None:
|
|
if options.get('chain', False):
|
|
certs = result['result']['certificate_chain']
|
|
else:
|
|
certs = [result['result']['certificate']]
|
|
certs = (x509.load_der_x509_certificate(base64.b64decode(cert))
|
|
for cert in certs)
|
|
x509.write_certificate_list(certs, certificate_out)
|
|
|
|
return result
|
|
|
|
|
|
@register(override=True, no_fail=True)
|
|
class cert_request(CertRetrieveOverride):
|
|
takes_options = CertRetrieveOverride.takes_options + (
|
|
Str(
|
|
'database?',
|
|
label=_('Path to NSS database'),
|
|
doc=_('Path to NSS database to use for private key'),
|
|
),
|
|
Str(
|
|
'private_key?',
|
|
label=_('Path to private key file'),
|
|
doc=_('Path to PEM file containing a private key'),
|
|
),
|
|
Str(
|
|
'password_file?',
|
|
label=_(
|
|
'File containing a password for the private key or database'),
|
|
),
|
|
Str(
|
|
'csr_profile_id?',
|
|
label=_('Name of CSR generation profile (if not the same as'
|
|
' profile_id)'),
|
|
),
|
|
)
|
|
|
|
def get_args(self):
|
|
for arg in super(cert_request, self).get_args():
|
|
if arg.name == 'csr':
|
|
arg = arg.clone_retype(arg.name, File, required=False)
|
|
yield arg
|
|
|
|
def forward(self, csr=None, **options):
|
|
database = options.pop('database', None)
|
|
private_key = options.pop('private_key', None)
|
|
csr_profile_id = options.pop('csr_profile_id', None)
|
|
password_file = options.pop('password_file', None)
|
|
|
|
if csr is None:
|
|
if database:
|
|
adaptor = csrgen.NSSAdaptor(database, password_file)
|
|
elif private_key:
|
|
adaptor = csrgen.OpenSSLAdaptor(private_key, password_file)
|
|
else:
|
|
raise errors.InvocationError(
|
|
message=u"One of 'database' or 'private_key' is required")
|
|
|
|
pubkey_info = adaptor.get_subject_public_key_info()
|
|
pubkey_info_b64 = base64.b64encode(pubkey_info)
|
|
|
|
# If csr_profile_id is passed, that takes precedence.
|
|
# Otherwise, use profile_id. If neither are passed, the default
|
|
# in cert_get_requestdata will be used.
|
|
profile_id = csr_profile_id
|
|
if profile_id is None:
|
|
profile_id = options.get('profile_id')
|
|
|
|
response = self.api.Command.cert_get_requestdata(
|
|
profile_id=profile_id,
|
|
principal=options.get('principal'),
|
|
public_key_info=unicode(pubkey_info_b64))
|
|
|
|
req_info_b64 = response['result']['request_info']
|
|
req_info = base64.b64decode(req_info_b64)
|
|
|
|
csr = adaptor.sign_csr(req_info)
|
|
|
|
if not csr:
|
|
raise errors.CertificateOperationError(
|
|
error=(_('Generated CSR was empty')))
|
|
|
|
# cert_request requires the CSR to be base64-encoded (but PEM
|
|
# header and footer are not required)
|
|
csr = unicode(base64.b64encode(csr))
|
|
else:
|
|
if database is not None or private_key is not None:
|
|
raise errors.MutuallyExclusiveError(reason=_(
|
|
"Options 'database' and 'private_key' are not compatible"
|
|
" with 'csr'"))
|
|
|
|
return super(cert_request, self).forward(csr, **options)
|
|
|
|
|
|
@register(override=True, no_fail=True)
|
|
class cert_show(CertRetrieveOverride):
|
|
def get_options(self):
|
|
for option in super(cert_show, self).get_options():
|
|
if option.name == 'out':
|
|
# skip server-defined --out
|
|
continue
|
|
if option.name == 'certificate_out':
|
|
# add --out as a deprecated alias of --certificate-out
|
|
option = option.clone_rename(
|
|
'out',
|
|
cli_name='certificate_out',
|
|
deprecated_cli_aliases={'out'},
|
|
)
|
|
yield option
|
|
|
|
def forward(self, *args, **options):
|
|
try:
|
|
options['certificate_out'] = options.pop('out')
|
|
except KeyError:
|
|
pass
|
|
|
|
return super(cert_show, self).forward(*args, **options)
|
|
|
|
|
|
@register(override=True, no_fail=True)
|
|
class cert_remove_hold(MethodOverride):
|
|
has_output_params = (
|
|
Flag('unrevoked',
|
|
label=_('Unrevoked'),
|
|
),
|
|
Str('error_string',
|
|
label=_('Error'),
|
|
),
|
|
)
|
|
|
|
|
|
@register(override=True, no_fail=True)
|
|
class cert_find(MethodOverride):
|
|
takes_options = (
|
|
File(
|
|
'file?',
|
|
label=_("Input filename"),
|
|
doc=_('File to load the certificate from.'),
|
|
include='cli',
|
|
),
|
|
)
|
|
|
|
def forward(self, *args, **options):
|
|
if self.api.env.context == 'cli':
|
|
if 'certificate' in options and 'file' in options:
|
|
raise errors.MutuallyExclusiveError(
|
|
reason=_("cannot specify both raw certificate and file"))
|
|
if 'certificate' not in options and 'file' in options:
|
|
options['certificate'] = x509.strip_header(options.pop('file'))
|
|
|
|
return super(cert_find, self).forward(*args, **options)
|