server: set permission and group to tdm-socket when it is added

Change-Id: I9052f391202781a9ac34c2fce7efacdd75e83761

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index 5632f7c1f0d78fe9aaca524c4ca8e87cb18c915c..8577063686eebdc131316f1742d6f9eba5d486fa 100644 (file)
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -81,9 +81,6 @@ make -C ut check
 rm -rf %{buildroot}
 %make_install
 
-%__mkdir_p %{buildroot}%{_unitdir}
-install -m 644 service/tdm-socket.service %{buildroot}%{_unitdir}
-install -m 644 service/tdm-socket.path %{buildroot}%{_unitdir}
 %__mkdir_p %{buildroot}%{_unitdir_user}
 install -m 644 service/tdm-socket-user.service %{buildroot}%{_unitdir_user}
 install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
@@ -92,16 +89,11 @@ install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
 
 
 %pre
-%__mkdir_p %{_unitdir}/graphical.target.wants
-ln -sf ../tdm-socket.path %{_unitdir}/graphical.target.wants/
-
 %__mkdir_p %{_unitdir_user}/basic.target.wants
 ln -sf ../tdm-socket-user.path %{_unitdir_user}/basic.target.wants/
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-rm -f %{_unitdir}/graphical.target.wants/tdm-socket.path
-
 rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 
 %files
@@ -110,8 +102,6 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %license COPYING
 %{_libdir}/libtdm.so.*
 %attr(750,root,root) %{_bindir}/tdm-monitor
-%{_unitdir}/tdm-socket.path
-%{_unitdir}/tdm-socket.service
 %{_unitdir_user}/tdm-socket-user.path
 %{_unitdir_user}/tdm-socket-user.service
 %if %{with utest}

diff --git a/service/tdm-socket.path b/service/tdm-socket.path
deleted file mode 100644 (file)
index 5ee772b..0000000
--- a/service/tdm-socket.path
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Wait for tdm-socket
-
-[Path]
-PathExists=/run/tdm-socket

diff --git a/service/tdm-socket.service b/service/tdm-socket.service
deleted file mode 100644 (file)
index de50ebe..0000000
--- a/service/tdm-socket.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description= tdm-socket setup service
-
-[Service]
-User=ui_fw
-Group=ui_fw
-Capabilities=cap_fowner,cap_chown=i
-SecureBits=keep-caps
-Type=oneshot
-SmackProcessLabel=System
-ExecStart=/usr/bin/chmod g+w /run/tdm-socket
-ExecStart=/usr/bin/chgrp display /run/tdm-socket
-
-[Install]
-WantedBy=graphical.target

diff --git a/src/tdm_private.h b/src/tdm_private.h
index 59cb1ad4854080c161255d85f7b7642f582d7f37..25b24b7bbdb417d737362feff44c239dd5417bef 100644 (file)
--- a/src/tdm_private.h
+++ b/src/tdm_private.h
@@ -53,6 +53,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <math.h>
+#include <grp.h>
 
 #include <wayland-server-protocol.h>
 #include <tbm_bufmgr.h>

diff --git a/src/tdm_server.c b/src/tdm_server.c
index 5299c9392d1fb463f9fb48b5f3fbc4e7172cd406..936376814edbfa8a8b02fe5e5010c09b268a1d1c 100644 (file)
--- a/src/tdm_server.c
+++ b/src/tdm_server.c
@@ -625,6 +625,109 @@ _tdm_server_bind(struct wl_client *client, void *data,
        wl_resource_set_implementation(resource, &tdm_implementation, data, destroy_client);
 }
 
+static int
+_tdm_getgrnam_r(const char *name)
+{
+       struct group *grp = NULL;
+       struct group *grp_res = NULL;
+       char* buf = NULL;
+       size_t buf_len;
+       int ret;
+       int id;
+
+       buf_len = sysconf(_SC_GETGR_R_SIZE_MAX);
+       if (buf_len == -1)
+               buf_len = 2048;
+
+       buf = calloc(1, buf_len * sizeof(char));
+       if (!buf) {
+               TDM_ERR("creating buffer failed");
+               goto failed;
+       }
+
+       grp = calloc(1, sizeof(struct group));
+       if (!grp) {
+               TDM_ERR("creating group failed");
+               goto failed;
+       }
+
+       ret = getgrnam_r(name, grp, buf, buf_len, &grp_res);
+       if (ret < 0) {
+               TDM_ERR("getgrnam_r failed errno:%d(%m)", ret);
+               goto failed;
+       }
+
+       if (grp_res == NULL) {
+               TDM_ERR("finding name:%s group failed", name);
+               goto failed;
+       }
+
+       id = grp->gr_gid;
+       free(buf);
+       free(grp);
+
+       return id;
+
+failed:
+       if (buf)
+               free(buf);
+       if (grp)
+               free(grp);
+
+       return -1;
+}
+
+static int
+_tdm_socket_init(tdm_private_loop *private_loop)
+{
+       const char *dir = NULL;
+       char socket_path[128];
+       int ret = -1;
+       uid_t uid;
+       gid_t gid;
+
+       if (wl_display_add_socket(private_loop->wl_display, "tdm-socket")) {
+               TDM_ERR("createing a tdm-socket failed");
+               return 0;
+       }
+
+       dir = getenv("XDG_RUNTIME_DIR");
+       if (!dir) {
+               TDM_ERR("getting XDG_RUNTIME_DIR failed");
+               return 0;
+       }
+
+       snprintf(socket_path, sizeof(socket_path), "%s/%s", dir, "tdm-socket");
+
+       ret = chmod(socket_path, 509);
+       if (ret < 0) {
+               TDM_ERR("changing modes of socket file failed:%s (%m)", socket_path);
+               return 0;
+       }
+
+       ret = _tdm_getgrnam_r("root");
+       if (ret < 0) {
+               TDM_ERR("getting uid failed");
+               return 0;
+       }
+       uid = ret;
+
+       ret = _tdm_getgrnam_r("display");
+       if (ret < 0) {
+               TDM_ERR("getting gid failed");
+               return 0;
+       }
+       gid = ret;
+
+       ret = chown(socket_path, uid, gid);
+       if (ret < 0) {
+               TDM_ERR("changing owner of socket file failed:%s (%m)", socket_path);
+               return 0;
+       }
+
+       return 1;
+}
+
 INTERN tdm_error
 tdm_server_init(tdm_private_loop *private_loop)
 {
@@ -636,8 +739,8 @@ tdm_server_init(tdm_private_loop *private_loop)
        if (private_loop->private_server)
                return TDM_ERROR_NONE;
 
-       if (wl_display_add_socket(private_loop->wl_display, "tdm-socket")) {
-               TDM_ERR("createing a tdm-socket failed");
+       if (!_tdm_socket_init(private_loop)) {
+               TDM_ERR("initializing tdm-socket failed");
                return TDM_ERROR_OPERATION_FAILED;
        }