85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
|
From 81c955e561dd42ab70a39bf636c90e82a9d7d899 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Date: Mon, 3 Aug 2020 18:52:07 +0200
|
||
|
|
Subject: [PATCH] CAless installation: set the perms on KDC cert file
|
||
|
|
|
||
|
|
In CA less installation, the KDC certificate file does not have
|
||
|
|
the expected 644 permissions. As a consequence, WebUI login
|
||
|
|
fails.
|
||
|
|
|
||
|
|
The fix makes sure that the KDC cert file is saved with 644 perms.
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/8440
|
||
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
---
|
||
|
|
ipaserver/install/krbinstance.py | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
|
||
|
|
index 09d14693c..1910ff374 100644
|
||
|
|
--- a/ipaserver/install/krbinstance.py
|
||
|
|
+++ b/ipaserver/install/krbinstance.py
|
||
|
|
@@ -536,6 +536,8 @@ class KrbInstance(service.Service):
|
||
|
|
certs.install_pem_from_p12(self.pkcs12_info[0],
|
||
|
|
self.pkcs12_info[1],
|
||
|
|
paths.KDC_CERT)
|
||
|
|
+ # The KDC cert needs to be readable by everyone
|
||
|
|
+ os.chmod(paths.KDC_CERT, 0o644)
|
||
|
|
certs.install_key_from_p12(self.pkcs12_info[0],
|
||
|
|
self.pkcs12_info[1],
|
||
|
|
paths.KDC_KEY)
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|
||
|
|
From 295dd4235f693b7b4b4270b46a28cb6e7b3d00b4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Date: Mon, 3 Aug 2020 18:53:47 +0200
|
||
|
|
Subject: [PATCH] ipatests: check KDC cert permissions in CA less install
|
||
|
|
|
||
|
|
The KDC certificate file must be stored with 644 permissions.
|
||
|
|
Add a test checking the file permissions on server + replica.
|
||
|
|
|
||
|
|
Related: https://pagure.io/freeipa/issue/8440
|
||
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
---
|
||
|
|
ipatests/test_integration/test_caless.py | 9 +++++++++
|
||
|
|
1 file changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
|
||
|
|
index a7b2cbbbc..1ea7d9896 100644
|
||
|
|
--- a/ipatests/test_integration/test_caless.py
|
||
|
|
+++ b/ipatests/test_integration/test_caless.py
|
||
|
|
@@ -1527,6 +1527,13 @@ class TestCertInstall(CALessBase):
|
||
|
|
assert result.returncode == 0
|
||
|
|
|
||
|
|
|
||
|
|
+def verify_kdc_cert_perms(host):
|
||
|
|
+ """Verify that the KDC cert pem file has 0644 perms"""
|
||
|
|
+ cmd = host.run_command(['stat', '-c',
|
||
|
|
+ '"%a %G:%U"', paths.KDC_CERT])
|
||
|
|
+ assert "644 root:root" in cmd.stdout_text
|
||
|
|
+
|
||
|
|
+
|
||
|
|
class TestPKINIT(CALessBase):
|
||
|
|
"""Install master and replica with PKINIT"""
|
||
|
|
num_replicas = 1
|
||
|
|
@@ -1540,6 +1547,7 @@ class TestPKINIT(CALessBase):
|
||
|
|
result = cls.install_server(pkinit_pkcs12_exists=True,
|
||
|
|
pkinit_pin=_DEFAULT)
|
||
|
|
assert result.returncode == 0
|
||
|
|
+ verify_kdc_cert_perms(cls.master)
|
||
|
|
|
||
|
|
@replica_install_teardown
|
||
|
|
def test_server_replica_install_pkinit(self):
|
||
|
|
@@ -1549,6 +1557,7 @@ class TestPKINIT(CALessBase):
|
||
|
|
pkinit_pin=_DEFAULT)
|
||
|
|
assert result.returncode == 0
|
||
|
|
self.verify_installation()
|
||
|
|
+ verify_kdc_cert_perms(self.replicas[0])
|
||
|
|
|
||
|
|
|
||
|
|
class TestServerReplicaCALessToCAFull(CALessBase):
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|