Deleted volatile rules on boot and corrected permission format.

[Issue#]       SSDWSSP-183
[Bug/Feature]  Volatile rules were not deleted.
[Cause]        N/A
[Solution]     Deleteing volatile rules from the database.
[Verification] Build, install, run tests.

Change-Id: Ic5352c1d8f94a78e379b91325dbdbdd25f8428bf

diff --git a/db/load-rules-db.sql b/db/load-rules-db.sql
index 79fe6fe..54cb39c 100644 (file)
--- a/db/load-rules-db.sql
+++ b/db/load-rules-db.sql
@@ -6,12 +6,8 @@ PRAGMA journal_mode = DELETE;
 
 BEGIN TRANSACTION;
 
-INSERT INTO all_smack_binary_rules
-SELECT      subject, object, access, is_volatile
-FROM        all_smack_binary_rules_view
-WHERE       NOT EXISTS (SELECT * FROM all_smack_binary_rules);
 -- Delete volatile rules
-DELETE FROM app_permission WHERE is_volatile=1;
+DELETE FROM app_permission WHERE is_volatile = 1;
 
 
 .output "/opt/etc/smack/boot-rules.smack"

diff --git a/db/rules-db-data.sql b/db/rules-db-data.sql
index c53146e..131fe40 100644 (file)
--- a/db/rules-db-data.sql
+++ b/db/rules-db-data.sql
@@ -107,13 +107,6 @@ INSERT OR IGNORE INTO permission_app_path_type_rule_view(permission_name,
        ("org.tizen.privilege.antivirus","OSP", "ANY_LABEL",   "rwx", 0),
        ("org.tizen.privilege.antivirus","EFL", "ANY_LABEL",   "rwx", 0);
 
-
--- Initial fill of all_smack_binary_rules table
-DELETE FROM all_smack_binary_rules;
-INSERT INTO all_smack_binary_rules
-SELECT      subject, object, access, is_volatile
-FROM        all_smack_binary_rules_view;
-
 COMMIT TRANSACTION;
 
 VACUUM;
\ No newline at end of file

diff --git a/include/privilege-control.h b/include/privilege-control.h
index 3c905d7..978522d 100644 (file)
--- a/include/privilege-control.h
+++ b/include/privilege-control.h
@@ -427,6 +427,9 @@ int perm_begin(void);
  */
 int perm_end(void);
 
+int base_name_from_perm(const char *perm, char **name);
+
+
 
 #ifdef __cplusplus
 }

diff --git a/include/rules-db-internals.h b/include/rules-db-internals.h
index abf6953..e0a473f 100644 (file)
--- a/include/rules-db-internals.h
+++ b/include/rules-db-internals.h
@@ -416,6 +416,17 @@ int save_smack_rules(sqlite3 *p_db);
 
 
 /**
+ * Prepare tables with smack rules.
+ *
+ * @ingroup RDB internal functions
+ *
+ * @param  p_db pointer to a SQLite3 database object
+ * @return      PC_OPERATION_SUCCESS on success, error code otherwise
+ */
+int update_rules_in_db(sqlite3 *p_db);
+
+
+/**
  * Updates smack rules. Only rules that change are refreshed.
  *
  * @ingroup RDB internal functions

diff --git a/packaging/libprivilege-control.spec b/packaging/libprivilege-control.spec
index b5e2b7b..89aa9f0 100644 (file)
--- a/packaging/libprivilege-control.spec
+++ b/packaging/libprivilege-control.spec
@@ -100,23 +100,14 @@ then
        mkdir -p /opt/etc/smack-app-early/accesses.d
 fi
 
-if [ ! -e "/opt/dbspace/.rules-db.db3" ]
-then
-       # First installation
-       rm -f /opt/dbspace/.rules-db.db3-journal
-       sqlite3 /opt/dbspace/.rules-db.db3 < /opt/dbspace/rules-db.sql
-       sqlite3 /opt/dbspace/.rules-db.db3 < /opt/dbspace/rules-db-data.sql
-
-       api_feature_loader --verbose
-else
-       # There is the rules-db database.
-       sqlite3 /opt/dbspace/.rules-db.db3 < /opt/dbspace/rules-db.sql
-       sqlite3 /opt/dbspace/.rules-db.db3 < /opt/dbspace/rules-db-data.sql
-fi
-
+sqlite3 /opt/dbspace/.rules-db.db3 < /opt/dbspace/rules-db.sql
 rm -f /opt/dbspace/rules-db.sql
+
+sqlite3 /opt/dbspace/.rules-db.db3 < /opt/dbspace/rules-db-data.sql
 rm -f /opt/dbspace/rules-db-data.sql
 
+api_feature_loader --verbose
+
 %files
 %{_libdir}/*.so.*
 %{_libdir}/librules-db-sql-udf.so

diff --git a/src/privilege-control.c b/src/privilege-control.c
index b864c60..331a2b7 100644 (file)
--- a/src/privilege-control.c
+++ b/src/privilege-control.c
@@ -680,7 +680,7 @@ static inline const char* app_type_group_name(app_type_t app_type)
  * created basename : org.tizen.privilege.contact.read
  */
 
-static int base_name_from_perm(const char *perm, char **name)
+int base_name_from_perm(const char *perm, char **name)
 {
        SECURE_C_LOGD("Entering function: %s. Params: perm=%s",
                                __func__, perm);

diff --git a/src/rules-db-internals.c b/src/rules-db-internals.c
index 4c8ec07..a8aa1fc 100644 (file)
--- a/src/rules-db-internals.c
+++ b/src/rules-db-internals.c
@@ -242,8 +242,7 @@ int open_rdb_connection(sqlite3 **p_db)
                                WHERE      s2.subject IS NULL AND                  \
                                           s2.object  IS NULL                      \
                                )                                                  \
-                       ORDER BY subject, object ASC;                              \
-                       ANALYZE;",
+                       ORDER BY subject, object ASC;",
                        0, 0, 0) != SQLITE_OK) {
                C_LOGE("RDB: Error during preparing script: %s", sqlite3_errmsg(*p_db));
                return PC_ERR_DB_OPERATION;
@@ -814,7 +813,7 @@ int change_app_permission_internal(sqlite3 *p_db,
                                   int i_is_volatile_new,
                                   int i_is_enabled_new)
 {
-       RDB_LOG_ENTRY_PARAM("%d %d %d %d %d", i_app_id,
+       RDB_LOG_ENTRY_PARAM("%d %s %s %d %d", i_app_id,
                            s_permission_name, s_permission_type_name,
                            i_is_volatile_new, i_is_enabled_new);
 
@@ -966,7 +965,7 @@ int save_smack_rules(sqlite3 *p_db)
 }
 
 
-static int update_rules_in_db(sqlite3 *p_db)
+int update_rules_in_db(sqlite3 *p_db)
 {
        RDB_LOG_ENTRY;
 
@@ -1016,9 +1015,6 @@ int update_smack_rules(sqlite3 *p_db)
        const unsigned char *s_access_del = NULL;
        struct smack_accesses *smack = NULL;
 
-       ret = update_rules_in_db(p_db);
-       if(ret != PC_OPERATION_SUCCESS) goto finish;
-
        if(smack_accesses_new(&smack)) {
                C_LOGE("RDB: Error during updating smack rules: smack_accesses_new failed.");
                ret = PC_ERR_MEM_OPERATION;

diff --git a/src/rules-db.c b/src/rules-db.c
index 26bc625..2da074a 100644 (file)
--- a/src/rules-db.c
+++ b/src/rules-db.c
@@ -26,6 +26,9 @@
 * @brief       This file contains declaration of the API to rules database.
 */
 
+#include <stdlib.h>
+
+#include "privilege-control.h"
 #include "rules-db-internals.h"
 
 static sqlite3 *p_db__          = NULL;
@@ -60,10 +63,8 @@ static int rdb_begin(sqlite3 **pp_db)
                return PC_ERR_DB_CONNECTION;
        }
 
-       if(have_smack()) {
-               ret = save_smack_rules(*pp_db);
-               if(ret != PC_OPERATION_SUCCESS) return ret;
-       }
+       ret = save_smack_rules(*pp_db);
+       if(ret != PC_OPERATION_SUCCESS) return ret;
 
        return PC_OPERATION_SUCCESS;
 }
@@ -82,11 +83,17 @@ static void rdb_end(sqlite3 *p_db, int ret)
 {
        RDB_LOG_ENTRY;
 
+       if(ret == PC_OPERATION_SUCCESS &&
+           (ret = update_rules_in_db(p_db))
+           != PC_OPERATION_SUCCESS) {
+               C_LOGE("RDB: Error during updating rules in the database: %d", ret);;
+       }
+
        if(have_smack()) {
                if(ret == PC_OPERATION_SUCCESS &&
                    (ret = update_smack_rules(p_db))
                    != PC_OPERATION_SUCCESS) {
-                       C_LOGE("RDB: Error updating smack rules");
+                       C_LOGE("RDB: Error updating smack rules: %d", ret);
                }
        }
 
@@ -271,6 +278,7 @@ int rdb_enable_app_permissions(const char *const s_app_label_name,
 
        int ret = PC_ERR_DB_OPERATION;
        sqlite3 *p_db = NULL;
+       char *s_permission_name = NULL;
        int i;
        int i_app_id = 0;
        C_LOGD("RDB: Enabling permissions START");
@@ -297,13 +305,17 @@ int rdb_enable_app_permissions(const char *const s_app_label_name,
                    == strlen(pp_permissions_list[i]))
                        continue;
 
+               ret = base_name_from_perm(pp_permissions_list[i], &s_permission_name);
+               if(ret != PC_OPERATION_SUCCESS) goto finish;
+
                ret = change_app_permission_internal(p_db,
                                                     i_app_id,
-                                                    pp_permissions_list[i],
+                                                    s_permission_name,
                                                     s_permission_type_name,
                                                     b_is_volatile,
                                                     RDB_ENABLE);
                if(ret != PC_OPERATION_SUCCESS) goto finish;
+               free(s_permission_name);
        }
 
        ret = add_modified_label_internal(p_db, s_app_label_name);
@@ -321,6 +333,7 @@ int rdb_disable_app_permissions(const char *const s_app_label_name,
 
        int ret = PC_ERR_DB_OPERATION;
        sqlite3 *p_db = NULL;
+       char *s_permission_name = NULL;
        int i, i_app_id;
 
        ret = rdb_begin(&p_db);
@@ -335,12 +348,17 @@ int rdb_disable_app_permissions(const char *const s_app_label_name,
                    == strlen(pp_permissions_list[i]))
                        continue;
 
+               ret = base_name_from_perm(pp_permissions_list[i], &s_permission_name);
+               if(ret != PC_OPERATION_SUCCESS) goto finish;
+
                ret = switch_app_permission_internal(p_db,
                                                     i_app_id,
-                                                    pp_permissions_list[i],
+                                                    s_permission_name,
                                                     s_permission_type_name,
                                                     RDB_DISABLE);
                if(ret != PC_OPERATION_SUCCESS) goto finish;
+
+               free(s_permission_name);
        }
 
        ret = add_modified_label_internal(p_db, s_app_label_name);