Skip to content

Commit 90dba23

Browse files
committed
Pass through copypath and prepend_cn (x509_v2)
1 parent 5bab951 commit 90dba23

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

changelog/68828.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Made x509_v2 certificate_managed respect `copypath` and `prepend_cn` parameters

salt/states/x509_v2.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,6 @@ def certificate_managed(
227227
signing_policy=None,
228228
encoding="pem",
229229
append_certs=None,
230-
copypath=None,
231-
prepend_cn=False,
232230
digest="sha256",
233231
signing_private_key=None,
234232
signing_private_key_passphrase=None,

tests/pytests/functional/states/test_x509_v2.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,21 @@ def test_certificate_managed_pkcs12_embedded_pk_kept(
15211521
assert new_pk.public_key().public_numbers() == cur_pk.public_key().public_numbers()
15221522

15231523

1524+
@pytest.mark.parametrize("prepend_cn", [False, True])
1525+
def test_certificate_managed_copypath(
1526+
x509, cert_args, rsa_privkey, ca_key, prepend_cn, tmp_path
1527+
):
1528+
cert_args["private_key"] = rsa_privkey
1529+
cert_args["copypath"] = str(tmp_path)
1530+
cert_args["prepend_cn"] = prepend_cn
1531+
ret = x509.certificate_managed(**cert_args)
1532+
cert = _assert_cert_basic(ret, cert_args["name"], rsa_privkey, ca_key)
1533+
prefix = ""
1534+
if prepend_cn:
1535+
prefix = "success-"
1536+
assert (tmp_path / f"{prefix}{cert.serial_number:x}.crt").exists()
1537+
1538+
15241539
def test_crl_managed_empty(x509, crl_args, ca_key):
15251540
ret = x509.crl_managed(**crl_args)
15261541
crl = _assert_crl_basic(ret, ca_key)

0 commit comments

Comments
 (0)