openharmony/distributeddatamgr_datamgr_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_datamgr_service synced 2024-11-23 06:50:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2377 按appIndex独立查询主应用和分身静默使能状态

Browse Source 
Merge pull request !2377 from Cuiziyuan/SilentStatus
This commit is contained in:
openharmony_ci 2024-10-26 10:53:28 +00:00 committed by Gitee
commit 5a1a173b4f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/distributeddataservice/service/data_share/common/uri_utils.cpp
View File

@ -62,6 +62,21 @@ bool URIUtils::GetBundleNameFromProxyURI(const std::string &uri, std::string &bu
return true;
}
bool URIUtils::GetAppIndexFromProxyURI(const std::string &uri, int32_t &appIndex)
{
auto queryParams = URIUtils::GetQueryParams(uri);
if (!queryParams[APP_INDEX].empty()) {
auto [success, data] = URIUtils::Strtoul(queryParams[APP_INDEX]);
if (!success) {
appIndex = -1;
ZLOGE("appIndex is invalid! appIndex: %{public}s", queryParams[APP_INDEX].c_str());
return false;
}
appIndex = data;
}
return true;
}
void URIUtils::FormatUri(std::string &uri)
{
auto pos = uri.find_last_of('?');

2
services/distributeddataservice/service/data_share/common/uri_utils.h
View File

@ -39,6 +39,7 @@ class URIUtils {
public:
static bool GetInfoFromURI(const std::string &uri, UriInfo &uriInfo);
static bool GetBundleNameFromProxyURI(const std::string &uri, std::string &bundleName);
static bool GetAppIndexFromProxyURI(const std::string &uri, int32_t &appIndex);
static bool IsDataProxyURI(const std::string &uri);
static void FormatUri(std::string &uri);
static UriConfig GetUriConfig(const std::string &uri);
@ -50,6 +51,7 @@ public:
static constexpr const char *PARAM_URI_SEPARATOR = ":///";
static constexpr const char *SCHEME_SEPARATOR = "://";
static constexpr const char *URI_SEPARATOR = "/";
static constexpr const char *APP_INDEX = "appIndex"; // for Application Clone
static constexpr int DATA_PROXY_SCHEMA_LEN = sizeof(DATA_PROXY_SCHEMA) - 1;
static constexpr uint32_t PARAM_URI_SEPARATOR_LEN = 4;

2
services/distributeddataservice/service/data_share/data_provider_config.cpp
View File

@ -33,7 +33,7 @@ DataProviderConfig::DataProviderConfig(const std::string &uri, uint32_t callerTo
{
providerInfo_.uri = uri;
providerInfo_.currentUserId = DistributedKv::AccountDelegate::GetInstance()->GetUserByToken(callerTokenId);
LoadConfigCommonStrategy::GetAppIndexFromProxyURI(providerInfo_.uri, providerInfo_.appIndex);
URIUtils::GetAppIndexFromProxyURI(providerInfo_.uri, providerInfo_.appIndex);
if (providerInfo_.currentUserId == 0) {
LoadConfigCommonStrategy::GetInfoFromProxyURI(providerInfo_.uri, providerInfo_.currentUserId,
callerTokenId, providerInfo_.bundleName);

8
services/distributeddataservice/service/data_share/data_share_service_impl.cpp
View File

@ -42,6 +42,7 @@
#include "ipc_skeleton.h"
#include "iservice_registry.h"
#include "log_print.h"
#include "common/uri_utils.h"
#include "metadata/auto_launch_meta_data.h"
#include "metadata/meta_data_manager.h"
#include "matching_skills.h"
@ -843,7 +844,12 @@ int32_t DataShareServiceImpl::GetSilentProxyStatus(const std::string &uri, bool
return E_OK;
}
std::string calledBundleName = uriInfo.bundleName;
uint32_t calledTokenId = Security::AccessToken::AccessTokenKit::GetHapTokenID(currentUserId, calledBundleName, 0);
int32_t appIndex = 0;
if (!URIUtils::GetAppIndexFromProxyURI(uri, appIndex)) {
return E_APPINDEX_INVALID;
}
uint32_t calledTokenId = Security::AccessToken::AccessTokenKit::GetHapTokenID(
currentUserId, calledBundleName, appIndex);
if (calledTokenId == 0) {
calledTokenId = Security::AccessToken::AccessTokenKit::GetHapTokenID(0, calledBundleName, 0);
}

18
services/distributeddataservice/service/data_share/strategies/general/load_config_common_strategy.cpp
View File

@ -26,14 +26,13 @@ namespace OHOS::DataShare {
constexpr const char USER_PARAM[] = "user";
constexpr const char TOKEN_ID_PARAM[] = "srcToken";
constexpr const char DST_BUNDLE_NAME_PARAM[] = "dstBundleName";
constexpr const char APP_INDEX[] = "appIndex"; // for Application Clone
bool LoadConfigCommonStrategy::operator()(std::shared_ptr<Context> context)
{
if (context->callerTokenId == 0) {
context->callerTokenId = IPCSkeleton::GetCallingTokenID();
}
context->currentUserId = DistributedKv::AccountDelegate::GetInstance()->GetUserByToken(context->callerTokenId);
if (!GetAppIndexFromProxyURI(context->uri, context->appIndex)) {
if (!URIUtils::GetAppIndexFromProxyURI(context->uri, context->appIndex)) {
return false;
}
// sa, userId is in uri, caller token id is from first caller tokenId
@ -77,19 +76,4 @@ bool LoadConfigCommonStrategy::GetInfoFromProxyURI(
}
return true;
}
bool LoadConfigCommonStrategy::GetAppIndexFromProxyURI(const std::string &uri, int32_t &appIndex)
{
auto queryParams = URIUtils::GetQueryParams(uri);
if (!queryParams[APP_INDEX].empty()) {
auto [success, data] = URIUtils::Strtoul(queryParams[APP_INDEX]);
if (!success) {
appIndex = -1;
ZLOGE("appIndex is invalid! appIndex: %{public}s", queryParams[APP_INDEX].c_str());
return false;
}
appIndex = data;
}
return true;
}
} // namespace OHOS::DataShare

1
services/distributeddataservice/service/data_share/strategies/general/load_config_common_strategy.h
View File

@ -23,7 +23,6 @@ public:
bool operator()(std::shared_ptr<Context> context) override;
static bool GetInfoFromProxyURI(
const std::string &uri, int32_t &user, uint32_t &callerTokenId, std::string &calledBundleName);
static bool GetAppIndexFromProxyURI(const std::string &uri, int32_t &appIndex);
};
} // namespace OHOS::DataShare
#endif // DATASHARESERVICE_LOAD_CONFIG_COMMON_STRAGETY_H