commit 2e8fa88e24d83a061bd7a40b6c222956b85c640a
author Michal Orzel <michalx.orzel@intel.com> Thu Jul 27 13:14:56 2023 +0200
committer Michal Orzel <michalx.orzel@intel.com> Tue Aug 29 09:24:23 2023 +0200
tree f6eaa5086602f6957b16f890c83142fdb10932a2
parent 2e8ef4ce43975acfec7720683b8c7d721926c398

config: Change authority D-Bus names

Initially CA certificate management service was intended to support only
LDAP usecases. However since some time this has become outdated, as
certificates stored there might serve more purposes, such as SSL
handshakes or mTLS connections. Therefore, I'm proposing to change
service endpoint name from 'ldap' to something more generic, in order to
avoid any confusion, that could come up when developing applications
would like to utilize this feature.

Tested:
Service present on DBus under new name, along with proper object paths.

root@bmc-maca4bf018cd442:~# busctl list | grep phosphor-cert
...
xyz.openbmc_project.Certs.Manager.Authority.Truststore   256 phosphor-certif root             :1.15         phosphor-certificate-manager@authority.service                          -       -
...

root@bmc-maca4bf018cd442:~# busctl tree xyz.openbmc_project.Certs.Manager.Authority.Truststore
`-/xyz
  `-/xyz/openbmc_project
    `-/xyz/openbmc_project/certs
      `-/xyz/openbmc_project/certs/authority
        `-/xyz/openbmc_project/certs/authority/truststore

Change-Id: I1d2c4ef9e7b4846951ce4dd52f869d7c64f3902d
Signed-off-by: Michal Orzel <michalx.orzel@intel.com>

dist/busconfig/phosphor-authority-cert-config.conf

diff --git a/dist/busconfig/phosphor-nslcd-authority-cert-config.conf b/dist/busconfig/phosphor-authority-cert-config.conf
similarity index 73%
rename from dist/busconfig/phosphor-nslcd-authority-cert-config.conf
rename to dist/busconfig/phosphor-authority-cert-config.conf
index 7737ffc..ab7286a 100644
--- a/dist/busconfig/phosphor-nslcd-authority-cert-config.conf
+++ b/dist/busconfig/phosphor-authority-cert-config.conf
@@ -2,7 +2,7 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
   <policy user="root">
-    <allow own="xyz.openbmc_project.Certs.Manager.Authority.Ldap"/>
-    <allow send_destination="xyz.openbmc_project.Certs.Manager.Authority.Ldap"/>
+    <allow own="xyz.openbmc_project.Certs.Manager.Authority.Truststore"/>
+    <allow send_destination="xyz.openbmc_project.Certs.Manager.Authority.Truststore"/>
   </policy>
 </busconfig>

dist/env/authority

diff --git a/dist/env/authority b/dist/env/authority
index d2e8814..c8e27d5 100644
--- a/dist/env/authority
+++ b/dist/env/authority
@@ -1,6 +1,6 @@
 #REST URI endpoint
-#example: /xyz/openbmc_project/certs/authority/ldap
-ENDPOINT=ldap
+#example: /xyz/openbmc_project/certs/authority/truststore
+ENDPOINT=truststore
 
 #Path for the certificate file
 CERTPATH=/etc/ssl/certs/authority

dist/meson.build

diff --git a/dist/meson.build b/dist/meson.build
index 6b29445..b6dda42 100644
--- a/dist/meson.build
+++ b/dist/meson.build
@@ -23,8 +23,8 @@
     ]]
 endif
 
-if not get_option('config-nslcd').disabled()
-    busconfig += 'busconfig/phosphor-nslcd-authority-cert-config.conf'
+if not get_option('config-authority').disabled()
+    busconfig += 'busconfig/phosphor-authority-cert-config.conf'
     certs += 'env/authority'
     systemd_alias += [[
         '../phosphor-certificate-manager@.service',