Modify SMACK manifest and remove SMACK rule file(.rule) according three domain model

Since SMACK only allows three labels, "_"(floor), "User", "System"
The labels of current rule file are not appropriate

Solution:
- Apply default manifest (request floor label)
- Remove rule file (usb-server.rule)
- Remove install statement about installing rule file described in CMakeLists.txt
- Remove file path and name declaration of spec file (packaging/usb-manager.spec)

Reference site
https://wiki.tizen.org/wiki/Security:SmackThreeDomainModel

Change-Id: I2ff75d2258bd000366becaf6ca14fd767591b352
Signed-off-by: seong.chung <seong.chung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f43c8e..bf2235f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,5 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/usb_icon.png DESTINATION ${DATADI
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/start_dr.sh DESTINATION ${BINDIR})
 
-# install smack rule file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/${PACKAGE}.rule DESTINATION ${SYSCONFDIR}/smack/accesses.d)
 
 ADD_SUBDIRECTORY(po)

diff --git a/packaging/usb-manager.spec b/packaging/usb-manager.spec
index 23e3b8d..976248d 100644 (file)
--- a/packaging/usb-manager.spec
+++ b/packaging/usb-manager.spec
@@ -6,7 +6,6 @@ Group:      Application Framework/Utilities
 License:    Apache-2.0
 Source0:    usb-server-%{version}.tar.gz
 Source1:    usb-server.manifest
-Source2:    usb-server.rule
 
 BuildRequires:  cmake
 BuildRequires:  libattr-devel
@@ -42,7 +41,6 @@ Description: USB server
 
 %build
 cp %{SOURCE1} .
-cp %{SOURCE2} .
 make %{?jobs:-j%jobs}
 
 %install
@@ -66,4 +64,3 @@ vconftool set -t int db/usb/sel_mode "1" -f
 %{_bindir}/direct_set_debug.sh
 %{_bindir}/set_usb_debug.sh
 %attr(440,root,%{TZ_SYS_USER_GROUP}) %{_datadir}/usb-server/data/usb_icon.png
-%attr(440,root,root) %{TZ_SYS_ETC}/smack/accesses.d/usb-server.rule

diff --git a/packaging/usb-server.manifest b/packaging/usb-server.manifest
index c7ee678..97e8c31 100644 (file)
--- a/packaging/usb-server.manifest
+++ b/packaging/usb-server.manifest
@@ -1,16 +1,5 @@
 <manifest>
-       <define>
-               <domain name="usb-server"/>
-       </define>
-       <assign>
-               <filesystem path="/usr/bin/start_dr.sh"                 label="usb-server"/>
-               <filesystem path="/usr/bin/set_usb_debug.sh"            label="usb-server"/>
-               <filesystem path="/usr/bin/direct_set_debug.sh"         label="usb-server"/>
-               <filesystem path="/usr/bin/usb-server"                  label="usb-server"/>
-               <filesystem path="/usr/share/usb-server/data/usb_icon.png"
-                                                                       label="usb-server"/>
-       </assign>
        <request>
-               <domain name="usb-server"/>
+               <domain name="_"/>
        </request>
 </manifest>

diff --git a/packaging/usb-server.rule b/packaging/usb-server.rule
deleted file mode 100644 (file)
index e300222..0000000
--- a/packaging/usb-server.rule
+++ /dev/null
@@ -1,2 +0,0 @@
-org.tizen.quickpanel usb-server r-x--
-org.tizen.myfile usb-server --x--