Deleted volatile rules on boot and corrected permission format.

[platform/core/security/libprivilege-control.git] / src / rules-db-internals.c

diff --git a/src/rules-db-internals.c b/src/rules-db-internals.c
index c5d9956..a8aa1fc 100644 (file)
--- a/src/rules-db-internals.c
+++ b/src/rules-db-internals.c
@@ -79,24 +79,14 @@ finish:
 }
 
 
-/**
- * Adds label names of applications with the permission to modified labels.
- * Used when permission is going to change and we're going to change some
- * accesses granted by this permission.
- *
- *
- * @param  p_db            [description]
- * @param  i_permission_id [description]
- * @return                 [description]
- */
 int add_modified_permission_internal(sqlite3 *p_db, sqlite3_int64 i_permission_id)
 {
        int ret = PC_OPERATION_SUCCESS;
        sqlite3_stmt *p_stmt = NULL;
        ret = prepare_stmt(p_db, &p_stmt,
-                          "INSERT INTO modified_label(name)    \
-                           SELECT app_permission_view.app_name \
-                           FROM   app_permission_view          \
+                          "INSERT OR IGNORE INTO modified_label(name) \
+                           SELECT app_permission_view.app_name        \
+                           FROM   app_permission_view                 \
                            WHERE  app_permission_view.permission_id = %d",
                           i_permission_id);
        if(ret != PC_OPERATION_SUCCESS) goto finish;
@@ -110,6 +100,27 @@ finish:
 }
 
 
+int add_modified_apps_path_internal(sqlite3 *p_db,
+                                   const char *const s_app_label_name)
+{
+       int ret = PC_OPERATION_SUCCESS;
+       sqlite3_stmt *p_stmt = NULL;
+       ret = prepare_stmt(p_db, &p_stmt,
+                          "INSERT OR IGNORE INTO modified_label(name) \
+                           SELECT path_view.path_label_name           \
+                           FROM   path_view                           \
+                           WHERE  path_view.owner_app_label_name = %Q",
+                          s_app_label_name);
+       if(ret != PC_OPERATION_SUCCESS) goto finish;
+
+       ret = step_and_convert_returned_value(p_stmt);
+finish:
+       if(sqlite3_finalize(p_stmt) < 0)
+               C_LOGE("RDB: Error during finalizing statement: %s",
+                      sqlite3_errmsg(p_db));
+       return ret;
+}
+
 /**
  * Function called when the target database is busy.
  * We attempt to access the database every
@@ -180,7 +191,8 @@ int open_rdb_connection(sqlite3 **p_db)
 
        // Create the temporary tables:
        if(sqlite3_exec(*p_db,
-                      "CREATE TEMPORARY TABLE history_smack_rule(                 \
+                       "PRAGMA foreign_keys = ON;                                 \
+                       CREATE TEMPORARY TABLE history_smack_rule(                 \
                                subject VARCHAR NOT NULL,                          \
                                object  VARCHAR NOT NULL,                          \
                                access  INTEGER NOT NULL);                         \
@@ -230,9 +242,7 @@ int open_rdb_connection(sqlite3 **p_db)
                                WHERE      s2.subject IS NULL AND                  \
                                           s2.object  IS NULL                      \
                                )                                                  \
-                       ORDER BY subject, object ASC;                              \
-                       PRAGMA foreign_keys = ON;                                  \
-                       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;
@@ -803,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);
 
@@ -937,36 +947,25 @@ int save_smack_rules(sqlite3 *p_db)
        RDB_LOG_ENTRY;
 
        if(sqlite3_exec(p_db,
-                       "DELETE FROM history_smack_rule",
-                       0, 0, 0) != SQLITE_OK) {
-               C_LOGE("RDB: Error during clearing history table: %s",
-                      sqlite3_errmsg(p_db));
-               return PC_ERR_DB_OPERATION;
-       }
-       if(sqlite3_exec(p_db,
-                       "INSERT INTO history_smack_rule \
-                       SELECT subject, object, access  \
-                       FROM all_smack_binary_rules",
+                       "DELETE FROM history_smack_rule;                     \
+                                                                            \
+                       INSERT INTO history_smack_rule                       \
+                       SELECT subject, object, access                       \
+                       FROM all_smack_binary_rules;                         \
+                                                                            \
+                       CREATE INDEX history_smack_rule_subject_object_index \
+                       ON history_smack_rule(subject, object);",
                        0, 0, 0) != SQLITE_OK) {
-               C_LOGE("RDB: Error during inserting into history_smack_rule table: %s",
+               C_LOGE("RDB: Error during saving history table: %s",
                       sqlite3_errmsg(p_db));
                return PC_ERR_DB_OPERATION;
        }
 
-       // TODO: Maybe don't use index?
-       if(sqlite3_exec(p_db,
-                       "CREATE INDEX history_smack_rule_subject_object_index \
-                       ON history_smack_rule(subject, object)",
-                       0, 0, 0) != SQLITE_OK) {
-               C_LOGE("RDB: Error during indexing history_smack_rule table: %s",
-                      sqlite3_errmsg(p_db));
-               return PC_ERR_DB_OPERATION;
-       }
        return PC_OPERATION_SUCCESS;
 }
 
 
-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;