Change smack labels for sockets.

Current status:
* key-manager::api-control (gives access to api CKM::Control)
* key-manager::api-ocsp (gives access to api CKM::Manager::ocspCheck)
* key-manager::api-storage (gives access to rest of api implemented in CKM::Manager)

Change-Id: I64a28042e358c88ced34b89d69d3b54f91124dc7

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index ab29eb3..39f8339 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -49,8 +49,8 @@ CKMService::~CKMService() {
 GenericSocketService::ServiceDescriptionVector CKMService::GetServiceDescription()
 {
     return ServiceDescriptionVector {
-        {SERVICE_SOCKET_CKM_CONTROL, "ckm::api-control", SOCKET_ID_CONTROL},
-        {SERVICE_SOCKET_CKM_STORAGE, "ckm::api-storage", SOCKET_ID_STORAGE}
+        {SERVICE_SOCKET_CKM_CONTROL, "key-manager::api-control", SOCKET_ID_CONTROL},
+        {SERVICE_SOCKET_CKM_STORAGE, "key-manager::api-storage", SOCKET_ID_STORAGE}
     };
 }
 

diff --git a/src/manager/service/ocsp-service.cpp b/src/manager/service/ocsp-service.cpp
index 6f1f2ab..4a3884a 100644 (file)
--- a/src/manager/service/ocsp-service.cpp
+++ b/src/manager/service/ocsp-service.cpp
@@ -48,7 +48,7 @@ OCSPService::~OCSPService() {
 GenericSocketService::ServiceDescriptionVector OCSPService::GetServiceDescription()
 {
     return ServiceDescriptionVector {
-        {SERVICE_SOCKET_OCSP, "ckm::api-ocsp", SOCKET_ID_OCSP}
+        {SERVICE_SOCKET_OCSP, "key-manager::api-ocsp", SOCKET_ID_OCSP}
     };
 }
 

diff --git a/systemd/central-key-manager-api-control.socket b/systemd/central-key-manager-api-control.socket
index cb5432d..3aabb64 100644 (file)
--- a/systemd/central-key-manager-api-control.socket
+++ b/systemd/central-key-manager-api-control.socket
@@ -1,7 +1,7 @@
 [Socket]
 ListenStream=/tmp/.central-key-manager-api-control.sock
 SockMode=0777
-SmackLabelIPIn=ckm::api-control
+SmackLabelIPIn=key-manager::api-control
 SmackLabelIPOut=@
 
 Service=central-key-manager.service

diff --git a/systemd/central-key-manager-api-ocsp.socket b/systemd/central-key-manager-api-ocsp.socket
index 1d78a19..9d33029 100644 (file)
--- a/systemd/central-key-manager-api-ocsp.socket
+++ b/systemd/central-key-manager-api-ocsp.socket
@@ -1,7 +1,7 @@
 [Socket]
 ListenStream=/tmp/.central-key-manager-api-ocsp.sock
 SockMode=0777
-SmackLabelIPIn=ckm::api-ocsp
+SmackLabelIPIn=key-manager::api-ocsp
 SmackLabelIPOut=@
 
 Service=central-key-manager.service

diff --git a/systemd/central-key-manager-api-storage.socket b/systemd/central-key-manager-api-storage.socket
index 3ac1b0e..3ad64f4 100644 (file)
--- a/systemd/central-key-manager-api-storage.socket
+++ b/systemd/central-key-manager-api-storage.socket
@@ -1,7 +1,7 @@
 [Socket]
 ListenStream=/tmp/.central-key-manager-api-storage.sock
 SockMode=0777
-SmackLabelIPIn=ckm::api-storage
+SmackLabelIPIn=key-manager::api-storage
 SmackLabelIPOut=@
 
 Service=central-key-manager.service