Modify SMACK manifest according three domain model

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

Solution:
In case of libug-phone-efl.manifest and org.tizen.dialer.manifest
- Apply default manifest (request floor label)

In case of
 A. org.tizen.contacts-appservice.manifest
 B. org.tizen.contacts-viewer.manifest
 C. org.tizen.contacts.manifest
 D. org.tizen.phone.manifest
- Apply default manifest (request floor label)
- Assign User label in
   /usr/apps/org.tizen.XX/data and /opt/usr/apps/org.tizen.XX/data

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

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

diff --git a/libug-phone-efl.manifest b/libug-phone-efl.manifest
index 4a7d8dd..75b0fa5 100644 (file)
--- a/libug-phone-efl.manifest
+++ b/libug-phone-efl.manifest
@@ -1,10 +1,4 @@
 <manifest>
-    <define>
-        <domain name="libug-phone"/>
-        <provide>
-            <label name="libug-phone::data"/>
-        </provide>
-    </define>
     <request>
         <domain name="_"/>
     </request>

diff --git a/org.tizen.contacts-appservice.manifest b/org.tizen.contacts-appservice.manifest
index 7b27910..5d3d1f3 100644 (file)
--- a/org.tizen.contacts-appservice.manifest
+++ b/org.tizen.contacts-appservice.manifest
@@ -1,12 +1,9 @@
 <manifest>
-       <define>
-               <domain name="org.tizen.contacts-appservice" policy="restricted"/>
-       </define>
        <assign>
-               <filesystem path="/usr/share/packages/org.tizen.contacts-appservice.xml" label="_" />
-               <filesystem path="/usr/share/icons/default/small/org.tizen.contacts-appservice.png" label="_" />
+               <filesystem path="/usr/apps/org.tizen.contacts-appservice/data" label="User" />
+               <filesystem path="/opt/usr/apps/org.tizen.contacts-appservice/data" label="User" />
        </assign>
        <request>
-               <domain name="org.tizen.contacts-appservice"/>
+               <domain name="_"/>
        </request>
 </manifest>

diff --git a/org.tizen.contacts-viewer.manifest b/org.tizen.contacts-viewer.manifest
index 8b5dea3..5b769f0 100644 (file)
--- a/org.tizen.contacts-viewer.manifest
+++ b/org.tizen.contacts-viewer.manifest
@@ -1,13 +1,9 @@
 <manifest>
-       <define>
-               <domain name="org.tizen.contacts-viewer" policy="restricted"/>
-       </define>
        <assign>
-               <filesystem path="/usr/share/packages/org.tizen.contacts-viewer.xml" label="_" />
-               <filesystem path="/usr/share/applications/org.tizen.contacts-viewer.desktop" label="_" />
-               <filesystem path="/usr/share/icons/default/small/org.tizen.contacts-viewer.png" label="_" />
+               <filesystem path="/usr/apps/org.tizen.contacts-viewer/data" label="User" />
+               <filesystem path="/opt/usr/apps/org.tizen.contacts-viewer/data" label="User" />
        </assign>
        <request>
-               <domain name="org.tizen.contacts-viewer"/>
+               <domain name="_"/>
        </request>
 </manifest>

diff --git a/org.tizen.contacts.manifest b/org.tizen.contacts.manifest
index b8ebc35..965d7ee 100644 (file)
--- a/org.tizen.contacts.manifest
+++ b/org.tizen.contacts.manifest
@@ -1,14 +1,9 @@
 <manifest>
-        <define>
-                <domain name="org.tizen.contacts"/>
-        </define>
-        <assign>
-                <filesystem path="/usr/share/packages/org.tizen.contacts.xml" label="_" />
-                <filesystem path="/usr/share/applications/org.tizen.contacts.desktop" label="_" />
-                <filesystem path="/usr/share/icons/default/small/org.tizen.contacts.png" label="_" />
-                <filesystem path="/opt/usr/ug/data/ug-phone" label="org.tizen.contacts" type="transmutable" />
-        </assign>
-        <request>
-                <domain name="org.tizen.contacts"/>
-        </request>
-</manifest>
\ No newline at end of file
+       <assign>
+               <filesystem path="/usr/apps/org.tizen.contacts/data" label="User" />
+               <filesystem path="/opt/usr/apps/org.tizen.contacts/data" label="User" />
+       </assign>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/org.tizen.dialer.manifest b/org.tizen.dialer.manifest
index 59b6f4f..97e8c31 100644 (file)
--- a/org.tizen.dialer.manifest
+++ b/org.tizen.dialer.manifest
@@ -1,12 +1,5 @@
 <manifest>
-       <define>
-               <domain name = "org.tizen.dialer"/>
-       </define>
-       <assign>
-               <filesystem path="/usr/share/packages/dialer-efl.xml" label="_" />
-               <filesystem path="/usr/share/applications/dialer-efl.desktop" label="_" />
-       </assign>
        <request>
-               <domain name = "org.tizen.dialer"/>
+               <domain name="_"/>
        </request>
 </manifest>

diff --git a/org.tizen.phone.manifest b/org.tizen.phone.manifest
index 0e253c5..1287f56 100644 (file)
--- a/org.tizen.phone.manifest
+++ b/org.tizen.phone.manifest
@@ -1,13 +1,9 @@
 <manifest>
-    <define>
-        <domain name="org.tizen.phone"/>
-    </define>
     <assign>
-        <filesystem path="/usr/share/packages/org.tizen.phone.xml" label="_" />
-        <filesystem path="/usr/share/applications/org.tizen.phone.desktop" label="_" />
-        <filesystem path="/usr/share/icons/default/small/org.tizen.phone.png" label="_" />
+        <filesystem path="/usr/apps/org.tizen.phone/data" label="User" />
+        <filesystem path="/opt/usr/apps/org.tizen.phone/data" label="User" />
     </assign>
     <request>
-        <domain name="org.tizen.phone"/>
+        <domain name="_"/>
     </request>
 </manifest>