Change socket paths from /tmp... to /run...

[Cause]        Sockets should not be created in /tmp folder
[Solution]     Change systemd socket description
               and protocol defines

[Verification] Build and install Security Server.
               Check if sockets created by systemd are placed in:
               /run/security-server and /run/security-manager

Change-Id: I3f480808d2d3f1bd78b8713d795602da7ccc7dfb
Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>

diff --git a/src/server/common/protocols.cpp b/src/server/common/protocols.cpp
index 9bed7e3ac8012c894d394ab99a9d16556fc3f3bf..42896f43f8594ad2504979240104d839ba9e0308 100644 (file)
--- a/src/server/common/protocols.cpp
+++ b/src/server/common/protocols.cpp
@@ -25,28 +25,34 @@
 #include <protocols.h>
 #include <cstddef>
 
+
 namespace SecurityServer {
 
+#define SOCKET_PATH_PREFIX "/run/"
+#define SOCKET_PATH_PREFIX_SECURITY_SERVER SOCKET_PATH_PREFIX "security-server/"
+#define SOCKET_PATH_PREFIX_SECURITY_MANAGER SOCKET_PATH_PREFIX "security-manager/"
+
 char const * const SERVICE_SOCKET_SHARED_MEMORY =
-        "/tmp/.security-server-api-data-share.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-data-share.socket";
 char const * const SERVICE_SOCKET_GET_GID =
-        "/tmp/.security-server-api-get-gid.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-get-gid.socket";
 char const * const SERVICE_SOCKET_PRIVILEGE_BY_PID =
-        "/tmp/.security-server-api-privilege-by-pid.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-privilege-by-pid.socket";
 char const * const SERVICE_SOCKET_APP_PRIVILEGE_BY_NAME =
-        "/tmp/.security-server-api-app-privilege-by-name.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-app-privilege-by-name.socket";
 char const * const SERVICE_SOCKET_COOKIE_GET =
-        "/tmp/.security-server-api-cookie-get.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-cookie-get.socket";
 char const * const SERVICE_SOCKET_COOKIE_CHECK =
-        "/tmp/.security-server-api-cookie-check.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-cookie-check.socket";
 char const * const SERVICE_SOCKET_PASSWD_CHECK =
-        "/tmp/.security-server-api-password-check.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-password-check.socket";
 char const * const SERVICE_SOCKET_PASSWD_SET =
-        "/tmp/.security-server-api-password-set.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-password-set.socket";
 char const * const SERVICE_SOCKET_PASSWD_RESET =
-        "/tmp/.security-server-api-password-reset.sock";
+        SOCKET_PATH_PREFIX_SECURITY_SERVER "security-server-api-password-reset.socket";
+
 char const * const SERVICE_SOCKET_INSTALLER =
-        "/tmp/.security-manager-installer.sock";
+        SOCKET_PATH_PREFIX_SECURITY_MANAGER"/tmp/.security-manager-installer.socket";
 
 const size_t COOKIE_SIZE = 20;
 

diff --git a/systemd/security-manager-installer.socket b/systemd/security-manager-installer.socket
index ac85faf5660aa6b1a77dc22ee20610e5c97396d3..834a11f6bd5f9e84b0aa2c578a5cf65848c18661 100644 (file)
--- a/systemd/security-manager-installer.socket
+++ b/systemd/security-manager-installer.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-manager-installer.sock
+ListenStream=/run/security-manager/security-manager-installer.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-app-privilege-by-name.socket b/systemd/security-server-app-privilege-by-name.socket
index da595c3e074c6fc71de12b4c2013e4b979c54a0b..0b4e9f4df02cd54388ec848869a02de03d7c4dc6 100644 (file)
--- a/systemd/security-server-app-privilege-by-name.socket
+++ b/systemd/security-server-app-privilege-by-name.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-app-privilege-by-name.sock
+ListenStream=/run/security-server/security-server-api-app-privilege-by-name.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-cookie-check.socket b/systemd/security-server-cookie-check.socket
index 0f889a4c3f23242f7784df01e32717dda4f954d7..58d09a09f49a7f10a33d677bc0281849d6a08469 100644 (file)
--- a/systemd/security-server-cookie-check.socket
+++ b/systemd/security-server-cookie-check.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-cookie-check.sock
+ListenStream=/run/security-server/security-server-api-cookie-check.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-cookie-get.socket b/systemd/security-server-cookie-get.socket
index 899501ebb9d53dd8353db85157ead002f6fdcc40..193b5f8ca86877a7c143ca17688217347a4dbd83 100644 (file)
--- a/systemd/security-server-cookie-get.socket
+++ b/systemd/security-server-cookie-get.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-cookie-get.sock
+ListenStream=/run/security-server/security-server-api-cookie-get.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-data-share.socket b/systemd/security-server-data-share.socket
index bd858c62493e6a9eb1b094758673e719e8920e3f..82a8d366a78cebdc9183134e96f541302c28e2e6 100644 (file)
--- a/systemd/security-server-data-share.socket
+++ b/systemd/security-server-data-share.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-data-share.sock
+ListenStream=/run/security-server/security-server-api-data-share.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-get-gid.socket b/systemd/security-server-get-gid.socket
index 0a0852c91a76a3dcbe8070627e75367deaa3005f..3cca2c1ae1e79533e38b55bf5c7fa9f1906be51e 100644 (file)
--- a/systemd/security-server-get-gid.socket
+++ b/systemd/security-server-get-gid.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-get-gid.sock
+ListenStream=/run/security-server/security-server-api-get-gid.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-password-check.socket b/systemd/security-server-password-check.socket
index d3ac5d5f6cc999a9e5dfef2bedb1170849bc12f7..be9c2fba5bb3fc515fe90fb51d5fffb983fa849c 100644 (file)
--- a/systemd/security-server-password-check.socket
+++ b/systemd/security-server-password-check.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-password-check.sock
+ListenStream=/run/security-server/security-server-api-password-check.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-password-reset.socket b/systemd/security-server-password-reset.socket
index 377d7225e96bee9199bda65127d5974c74b1968a..37caf4f0bfc6f9eaf14020aed174f0156ca777e2 100644 (file)
--- a/systemd/security-server-password-reset.socket
+++ b/systemd/security-server-password-reset.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-password-reset.sock
+ListenStream=/run/security-server/security-server-api-password-reset.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-password-set.socket b/systemd/security-server-password-set.socket
index 0dee1e7d867dc90ac4182b077c9c1a7a068589cb..1c0f2edb96967e3c3570f118704f45a95b4431e0 100644 (file)
--- a/systemd/security-server-password-set.socket
+++ b/systemd/security-server-password-set.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-password-set.sock
+ListenStream=/run/security-server/security-server-api-password-set.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@

diff --git a/systemd/security-server-privilege-by-pid.socket b/systemd/security-server-privilege-by-pid.socket
index 8fd46f26acaf75c9f2112a875a85e2c9ce6461df..1b38aa53a06f81c391590d5e82553cf0445caa6e 100644 (file)
--- a/systemd/security-server-privilege-by-pid.socket
+++ b/systemd/security-server-privilege-by-pid.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/tmp/.security-server-api-privilege-by-pid.sock
+ListenStream=/run/security-server/security-server-api-privilege-by-pid.socket
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@