Update privacy mount script and remove privacy package migration script

- Update privacy mount script according to the privilege info db changes
- Remove privacy package migration script: No changes among 4.0 and 5.0

Change-Id: Iae97f02817568aede9cd49324d8e822b0be618ca
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3eda8a7b8a32a51a9b89af8e8a14aca54d47a7..4b885f5a3ef4d75b63945aeddbe0b40402b50dbb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-config.conf DESTINATION /usr/l
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/90_user-content-permissions.post DESTINATION ${SYSCONF_INSTALL_DIR}/gumd/useradd.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/91_user-dbspace-permissions.post DESTINATION ${SYSCONF_INSTALL_DIR}/gumd/useradd.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/upgrade/201.security_upgrade.sh DESTINATION /usr/share/upgrade/scripts)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/upgrade/711.security_privacy_package_migration.sh DESTINATION /usr/share/upgrade/scripts)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/smack/onlycap DESTINATION /etc/smack)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/smack/smack_default_labeling DESTINATION /usr/share/security-config)
 

diff --git a/config/update_privacy_mount_list.sh b/config/update_privacy_mount_list.sh
index 3988d731ba913e19331c0a33eb04c46d41468779..58d20e7807db991e0ed00fd5569f662212b5509c 100644 (file)
--- a/config/update_privacy_mount_list.sh
+++ b/config/update_privacy_mount_list.sh
@@ -47,7 +47,7 @@ do
                continue
        fi
        # check whether this is privacy or not
-       if [ "$(sqlite3 /usr/share/privilege-manager/.core_privilege_info.db "select distinct is_privacy from privilege_info where privilege_name='$PRIV_LINE'")" = "1" ]
+       if [ "$(sqlite3 /usr/share/privilege-manager/.privilege.db "select distinct is_privacy from privilege_info where privilege_name='$PRIV_LINE' and package_type='core'")" = "1" ]
        then
                echo "$PRIV_LINE  $PRIV_GID" >> $PRIVACY_LIST
        fi

diff --git a/packaging/security-config.spec b/packaging/security-config.spec
index 0f0b1beb560f656f892cd5e676f0d86b895995df..0f3d3bbcc2c845b33aa47e92783b25f4b3254282 100755 (executable)
--- a/packaging/security-config.spec
+++ b/packaging/security-config.spec
@@ -119,7 +119,6 @@ rm /opt/share/security-config/test/new_service_test/*
 %attr(755,root,root) /opt/share/security-config/test/smack_basic_test/*
 %attr(755,root,root) /opt/share/security-config/test/security_mount_option_test/*
 %attr(755,root,root) /usr/share/upgrade/scripts/201.security_upgrade.sh
-%attr(755,root,root) /usr/share/upgrade/scripts/711.security_privacy_package_migration.sh
 %attr(755,root,root) %{_sysconfdir}/gumd/useradd.d/90_user-content-permissions.post
 %attr(755,root,root) %{_sysconfdir}/gumd/useradd.d/91_user-dbspace-permissions.post
 

diff --git a/upgrade/201.security_upgrade.sh b/upgrade/201.security_upgrade.sh
index 487c87a69eede49b871c56e841972cd6e3eaf961..8b8accf7e8bc007b99071f4702a02b1e52ec5917 100644 (file)
--- a/upgrade/201.security_upgrade.sh
+++ b/upgrade/201.security_upgrade.sh
@@ -39,17 +39,3 @@ security-manager-policy-reload
 /usr/share/security-manager/policy/update.sh
 systemctl start security-manager
 
-# Create privacy database
-PRIVILEGE_CHECKER_PRIVACY_DB=/opt/dbspace/.privacy.db
-PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL=/opt/dbspace/.privacy.db-journal
-
-touch $PRIVILEGE_CHECKER_PRIVACY_DB
-touch $PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL
-sqlite3 $PRIVILEGE_CHECKER_PRIVACY_DB "CREATE TABLE PRIVACY_PACKAGE (PKG_ID TEXT not null, UID NUMERIC not null, PRIVACY_NAME TEXT not null, PRIVILEGE_NAME TEXT not null, IS_CRITICAL NUMERIC not null, API_VERSION TEXT not null, UNIQUE(PKG_ID, UID, PRIVILEGE_NAME));"
-
-chmod 664 $PRIVILEGE_CHECKER_PRIVACY_DB
-chmod 664 $PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL
-chown root:app_fw $PRIVILEGE_CHECKER_PRIVACY_DB
-chown root:app_fw $PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL
-chsmack -a System::Shared $PRIVILEGE_CHECKER_PRIVACY_DB
-chsmack -a System::Shared $PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL

diff --git a/upgrade/711.security_privacy_package_migration.sh b/upgrade/711.security_privacy_package_migration.sh
deleted file mode 100644 (file)
index 07071c6..0000000
--- a/upgrade/711.security_privacy_package_migration.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-. /etc/tizen-platform.conf
-
-PRIVACY_DB=/opt/dbspace/.privacy.db
-PKGMGR_DB=/opt/dbspace/.pkgmgr_parser.db
-globalapp_uid=`cat /etc/passwd | grep $TZ_SYS_GLOBALAPP_USER | cut -d ":" -f3`
-
-CORE_PRIVILEGE_INFO_DB=/usr/share/privilege-manager/.core_privilege_info.db
-
-privilege_list=`sqlite3 $CORE_PRIVILEGE_INFO_DB "select distinct privilege_name from privilege_info where privacy_name!='N/A'"`
-
-for i in $privilege_list
-do
-       pkg_list=`sqlite3 $PKGMGR_DB "select distinct package from package_privilege_info where privilege='$i'"`
-       privacy_name=`sqlite3 $CORE_PRIVILEGE_INFO_DB "select privacy_name from privilege_info where privilege_name='$i'"`
-       privacy_id=`sqlite3 $CORE_PRIVILEGE_INFO_DB "select privacy_id from privacy_info where privacy_name='$privacy_name'"`
-       for j in $pkg_list
-       do
-               privacy_option_list=`sqlite3 $CORE_PRIVILEGE_INFO_DB "select privacy_option from privacy_whitelist where pkg_id='$j' and settable='0'"`
-               for k in $privacy_option_list
-               do
-                       privacy_option=`echo ${k:$privacy_id:1}`
-                       if [ "$privacy_option" == "0" ]; then
-                               api_version=`sqlite3 $PKGMGR_DB "select package_api_version from package_info where package='$j'"`
-                               sqlite3 $PRIVACY_DB "insert or ignore into privacy_package values ('$j', $globalapp_uid, '$privacy_name', '$i', 0, '$api_version')"
-                       fi
-               done
-               privacy_option_list=`sqlite3 $CORE_PRIVILEGE_INFO_DB "select privacy_option from privacy_whitelist where pkg_id='$j' and settable='1'"`
-               for k in $privacy_option_list
-               do
-                       privacy_option=`echo ${k:$privacy_id:1}`
-                       if [ "$privacy_option" == "1" ]; then
-                               api_version=`sqlite3 $PKGMGR_DB "select package_api_version from package_info where package='$j'"`
-                               sqlite3 $PRIVACY_DB "insert or ignore into privacy_package values ('$j', $globalapp_uid, '$privacy_name', '$i', 0, '$api_version')"
-                       fi
-               done
-       done
-done
-