Add socket activation for get-gid api.

[Issue#]   N/A
[Bug]      N/A
[Cause]    N/A
[Problem]  Lack of socket activation for api get-gid.
[Solution] Add support for socket activation in security-server.

[Verification] Reinstall security-server. Reboot target. Run tests.

Change-Id: Ia3f1a1630df69da85398e5f53cf34a446d79bc94

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index 98040fc..5f3bfe1 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -80,6 +80,7 @@ mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants
 ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/security-server.service
 ln -s ../security-server.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server.socket
 ln -s ../security-server-data-share.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
+ln -s ../security-server-get-gid.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket
 
 %clean
 rm -rf %{buildroot}
@@ -112,6 +113,8 @@ systemctl daemon-reload
 %attr(-,root,root) /usr/lib/systemd/system/security-server.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
 %attr(-,root,root) /usr/lib/systemd/system/security-server-data-share.socket
+%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket
+%attr(-,root,root) /usr/lib/systemd/system/security-server-get-gid.socket
 
 %{_datadir}/license/%{name}
 

diff --git a/src/server2/common/protocols.cpp b/src/server2/common/protocols.cpp
index 3126977..903f0a6 100644 (file)
--- a/src/server2/common/protocols.cpp
+++ b/src/server2/common/protocols.cpp
@@ -31,6 +31,6 @@ char const * const SERVICE_SOCKET_SHARED_MEMORY =
 char const * const SERVICE_SOCKET_ECHO =
     "/tmp/security-server-api-echo.sock";
 char const * const SERVICE_SOCKET_GET_GID =
-    "/tmp/security-server-api-get-gid.sock";
+    "/tmp/.security-server-api-get-gid.sock";
 } // namespace SecurityServer
 

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 75342f8..8febadf 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -2,6 +2,7 @@ INSTALL(FILES
     ${CMAKE_SOURCE_DIR}/systemd/security-server.service
     ${CMAKE_SOURCE_DIR}/systemd/security-server.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-data-share.socket
+    ${CMAKE_SOURCE_DIR}/systemd/security-server-get-gid.socket
     DESTINATION
     /usr/lib/systemd/system
 )

diff --git a/systemd/security-server-get-gid.socket b/systemd/security-server-get-gid.socket
new file mode 100644 (file)
index 0000000..086dbf9
--- /dev/null
+++ b/systemd/security-server-get-gid.socket
@@ -0,0 +1,10 @@
+[Socket]
+ListenStream=/tmp/.security-server-api-get-gid.sock
+SocketMode=0777
+SmackLabelIPIn=*
+SmackLabelIPOut=@
+
+Service=security-server.service
+
+[Install]
+WantedBy=sockets.target

diff --git a/systemd/security-server.service b/systemd/security-server.service
index a15a84c..57af027 100644 (file)
--- a/systemd/security-server.service
+++ b/systemd/security-server.service
@@ -6,6 +6,7 @@ Type=notify
 ExecStart=/usr/bin/security-server
 Sockets=security-server.socket
 Sockets=security-server-data-share.socket
+Sockets=security-server-get-gid.socket
 
 [Install]
 WantedBy=multi-user.target