openharmony/bundlemanager_app_domain_verify
1
0
Fork 0
mirror of https://github.com/openharmony/bundlemanager_app_domain_verify.git synced 2026-07-20 20:29:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

rm atomic url

Browse Source 
Signed-off-by: woohoa <wanghuan36@huawei.com>
This commit is contained in:
15950533375
2025-06-03 21:03:43 +08:00
parent ee085d05a0
commit d3ca552ff4
10 changed files with 4 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/client/include/app_domain_verify_mgr_client.h
-9
View File
@@ -92,15 +92,6 @@ public:
*/
bool SaveDomainVerifyStatus(const std::string& bundleName, const VerifyResultInfo& verifyResultInfo);
/**
* IsAtomicServiceUrl
* @descrition check input url is atomic service or not.
* @param url input url to check.
* @return bool is atomic service or not.
* @deprecated
*/
bool IsAtomicServiceUrl(const std::string& url);
/**
* IsShortUrl
* @descrition check input url is short url or not.
interfaces/inner_api/client/src/app_domain_verify_mgr_client.cpp
+1 -22
View File
@@ -220,28 +220,7 @@ bool AppDomainVerifyMgrClient::IsValidUrl(const std::string& url)
}
#endif
bool AppDomainVerifyMgrClient::IsAtomicServiceUrl(const std::string& url)
{
#ifdef _CUT_LINK_CONVERT_
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "not support, will return false!");
return false;
#else
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "called, url %{public}s", MaskStr(url).c_str());
if (!IsValidUrl(url)) {
APP_DOMAIN_VERIFY_HILOGW(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "url is invalid!");
return false;
}
bool ret{ false };
std::lock_guard<std::mutex> autoLock(proxyLock_);
if (IsServiceAvailable()) {
std::string identity = IPCSkeleton::ResetCallingIdentity();
ret = appDomainVerifyMgrServiceProxy_->IsAtomicServiceUrl(url);
IPCSkeleton::SetCallingIdentity(identity);
}
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "call end, IsAtomicServiceUrl:%{public}d", ret);
return ret;
#endif
}
void AppDomainVerifyMgrClient::UpdateWhiteListUrls(const std::vector<std::string>& urls)
{
#ifdef _CUT_LINK_CONVERT_
interfaces/inner_api/common/include/zidl/convert_callback_proxy.h
-1
View File
@@ -25,7 +25,6 @@ public:
explicit ConvertCallbackProxy(const sptr<IRemoteObject>& object);
virtual ~ConvertCallbackProxy() override;
virtual void OnConvert(int resCode, OHOS::AAFwk::Want& want) override;
virtual void OnConvert(int resCode, TargetInfo& targetInfo) override;
private:
interfaces/inner_api/common/include/zidl/i_convert_callback.h
-1
View File
@@ -23,7 +23,6 @@ namespace AppDomainVerify {
class IConvertCallback : public IRemoteBroker {
public:
DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appdomainverify.IConvertCallback");
virtual void OnConvert(int resCode, OHOS::AAFwk::Want& want) = 0;
virtual void OnConvert(int resCode, TargetInfo& targetInfo) = 0;
};
}
interfaces/inner_api/common/src/zidl/convert_callback_proxy.cpp
-25
View File
@@ -30,31 +30,6 @@ ConvertCallbackProxy::~ConvertCallbackProxy()
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "instance dead.");
}
void ConvertCallbackProxy::OnConvert(int resCode, OHOS::AAFwk::Want& want)
{
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "OnConvert result %{public}d", resCode);
MessageParcel data;
MessageParcel reply;
MessageOption option(MessageOption::TF_SYNC);
WRITE_PARCEL_AND_RETURN_IF_FAIL(InterfaceToken, data, GetDescriptor());
WRITE_PARCEL_AND_RETURN_IF_FAIL(Int32, data, resCode);
WRITE_PARCEL_AND_RETURN_IF_FAIL(Parcelable, data, &want);
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
APP_DOMAIN_VERIFY_HILOGE(
APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "fail to call OnConvert, for Remote() is nullptr");
return;
}
int32_t ret = remote->SendRequest(
static_cast<int32_t>(ConvertCallbackInterfaceCode::ON_CONVERT_CALLBACK), data, reply, option);
if (ret != NO_ERROR) {
APP_DOMAIN_VERIFY_HILOGE(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT,
"fail to call OnConvert, for transact is failed, error code is: %{public}d", ret);
UNIVERSAL_ERROR_EVENT(CALL_BACK_FAULT);
}
}
void ConvertCallbackProxy::OnConvert(int resCode, TargetInfo& targetInfo)
{
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_CLIENT, "OnConvert result %{public}d", resCode);
services/src/agent/core/app_domain_verify_agent_service.cpp
+2 -1
View File
@@ -110,7 +110,8 @@ void AppDomainVerifyAgentService::ConvertToExplicitWant(
}
if (callback) {
callback->OnConvert(0, implicitWant);
TargetInfo targetInfo;
callback->OnConvert(0, targetInfo);
}
APP_DOMAIN_VERIFY_HILOGI(APP_DOMAIN_VERIFY_MGR_MODULE_SERVICE, "called");
}
test/unittest/client/app_domain_verify_agent_client_test/app_domain_verify_agent_client_test.cpp
-3
View File
@@ -78,9 +78,6 @@ void AppDomainVerifyAgentClientTest::TearDown(void)
}
class CallBack : public ConvertCallbackStub {
public:
void OnConvert(int resCode, AAFwk::Want& want) override
{
}
void OnConvert(int resCode, TargetInfo& want) override
{
}
test/unittest/client/app_domain_verify_mgr_client_test/app_domain_verify_mgr_client_test.cpp
-34
View File
@@ -71,9 +71,6 @@ void AppDomainVerifyMgrClientTest::TearDown(void)
}
class CallBack : public ConvertCallbackStub {
public:
void OnConvert(int resCode, AAFwk::Want& want) override
{
}
void OnConvert(int resCode, TargetInfo& want) override
{
}
@@ -174,37 +171,6 @@ HWTEST_F(AppDomainVerifyMgrClientTest, AppDomainVerifyMgrClientTest005, TestSize
AppDomainVerifyMgrClient::GetInstance()->ClearDomainVerifyStatus(APP_IDENTIFIER, BUNDLE_NAME);
AppDomainVerifyMgrClient::appDomainVerifyMgrServiceProxy_.ForceSetRefPtr(nullptr);
}
/**
* @tc.name: AppDomainVerifyMgrClientTest006
* @tc.desc: VerifyDomain test.
* @tc.type: FUNC
*/
#define MAX_PATH_LEN (99)
HWTEST_F(AppDomainVerifyMgrClientTest, AppDomainVerifyMgrClientTest006, TestSize.Level0)
{
std::shared_ptr<AppDomainVerifyMgrRemoteStubMock> mgrStubMock_ =
std::make_shared<AppDomainVerifyMgrRemoteStubMock>();
EXPECT_CALL(*mgrStubMock_, SendRequest(_, _, _, _)).WillRepeatedly(::testing::Invoke(MgrInvokeOK));
AppDomainVerifyMgrClient::appDomainVerifyMgrServiceProxy_ = sptr<AppDomainVerifyMgrServiceProxy>::MakeSptr(
mgrStubMock_.get());
ASSERT_TRUE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("https://www.openharmony.com/t1_-est"));
ASSERT_TRUE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("https://www.openharmony.com"));
ASSERT_TRUE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("https://www.openharmony.com/t1_-est/"));
ASSERT_FALSE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("www.openharmony.com/feitj"));
ASSERT_FALSE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("test://www.openharmony.com/test"));
ASSERT_TRUE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("https://www.openharmony.com/test*"));
ASSERT_TRUE(AppDomainVerifyMgrClient::GetInstance()->IsAtomicServiceUrl("https://www.openharmony.com/test/test"));
ASSERT_TRUE(g_mgrInvokeOK);
AppDomainVerifyMgrClient::appDomainVerifyMgrServiceProxy_.ForceSetRefPtr(nullptr);
}
/**
* @tc.name: AppDomainVerifyMgrClientTest007
test/unittest/common/zidl_test/convert_callback_test.cpp
+1 -17
View File
@@ -48,10 +48,7 @@ void AppDomainVerifyConvertCallbackTest::TearDown(void)
}
class CallBack : public ConvertCallbackStub {
public:
void OnConvert(int resCode, AAFwk::Want& want) override
{
}
void OnConvert(int resCode, TargetInfo& want) override
void OnConvert(int resCode, TargetInfo& targetInfo) override
{
}
};
@@ -138,19 +135,6 @@ HWTEST_F(AppDomainVerifyConvertCallbackTest, AppDomainVerifyConvertCallbackStubT
static_cast<int32_t>(ConvertCallbackInterfaceCode::ON_CONVERT_CALLBACK), data, reply, option);
ASSERT_TRUE(ret != 0);
}
/**
* @tc.name: AppDomainVerifyConvertCallbackProxyTest001
* @tc.desc: AddTask test
* @tc.type: FUNC
*/
HWTEST_F(AppDomainVerifyConvertCallbackTest, AppDomainVerifyConvertCallbackProxyTest001, TestSize.Level0)
{
sptr<ConvertCallbackProxy> proxy = new ConvertCallbackProxy(nullptr);
ASSERT_TRUE(proxy != nullptr);
int resCode = 0;
OHOS::AAFwk::Want want;
proxy->OnConvert(resCode, want);
}
/**
* @tc.name: AppDomainVerifyTargetInfoTest001
test/unittest/mock/include/mock_convert_callback.h
-1
View File
@@ -20,7 +20,6 @@ namespace OHOS {
namespace AppDomainVerify {
class MocConvertCallback : public ConvertCallbackStub {
public:
void OnConvert(int resCode, OHOS::AAFwk::Want& want) override {};
void OnConvert(int resCode, TargetInfo& targetInfo) override {
};