Skip to content

roles/ad: return (cert, key) consistently from AD CA request #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krishnavema wants to merge 1 commit into
base: master
Choose a base branch
from
Open

roles/ad: return (cert, key) consistently from AD CA request #283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion sssd_test_framework/roles/ad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2896,7 +2896,20 @@ def request(
enrollment_agent_hash = self._get_enrollment_agent_hash()

if enrollment_agent_hash is None:
return self.request_basic(template, subject)
# Basic path (no enrollment agent): request_basic returns a PFX bundle.
# Extract the private key and map the certificate to the user here, so
# callers always receive a (cert, key) pair and never need to know the
# internal PFX password.
cert_path, pfx_path, req_path = self.request_basic(template, subject)
key_path = os.path.join(self.temp_dir, f"{os.path.splitext(os.path.basename(pfx_path))[0]}.key")
self.host.conn.run(
f'"Secret123" | & openssl pkcs12 -in "{pfx_path}" -nocerts -nodes -out "{key_path}" -passin stdin'
)
self.host.conn.run(
f'$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2("{cert_path}"); '
f'Set-ADUser -Identity "{user_dn}" -Replace @{{userCertificate = $cert.RawData}}'
)
return cert_path, key_path, req_path

base = subject.split(",")[0].split("=")[1]
netbios_domain = self.host.conn.run("Write-Host (Get-ADDomain).NetBIOSName").stdout.strip()
Expand Down
Loading