Change socket path for security

Change-Id: Id0712d869ed99284a8f095532db39ff5f544f2bd
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/configure.ac b/configure.ac
index 32e4c8085a64fae33a589401a8adccaf543002f7..45237b8deeffdddb289d588a2b7acd7d3af702f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -849,7 +849,7 @@ SCIM_ICONDIR="$datadir/scim/icons"
 SCIM_MODULE_PATH="$libdir/scim$SCIM_EPOCH"
 SCIM_LIBEXECDIR="$libdir/scim$SCIM_EPOCH"
 SCIM_LOCALEDIR="/usr/share/locale"
-SCIM_TEMPDIR="/tmp"
+SCIM_TEMPDIR="/run/.isf"
 
 AC_SUBST(SCIM_BINDIR)
 AC_SUBST(SCIM_DATADIR)

diff --git a/ism/configs/global b/ism/configs/global
index d948e6e71bdc9bb8dc2a803d73ed1941e1455d32..d0192512fc344a3165406a1df74f90e9af2c0a31 100755 (executable)
--- a/ism/configs/global
+++ b/ism/configs/global
@@ -1,11 +1,11 @@
 /SupportedUnicodeLocales = en_US.UTF-8
 /DefaultPanelProgram = isf-panel-efl
 /DefaultConfigModule = simple
-/DefaultSocketFrontEndAddress = local:/tmp/scim-socket-frontend
-/DefaultSocketIMEngineAddress = local:/tmp/scim-socket-frontend
-/DefaultSocketConfigAddress = local:/tmp/scim-socket-config
-/DefaultPanelSocketAddress = local:/tmp/scim-panel-socket
-/DefaultHelperManagerSocketAddress = local:/tmp/scim-socket-frontend
+/DefaultSocketFrontEndAddress = local:/run/.isf/scim-socket-frontend
+/DefaultSocketIMEngineAddress = local:/run/.isf/scim-socket-frontend
+/DefaultSocketConfigAddress = local:/run/.isf/scim-socket-config
+/DefaultPanelSocketAddress = local:/run/.isf/scim-panel-socket
+/DefaultHelperManagerSocketAddress = local:/run/.isf/scim-socket-frontend
 /DefaultSocketTimeout = 5000
 /InitialIseType = 1
 /InitialIseUuid = ise-default

diff --git a/ism/modules/imengine/scim_socket_imengine.cpp b/ism/modules/imengine/scim_socket_imengine.cpp
index 647bfe7e28fb62ce1bfce9c4c057d61ef9b2fea4..9a8f3c36a239e92e230f4a2b116033dda04af95c 100644 (file)
--- a/ism/modules/imengine/scim_socket_imengine.cpp
+++ b/ism/modules/imengine/scim_socket_imengine.cpp
@@ -64,10 +64,10 @@
 #define SCIM_CONFIG_IMENGINE_SOCKET_TIMEOUT "/IMEngine/Socket/Timeout"
 #define SCIM_CONFIG_IMENGINE_SOCKET_ADDRESS "/IMEngine/Socket/Address"
 
-#define SCIM_SOCKET_FRONTEND_DEF_ADDRESS    "local:/tmp/scim-socket-frontend"
+#define SCIM_SOCKET_FRONTEND_DEF_ADDRESS    "local:/run/.isf/scim-socket-frontend"
 
 #ifndef SCIM_TEMPDIR
-  #define SCIM_TEMPDIR "/tmp"
+  #define SCIM_TEMPDIR "/run/.isf"
 #endif
 
 using namespace scim;

diff --git a/ism/src/scim_socket.cpp b/ism/src/scim_socket.cpp
index cd3a1a94359f93fcc8e9caa5449d50e321b63031..608e3ad93be2c360e61b4b47321c94834811f694 100644 (file)
--- a/ism/src/scim_socket.cpp
+++ b/ism/src/scim_socket.cpp
@@ -1368,9 +1368,9 @@ SocketClient::close ()
     m_connected = false;
 }
 
-#define SCIM_DEFAULT_SOCKET_FRONTEND_ADDRESS        "local:/tmp/scim-socket-frontend"
-#define SCIM_DEFAULT_PANEL_SOCKET_ADDRESS           "local:/tmp/scim-panel-socket"
-#define SCIM_DEFAULT_HELPER_MANAGER_SOCKET_ADDRESS  "local:/tmp/scim-socket-frontend"
+#define SCIM_DEFAULT_SOCKET_FRONTEND_ADDRESS        "local:/run/.isf/scim-socket-frontend"
+#define SCIM_DEFAULT_PANEL_SOCKET_ADDRESS           "local:/run/.isf/scim-panel-socket"
+#define SCIM_DEFAULT_HELPER_MANAGER_SOCKET_ADDRESS  "local:/run/.isf/scim-socket-frontend"
 
 String scim_get_default_socket_frontend_address ()
 {

diff --git a/packaging/isf.conf b/packaging/isf.conf
new file mode 100644 (file)
index 0000000..8012ace
--- /dev/null
+++ b/packaging/isf.conf
@@ -0,0 +1,3 @@
+d      /run/.isf       1770    display users
+t      /run/.isf       -       -       -       -       security.SMACK64="User::App::Shared"
+t      /run/.isf       -       -       -       -       security.SMACK64TRANSMUTE="TRUE"

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 9ea62e7b3ee1207f03d37664347e51d7034f7986..40d20dcdcb724c25a4d0c76b0f83995d85d61647 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -8,6 +8,7 @@ Release:    1
 Group:      Graphics & UI Framework/Input
 License:    LGPL-2.1+
 Source0:    %{name}-%{version}.tar.gz
+Source100:  %{name}.conf
 BuildRequires:  edje-bin
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(appcore-efl)
@@ -106,6 +107,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 %make_install
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
 mkdir -p %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d
 cp -af ism/dump/isf_log_dump.sh %{buildroot}/%{TZ_SYS_ETC}/dump.d/module.d
 mkdir -p %{buildroot}/etc/scim/conf
@@ -143,6 +147,7 @@ ln -sf "module.so" %{_libdir}/ecore_imf/modules/wayland/v-1.16/libwltextinputmod
 %{TZ_SYS_RO_ETC}/package-manager/parserlib/category/libimeparser.so
 %license COPYING
 %{TZ_SYS_ETC}/dump.d/module.d/*
+%{_tmpfilesdir}/%{name}.conf
 
 %files devel
 %defattr(-,root,root,-)