openharmony/applications_settings
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_settings synced 2024-11-27 08:30:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加静默访问权限校验

Browse Source 
Signed-off-by: 侯志雄 <houzhixiong1@h-partners.com>
This commit is contained in:
侯志雄 2024-04-27 20:45:39 +08:00
parent 496c6b6635
commit fff739d74f
1 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
napi/settings/napi_settings.cpp
View File

@ -22,6 +22,7 @@
#include "abs_shared_result_set.h"
#include "napi_settings_log.h"
#include "values_bucket.h"
#include "datashare_business_error.h"
#include "napi_base_context.h"
#include "os_account_manager.h"
@ -36,9 +37,31 @@ namespace Settings {
const std::string SETTINGS_DATA_BASE_URI = "dataability:///com.ohos.settingsdata.DataAbility";
const std::string SETTINGS_DATA_FIELD_KEYWORD = "KEYWORD";
const std::string SETTINGS_DATA_FIELD_VALUE = "VALUE";
const std::string PERMISSION_DENIED_CODE = "201 - Permission denied";
const int PERMISSION_DENIED_CODE = -2;
const int DB_HELPER_TRIAL_NUMBER = 2;
const int USERID_HELPER_NUMBER = 100;
void ThrowExistingError(napi_env env, std::string errorMessage)
{
napi_value message;
napi_value error;
napi_create_string_utf8(env, errorMessage.c_str(), NAPI_AUTO_LENGTH, &message);
napi_create_error(env, NULL, message, &error);
napi_throw(env, error);
}
bool ThrowError(napi_env env, int status)
{
if (status >= 0) {
return true;
}
if (status == PERMISSION_DENIED_CODE) {
ThrowExistingError(env, PERMISSION_DENIED_CODE)
}
return false;
}
/**
* @brief Wrap void to js value.
* ability_context
@ -356,14 +379,20 @@ std::shared_ptr<DataShareHelper> getDataShareHelper(
dataShareHelper = OHOS::DataShare::DataShareHelper::Creator(contextS->GetToken(), strUri);
return dataShareHelper;
}
resultset = dataShareHelper->Query(proxyUri, predicates, columns);
DatashareBusinessError businessError;
resultset = dataShareHelper->Query(proxyUri, predicates, columns, &businessError);
int numRows = 0;
if (resultset != nullptr) {
resultset->GetRowCount(numRows);
}
SETTING_LOG_INFO("numRows %{public}d", numRows);
if (resultset == nullptr || numRows <= 0) {
SETTING_LOG_INFO("numRows %{public}d, error code %{public}d", numRows, businessError.GetCode());
if (businessError.GetCode() == PERMISSION_DENIED_CODE) {
if (resultset != nullptr) {
resultset->Close();
}
return dataShareHelper;
} else if (resultset == nullptr || numRows <= 0) {
int trial = 0;
do {
SETTING_LOG_INFO("settingsnapi : getDataShareHelper resultset == nullptr, strUri %{public}s %{public}d",
@ -371,6 +400,9 @@ std::shared_ptr<DataShareHelper> getDataShareHelper(
trial);
dataShareHelper = OHOS::DataShare::DataShareHelper::Creator(contextS->GetToken(), strUri);
} while (trial++ < DB_HELPER_TRIAL_NUMBER && dataShareHelper == nullptr);
if (resultset != nullptr) {
resultset->Close();
}
return dataShareHelper;
}
resultset->Close();
@ -407,19 +439,21 @@ void GetValueExecuteExt(napi_env env, void *data)
OHOS::Uri uri(strUri);
std::shared_ptr<OHOS::DataShare::DataShareResultSet> resultset = nullptr;
DatashareBusinessError businessError;
if (asyncCallbackInfo->dataShareHelper != nullptr) {
SETTING_LOG_INFO("a_C_B_I->d_S_H != nullptr");
resultset = asyncCallbackInfo->dataShareHelper->Query(uri, predicates, columns);
resultset = asyncCallbackInfo->dataShareHelper->Query(uri, predicates, columns, &businessError);
}
int numRows = 0;
if (resultset != nullptr) {
SETTING_LOG_INFO("G_V_E_E resultset is NOT empty");
resultset->GetRowCount(numRows);
}
SETTING_LOG_INFO("numRows %{public}d", numRows);
if (resultset == nullptr || numRows <= 0) {
SETTING_LOG_INFO("G_V_E_E return error");
SETTING_LOG_INFO("numRows %{public}d, error code %{public}d", numRows, businessError.GetCode());
if (businessError.GetCode() != 0) {
asyncCallbackInfo->status = businessError.GetCode();
} else if (resultset == nullptr || numRows <= 0) {
SETTING_LOG_INFO("G_V_E_E value is empty");
asyncCallbackInfo->status = -1;
} else {
std::string val;
@ -525,7 +559,7 @@ void SetValueExecuteExt(napi_env env, void *data, const std::string setValue)
}
SETTING_LOG_INFO("n_s_v_e aft Up");
}
asyncCallbackInfo->status = retInt;
asyncCallbackInfo->status = ThrowError(env, retInt);
}
/**
@ -1004,7 +1038,7 @@ napi_value napi_set_value_sync(napi_env env, napi_callback_info info)
resultset->Close();
}
return wrap_bool_to_js(env, retInt != 0);
return wrap_bool_to_js(env, ThrowError(env, retInt));
}
void SetValueExecuteCB(napi_env env, void *data)
@ -1050,7 +1084,7 @@ void SetValueExecuteCB(napi_env env, void *data)
SETTING_LOG_INFO("execute aft Up");
}
// notify change
if (retInt != 0) {
if (retInt > 0) {
std::string uriWithNameStr =
argsName.empty() ? SETTINGS_DATA_BASE_URI : (SETTINGS_DATA_BASE_URI + "/" + argsName);
std::shared_ptr<Uri> uriWithName = std::make_shared<Uri>(uriWithNameStr);
@ -1061,7 +1095,7 @@ void SetValueExecuteCB(napi_env env, void *data)
resultset->Close();
}
SETTING_LOG_INFO("execute... END!");
asyncCallbackInfo->status = retInt;
asyncCallbackInfo->status = ThrowError(env, retInt);
}
napi_value SetValueAsync(napi_env env, AsyncCallbackInfo* asyncCallbackInfo)
@ -1084,7 +1118,7 @@ napi_value SetValueAsync(napi_env env, AsyncCallbackInfo* asyncCallbackInfo)
napi_value undefine;
napi_get_undefined(env, &undefine);
napi_value callback = nullptr;
napi_value result = wrap_bool_to_js(env, asyncCallbackInfo->status != 0);
napi_value result = wrap_bool_to_js(env, ThrowError(env,asyncCallbackInfo->status));
napi_get_reference_value(env, asyncCallbackInfo->callbackRef, &callback);
napi_call_function(env, nullptr, callback, 1, &result, &undefine);
napi_delete_reference(env, asyncCallbackInfo->callbackRef);
@ -1121,7 +1155,7 @@ napi_value SetValuePromise(napi_env env, AsyncCallbackInfo* asyncCallbackInfo)
AsyncCallbackInfo* asyncCallbackInfo = (AsyncCallbackInfo*)data;
SETTING_LOG_INFO("p_m set end get c_b value is %{public}d",
asyncCallbackInfo->status);
napi_value result = wrap_bool_to_js(env, asyncCallbackInfo->status != 0);
napi_value result = wrap_bool_to_js(env, ThrowError(env,asyncCallbackInfo->status));
napi_resolve_deferred(asyncCallbackInfo->env, asyncCallbackInfo->deferred, result);
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
asyncCallbackInfo->dataAbilityHelper = nullptr;
@ -1279,7 +1313,7 @@ napi_value napi_set_value_ext(napi_env env, napi_callback_info info, const bool
},
[](napi_env env, napi_status status, void* data) {
AsyncCallbackInfo* asyncCallbackInfo = (AsyncCallbackInfo*)data;
napi_value result = wrap_bool_to_js(env, asyncCallbackInfo->status != 0);
napi_value result = wrap_bool_to_js(env, ThrowError(env,asyncCallbackInfo->status));
asyncCallbackInfo->status = napi_ok;
CompleteCall(env, status, data, result);
},
@ -1685,7 +1719,7 @@ napi_value napi_set_value_sync_ext(bool stageMode, size_t argc, napi_env env, na
asyncCallbackInfo->dataShareHelper = getDataShareHelper(env, args[PARAM0], stageMode, asyncCallbackInfo->tableName);
GetValueExecuteExt(env, (void *)asyncCallbackInfo);
SetValueExecuteExt(env, (void *)asyncCallbackInfo, unwrap_string_from_js(env, args[PARAM2]));
napi_value result = wrap_bool_to_js(env, asyncCallbackInfo->status != 0);
napi_value result = wrap_bool_to_js(env, ThrowError(env,asyncCallbackInfo->status));
delete asyncCallbackInfo;
return result;
}