mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
httpinstance: handle supplied PKCS#12 files in installation
Part of the mod_nss -> mod_ssl move. This patch allows loading necessary certificates for Apache to function from PKCS#12 files. This should fix CA-less and domain level 0 installations. Related: https://pagure.io/freeipa/issue/3757 Reviewed-By: Christian Heimes <cheimes@redhat.com> Reviewed-By: Stanislav Laznicka <slaznick@redhat.com> Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import binascii
|
||||
import datetime
|
||||
import ipaddress
|
||||
@@ -41,8 +42,9 @@ import re
|
||||
from cryptography import x509 as crypto_x509
|
||||
from cryptography import utils as crypto_utils
|
||||
from cryptography.hazmat.backends import default_backend
|
||||
from cryptography.hazmat.primitives import serialization
|
||||
from cryptography.hazmat.primitives.serialization import (
|
||||
Encoding, PublicFormat
|
||||
Encoding, PublicFormat, PrivateFormat, load_pem_private_key
|
||||
)
|
||||
from pyasn1.type import univ, char, namedtype, tag
|
||||
from pyasn1.codec.der import decoder, encoder
|
||||
@@ -59,9 +61,13 @@ if six.PY3:
|
||||
PEM = 0
|
||||
DER = 1
|
||||
|
||||
PEM_REGEX = re.compile(
|
||||
PEM_CERT_REGEX = re.compile(
|
||||
b'-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----',
|
||||
re.DOTALL)
|
||||
PEM_PRIV_REGEX = re.compile(
|
||||
b'-----BEGIN(?: ENCRYPTED)?(?: (?:RSA|DSA|DH|EC))? PRIVATE KEY-----.*?'
|
||||
b'-----END(?: ENCRYPTED)?(?: (?:RSA|DSA|DH|EC))? PRIVATE KEY-----',
|
||||
re.DOTALL)
|
||||
|
||||
EKU_SERVER_AUTH = '1.3.6.1.5.5.7.3.1'
|
||||
EKU_CLIENT_AUTH = '1.3.6.1.5.5.7.3.2'
|
||||
@@ -431,7 +437,7 @@ def load_certificate_list(data):
|
||||
|
||||
Return a list of python-cryptography ``Certificate`` objects.
|
||||
"""
|
||||
certs = PEM_REGEX.findall(data)
|
||||
certs = PEM_CERT_REGEX.findall(data)
|
||||
return [load_pem_x509_certificate(cert) for cert in certs]
|
||||
|
||||
|
||||
@@ -446,6 +452,35 @@ def load_certificate_list_from_file(filename):
|
||||
return load_certificate_list(f.read())
|
||||
|
||||
|
||||
def load_private_key_list(data, password=None):
|
||||
"""
|
||||
Load a private key list from a sequence of concatenated PEMs.
|
||||
|
||||
:param data: bytes containing the private keys
|
||||
:param password: bytes, the password to encrypted keys in the bundle
|
||||
|
||||
:returns: List of python-cryptography ``PrivateKey`` objects
|
||||
"""
|
||||
crypto_backend = default_backend()
|
||||
priv_keys = []
|
||||
|
||||
for match in re.finditer(PEM_PRIV_REGEX, data):
|
||||
if re.search(b"ENCRYPTED", match.group()) is not None:
|
||||
if password is None:
|
||||
raise RuntimeError("Password is required for the encrypted "
|
||||
"keys in the bundle.")
|
||||
# Load private key as encrypted
|
||||
priv_keys.append(
|
||||
load_pem_private_key(match.group(), password,
|
||||
backend=crypto_backend))
|
||||
else:
|
||||
priv_keys.append(
|
||||
load_pem_private_key(match.group(), None,
|
||||
backend=crypto_backend))
|
||||
|
||||
return priv_keys
|
||||
|
||||
|
||||
def pkcs7_to_certs(data, datatype=PEM):
|
||||
"""
|
||||
Extract certificates from a PKCS #7 object.
|
||||
@@ -535,6 +570,24 @@ def write_certificate_list(certs, filename):
|
||||
raise errors.FileError(reason=str(e))
|
||||
|
||||
|
||||
def write_pem_private_key(priv_key, filename):
|
||||
"""
|
||||
Write a private key to a file in PEM format. Will force 0x600 permissions
|
||||
on file.
|
||||
|
||||
:param priv_key: cryptography ``PrivateKey`` object
|
||||
"""
|
||||
try:
|
||||
with open(filename, 'wb') as fp:
|
||||
os.fchmod(fp.fileno(), 0o600)
|
||||
fp.write(priv_key.private_bytes(
|
||||
Encoding.PEM,
|
||||
PrivateFormat.TraditionalOpenSSL,
|
||||
serialization.NoEncryption()))
|
||||
except (IOError, OSError) as e:
|
||||
raise errors.FileError(reason=str(e))
|
||||
|
||||
|
||||
class _PrincipalName(univ.Sequence):
|
||||
componentType = namedtype.NamedTypes(
|
||||
namedtype.NamedType('name-type', univ.Integer().subtype(
|
||||
|
||||
Reference in New Issue
Block a user