openharmony/security_asset
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_asset synced 2024-10-06 22:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify review com

Browse Source 
Signed-off-by: 尹耀德 <yinyaode1@huawei.com>
This commit is contained in:
尹耀德 2024-08-30 17:55:45 +08:00
parent e61ae4d677
commit a56373273f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/core_service/src/common_event/listener.rs
View File

@ -261,7 +261,7 @@ fn backup_de_db_if_accessible(entry: &DirEntry, user_id: i32) -> Result<()> {
let db_name = db_path.file_name().to_string_lossy().to_string();
if !db_name.ends_with(BACKUP_SUFFIX) && db_name.ends_with(DB_SUFFIX) {
let from_path = db_path.path().to_string_lossy().to_string();
Database::check_db_accessible(from_path.clone(), user_id, db_name.clone())?;
Database::check_de_db_accessible(from_path.clone(), user_id, db_name.clone())?;
let backup_path = format!("{}{}", from_path, BACKUP_SUFFIX);
fs::copy(from_path, backup_path)?;
}

16
services/db_operator/src/database.rs
View File

@ -25,7 +25,7 @@ use asset_log::{loge, logi};
use asset_db_key_operator::DbKey;
use crate::{
database_file_upgrade::{check_and_split_db, construct_splited_db_name, fmt_de_db_path}, statement::Statement, table::Table, types::{
database_file_upgrade::{check_and_split_db, construct_splited_db_name, fmt_old_de_db_path}, statement::Statement, table::Table, types::{
column, sqlite_err_handle, DbMap, QueryOptions, COLUMN_INFO, DB_UPGRADE_VERSION, DB_UPGRADE_VERSION_V1,
DB_UPGRADE_VERSION_V2, SQLITE_OK, TABLE_NAME, UPGRADE_COLUMN_INFO, UPGRADE_COLUMN_INFO_V2
}
@ -100,9 +100,9 @@ pub struct Database {
pub type UpgradeDbCallback = fn(db: &Database, old_ver: u32, new_ver: u32) -> Result<()>;
#[cfg(not(test))]
pub(crate) const ROOT_PATH: &str = "/data/service/el1/public/asset_service";
pub(crate) const DE_ROOT_PATH: &str = "/data/service/el1/public/asset_service";
#[cfg(test)]
pub(crate) const ROOT_PATH: &str = "/data/asset_test";
pub(crate) const DE_ROOT_PATH: &str = "/data/asset_test";
#[inline(always)]
pub(crate) fn fmt_backup_path(path: &str) -> String {
@ -113,7 +113,7 @@ pub(crate) fn fmt_backup_path(path: &str) -> String {
/// Get asset storage path.
pub fn get_path() -> String {
ROOT_PATH.to_string()
DE_ROOT_PATH.to_string()
}
#[inline(always)]
@ -123,7 +123,7 @@ pub(crate) fn fmt_ce_db_path_with_name(user_id: i32, db_name: &str) -> String {
#[inline(always)]
pub(crate) fn fmt_de_db_path_with_name(user_id: i32, db_name: &str) -> String {
format!("{}/{}/{}.db", ROOT_PATH, user_id, db_name)
format!("{}/{}/{}.db", DE_ROOT_PATH, user_id, db_name)
}
pub(crate) fn get_db(user_id: i32, db_name: &str, db_key: Option<&DbKey>) -> Result<Database> {
@ -175,8 +175,8 @@ impl Database {
get_db(user_id, db_name, db_key)
}
/// Check is db ok
pub fn check_db_accessible(path: String, user_id: i32, db_name: String) -> Result<()> {
/// Check whether de db is ok
pub fn check_de_db_accessible(path: String, user_id: i32, db_name: String) -> Result<()> {
let lock = get_file_lock_by_user_id_db_file_name(user_id, db_name.clone());
let mut db = Database { path: path.clone(), backup_path: path, handle: 0, db_lock: lock, db_name };
db.open()?;
@ -293,7 +293,7 @@ impl Database {
/// Delete database file.
#[allow(dead_code)]
pub(crate) fn delete(user_id: i32) -> Result<()> {
let path = fmt_de_db_path(user_id);
let path = fmt_old_de_db_path(user_id);
let backup_path = fmt_backup_path(&path);
if let Err(e) = fs::remove_file(path) {
return log_throw_error!(ErrCode::FileOperationError, "[FATAL][DB]Delete database failed, err={}", e);

10
services/db_operator/src/database_file_upgrade.rs
View File

@ -23,7 +23,7 @@ use asset_definition::{log_throw_error, ErrCode, Extension, Result, Value};
use asset_log::logi;
use crate::{
database::{fmt_backup_path, fmt_de_db_path_with_name, get_db, get_split_db_lock_by_user_id, Database, OLD_DB_NAME, ROOT_PATH}, types::{
database::{fmt_backup_path, fmt_de_db_path_with_name, get_db, get_split_db_lock_by_user_id, Database, OLD_DB_NAME, DE_ROOT_PATH}, types::{
column, DbMap, QueryOptions,
}
};
@ -33,12 +33,12 @@ const REMOVE_INDEX: usize = 2;
static MAX_BATCH_NUM: u32 = 100;
#[inline(always)]
pub(crate) fn fmt_de_db_path(user_id: i32) -> String {
format!("{}/{}/asset.db", ROOT_PATH, user_id)
pub(crate) fn fmt_old_de_db_path(user_id: i32) -> String {
format!("{}/{}/asset.db", DE_ROOT_PATH, user_id)
}
fn check_old_db_exist(user_id: i32) -> bool {
let path_str = fmt_de_db_path(user_id);
let path_str = fmt_old_de_db_path(user_id);
let path = Path::new(&path_str);
path.exists()
}
@ -50,7 +50,7 @@ pub fn construct_splited_db_name(owner_type: OwnerType, owner_info: &[u8], is_ce
let owner_info_string = String::from_utf8_lossy(owner_info).to_string();
let split_owner_info: Vec<&str> = owner_info_string.split('_').collect();
if split_owner_info.len() < MINIM_OWNER_INFO_LEN || split_owner_info.last().is_none() {
return log_throw_error!(ErrCode::DatabaseError, "[FATAL]The queried owner info does not correct.");
return log_throw_error!(ErrCode::DatabaseError, "[FATAL]The queried owner info is not correct.");
}
let app_index = split_owner_info.last().unwrap();
let mut split_owner_info_mut = split_owner_info.clone();