From 44b9e147d0b6270fda1a1e91549fff6ff4ae33e5 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 26 Aug 2022 14:51:14 +0800 Subject: [PATCH 01/28] =?UTF-8?q?IsAllowUsingPernmission=E6=8F=90=E4=BA=A4?= =?UTF-8?q?-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibe041923f672ae5c2873feca97bef39713ce0eee Signed-off-by: y1585740638 --- .../privacy/include/i_privacy_manager.h | 3 +++ .../innerkits/privacy/include/privacy_kit.h | 1 + .../innerkits/privacy/src/privacy_kit.cpp | 6 +++++ .../privacy/src/privacy_manager_client.cpp | 11 +++++++++ .../privacy/src/privacy_manager_client.h | 2 +- .../privacy/src/privacy_manager_proxy.cpp | 23 +++++++++++++++++++ .../privacy/src/privacy_manager_proxy.h | 2 +- .../test/unittest/src/privacy_kit_test.cpp | 12 ++++++++++ .../include/service/privacy_manager_service.h | 2 +- .../include/service/privacy_manager_stub.h | 1 + .../src/service/privacy_manager_service.cpp | 5 ++++ .../src/service/privacy_manager_stub.cpp | 11 +++++++++ 12 files changed, 76 insertions(+), 3 deletions(-) diff --git a/frameworks/privacy/include/i_privacy_manager.h b/frameworks/privacy/include/i_privacy_manager.h index ff8bebda8..c5dcc2eef 100644 --- a/frameworks/privacy/include/i_privacy_manager.h +++ b/frameworks/privacy/include/i_privacy_manager.h @@ -48,6 +48,8 @@ public: virtual int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) = 0; virtual int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) = 0; + virtual bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; + enum class InterfaceCode { ADD_PERMISSION_USED_RECORD = 0xf001, START_USING_PERMISSION = 0xf002, @@ -58,6 +60,7 @@ public: DUMP_RECORD_INFO = 0xf007, REGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK = 0xf008, UNREGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK = 0xf009, + IS_ALLOW_USING_PERMISSION = 0xf010, }; }; } // namespace AccessToken diff --git a/interfaces/innerkits/privacy/include/privacy_kit.h b/interfaces/innerkits/privacy/include/privacy_kit.h index a06fa1f8c..f86a3d01a 100644 --- a/interfaces/innerkits/privacy/include/privacy_kit.h +++ b/interfaces/innerkits/privacy/include/privacy_kit.h @@ -40,6 +40,7 @@ public: static std::string DumpRecordInfo(AccessTokenID tokenID, const std::string& permissionName); static int32_t RegisterPermActiveStatusCallback(const std::shared_ptr& callback); static int32_t UnRegisterPermActiveStatusCallback(const std::shared_ptr& callback); + static bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName); }; } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index b6349f0b7..6c3bc3168 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -86,6 +86,12 @@ int32_t PrivacyKit::UnRegisterPermActiveStatusCallback(const std::shared_ptrIsAllowUsingPermission(tokenID, permissionName); +} + void PrivacyManagerClient::InitProxy() { std::lock_guard lock(proxyMutex_); diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.h b/interfaces/innerkits/privacy/src/privacy_manager_client.h index ee288ad69..0cd621ba3 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.h @@ -48,7 +48,7 @@ public: int32_t UnRegisterPermActiveStatusCallback(const std::shared_ptr& callback); int32_t CreateActiveStatusChangeCbk( const std::shared_ptr& callback, sptr& callbackObject); - + bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName); void OnRemoteDiedHandle(); private: PrivacyManagerClient(); diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 0014a3c02..e0a9c5ae6 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -295,6 +295,29 @@ int32_t PrivacyManagerProxy::UnRegisterPermActiveStatusCallback(const sptr& permList, const sptr& callback) override; int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) override; - + bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; private: bool SendRequest(IPrivacyManager::InterfaceCode code, MessageParcel& data, MessageParcel& reply); static inline BrokerDelegator delegator_; diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index c19d79fb8..b3bfafaa7 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -700,6 +700,18 @@ HWTEST_F(PrivacyKitTest, DumpRecordInfo003, TestSize.Level1) ASSERT_EQ(true, info.empty()); } +HWTEST_F(PrivacyKitTest, IsAllowUsingPermission001, TestSize.Level1) +{ + std::string permission = "ohos.permission.CAMERA"; + // invalid tokenId + bool info = PrivacyKit::IsAllowUsingPermission(123, "ohos.permission.CAMERA"); + ASSERT_EQ(false, info); + + // invalid permission + info = PrivacyKit::IsAllowUsingPermission(g_TokenId_A, "invalid permission"); + ASSERT_EQ(false, info); +} + class CbCustomizeTest1 : public PermActiveStatusCustomizedCbk { public: explicit CbCustomizeTest1(const std::vector &permList) diff --git a/services/privacymanager/include/service/privacy_manager_service.h b/services/privacymanager/include/service/privacy_manager_service.h index ce276d297..4fd047428 100644 --- a/services/privacymanager/include/service/privacy_manager_service.h +++ b/services/privacymanager/include/service/privacy_manager_service.h @@ -49,7 +49,7 @@ public: int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) override; int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) override; - + bool IsAllowUsingPermission(AccessTokenID tokenId, const std::string& permissionName) override; private: bool Initialize() const; diff --git a/services/privacymanager/include/service/privacy_manager_stub.h b/services/privacymanager/include/service/privacy_manager_stub.h index 17f592436..a388be35d 100644 --- a/services/privacymanager/include/service/privacy_manager_stub.h +++ b/services/privacymanager/include/service/privacy_manager_stub.h @@ -41,6 +41,7 @@ private: void DumpRecordInfoInner(MessageParcel& data, MessageParcel& reply); void RegisterPermActiveStatusCallbackInner(MessageParcel& data, MessageParcel& reply); void UnRegisterPermActiveStatusCallbackInner(MessageParcel& data, MessageParcel& reply); + void IsAllowUsingPermissionInner(MessageParcel& data, MessageParcel& reply); bool IsAccessTokenCalling() const; static const int32_t ACCESSTOKEN_UID = 3020; }; diff --git a/services/privacymanager/src/service/privacy_manager_service.cpp b/services/privacymanager/src/service/privacy_manager_service.cpp index 41e1087e1..4b9d29a22 100644 --- a/services/privacymanager/src/service/privacy_manager_service.cpp +++ b/services/privacymanager/src/service/privacy_manager_service.cpp @@ -123,6 +123,11 @@ int32_t PrivacyManagerService::UnRegisterPermActiveStatusCallback(const sptr(IPrivacyManager::InterfaceCode::UNREGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK): UnRegisterPermActiveStatusCallbackInner(data, reply); break; + case static_cast(IPrivacyManager::InterfaceCode::IS_ALLOW_USING_PERMISSION): + IsAllowUsingPermissionInner(data, reply); + break; default: return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } @@ -201,6 +204,14 @@ void PrivacyManagerStub::UnRegisterPermActiveStatusCallbackInner(MessageParcel& reply.WriteInt32(result); } +void PrivacyManagerStub::IsAllowUsingPermissionInner(MessageParcel& data, MessageParcel& reply) +{ + AccessTokenID tokenId = data.ReadUint32(); + std::string permissionName = data.ReadString(); + bool allowperInfo = this->IsAllowUsingPermission(tokenId, permissionName); + reply.WriteBool(allowperInfo); +} + bool PrivacyManagerStub::IsAccessTokenCalling() const { int32_t callingUid = IPCSkeleton::GetCallingUid(); -- Gitee From 12c704f6078401ed0183425448c247497f313205 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Mon, 29 Aug 2022 01:44:31 +0000 Subject: [PATCH 02/28] update interfaces/innerkits/privacy/src/privacy_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_kit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index 6c3bc3168..d148b5288 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -89,7 +89,7 @@ int32_t PrivacyKit::UnRegisterPermActiveStatusCallback(const std::shared_ptr Date: Mon, 29 Aug 2022 01:45:09 +0000 Subject: [PATCH 03/28] update interfaces/innerkits/privacy/src/privacy_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_kit.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index d148b5288..e2e835092 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -91,7 +91,6 @@ bool PrivacyKit::IsAllowUsingPermission(AccessTokenID tokenID, const std::string { return PrivacyManagerClient::GetInstance().IsAllowUsingPermission(tokenID, permissionName); } - } // namespace AccessToken } // namespace Security } // namespace OHOS -- Gitee From 38ea8becadf5ae93100e4b8e76fad25c952a220c Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Tue, 30 Aug 2022 03:15:31 +0000 Subject: [PATCH 04/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index e0a9c5ae6..bdf90cfad 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -313,11 +313,10 @@ bool PrivacyManagerProxy::IsAllowUsingPermission(AccessTokenID tokenID, const st ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail, result: %{public}d", requestResult); return false; } - bool allowperInfo = reply.ReadBool(); - return allowperInfo; + bool ret = reply.ReadBool(); + return ret; } - bool PrivacyManagerProxy::SendRequest( IPrivacyManager::InterfaceCode code, MessageParcel& data, MessageParcel& reply) { -- Gitee From c6904d4d5a70724343bd2e3349a021768532b624 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 06:06:12 +0000 Subject: [PATCH 05/28] update frameworks/privacy/include/i_privacy_manager.h. Signed-off-by: y1585740638 --- frameworks/privacy/include/i_privacy_manager.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/privacy/include/i_privacy_manager.h b/frameworks/privacy/include/i_privacy_manager.h index bd66c4683..7925b0702 100644 --- a/frameworks/privacy/include/i_privacy_manager.h +++ b/frameworks/privacy/include/i_privacy_manager.h @@ -47,8 +47,7 @@ public: virtual int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) = 0; virtual int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) = 0; - virtual bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; - + virtual bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; enum class InterfaceCode { ADD_PERMISSION_USED_RECORD, START_USING_PERMISSION, -- Gitee From 032a388d5d510d7802b4ce2226da8ff1aa7be7db Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:06:49 +0000 Subject: [PATCH 06/28] update interfaces/innerkits/privacy/src/privacy_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_kit.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index 713c2b0bc..bdb89d56b 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -82,6 +82,10 @@ int32_t PrivacyKit::UnRegisterPermActiveStatusCallback(const std::shared_ptr Date: Thu, 8 Sep 2022 08:12:05 +0000 Subject: [PATCH 07/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index c8dd25c92..0418b7fa1 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -277,7 +277,10 @@ bool PrivacyManagerProxy::IsAllowUsingPermission(AccessTokenID tokenID, const st { MessageParcel data; MessageParcel reply; - data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); + if(!data.WriteInterfaceToken(IPrivacyManager::GetDescriptor())) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write WriteInterfaceToken."); + return false; + } if (!data.WriteUint32(tokenID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(%{public}d)", tokenID); return false; -- Gitee From 8115139a5366cc2d774628b4ee97a8045436a7dd Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:22:09 +0000 Subject: [PATCH 08/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- .../innerkits/privacy/src/privacy_manager_proxy.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 0418b7fa1..6f4bf68e0 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -294,8 +294,12 @@ bool PrivacyManagerProxy::IsAllowUsingPermission(AccessTokenID tokenID, const st ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail, result: %{public}d", requestResult); return false; } - bool ret = reply.ReadBool(); - return ret; + bool result; + if (!reply.ReadBool(result)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "ReadBool fail"); + return false; + } + return result; } bool PrivacyManagerProxy::SendRequest( -- Gitee From 43ad9536b9fe6e1f69ed482f1f5044c6dda0d512 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:26:42 +0000 Subject: [PATCH 09/28] update services/privacymanager/src/service/privacy_manager_stub.cpp. Signed-off-by: y1585740638 --- .../privacymanager/src/service/privacy_manager_stub.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/services/privacymanager/src/service/privacy_manager_stub.cpp b/services/privacymanager/src/service/privacy_manager_stub.cpp index 99171bde3..f98e15eb8 100644 --- a/services/privacymanager/src/service/privacy_manager_stub.cpp +++ b/services/privacymanager/src/service/privacy_manager_stub.cpp @@ -208,10 +208,17 @@ void PrivacyManagerStub::UnRegisterPermActiveStatusCallbackInner(MessageParcel& void PrivacyManagerStub::IsAllowUsingPermissionInner(MessageParcel& data, MessageParcel& reply) { + if (!VerifyPermission(PERMISSION_USED_STATS)) { + reply.WriteInt32(RET_FAILED); + return; + } AccessTokenID tokenId = data.ReadUint32(); std::string permissionName = data.ReadString(); bool allowperInfo = this->IsAllowUsingPermission(tokenId, permissionName); - reply.WriteBool(allowperInfo); + if (!reply.WriteBool(allowperInfo)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteBool(%{public}s)", permissionName.c_str()); + return; + } } bool PrivacyManagerStub::IsAccessTokenCalling() const -- Gitee From d555e7e5fe77c25959eba816de976d6bc78889f2 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:27:29 +0000 Subject: [PATCH 10/28] update services/privacymanager/src/service/privacy_manager_stub.cpp. Signed-off-by: y1585740638 --- .../privacymanager/src/service/privacy_manager_stub.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/privacymanager/src/service/privacy_manager_stub.cpp b/services/privacymanager/src/service/privacy_manager_stub.cpp index f98e15eb8..edadba7e0 100644 --- a/services/privacymanager/src/service/privacy_manager_stub.cpp +++ b/services/privacymanager/src/service/privacy_manager_stub.cpp @@ -66,8 +66,8 @@ int32_t PrivacyManagerStub::OnRemoteRequest( case static_cast(IPrivacyManager::InterfaceCode::UNREGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK): UnRegisterPermActiveStatusCallbackInner(data, reply); break; - case static_cast(IPrivacyManager::InterfaceCode::IS_ALLOW_USING_PERMISSION): - IsAllowUsingPermissionInner(data, reply); + case static_cast(IPrivacyManager::InterfaceCode::IS_ALLOWED_USING_PERMISSION): + IsAllowedUsingPermissionInner(data, reply); break; default: return IPCObjectStub::OnRemoteRequest(code, data, reply, option); @@ -206,7 +206,7 @@ void PrivacyManagerStub::UnRegisterPermActiveStatusCallbackInner(MessageParcel& reply.WriteInt32(result); } -void PrivacyManagerStub::IsAllowUsingPermissionInner(MessageParcel& data, MessageParcel& reply) +void PrivacyManagerStub::IsAllowedUsingPermissionInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { reply.WriteInt32(RET_FAILED); @@ -214,7 +214,7 @@ void PrivacyManagerStub::IsAllowUsingPermissionInner(MessageParcel& data, Messag } AccessTokenID tokenId = data.ReadUint32(); std::string permissionName = data.ReadString(); - bool allowperInfo = this->IsAllowUsingPermission(tokenId, permissionName); + bool allowperInfo = this->IsAllowedUsingPermission(tokenId, permissionName); if (!reply.WriteBool(allowperInfo)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteBool(%{public}s)", permissionName.c_str()); return; -- Gitee From 4f7efd3c04d6e720983392907d9d58c36cdbdadf Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:27:56 +0000 Subject: [PATCH 11/28] update services/privacymanager/src/service/privacy_manager_service.cpp. Signed-off-by: y1585740638 --- services/privacymanager/src/service/privacy_manager_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/privacymanager/src/service/privacy_manager_service.cpp b/services/privacymanager/src/service/privacy_manager_service.cpp index ad75b21c4..6e9a07421 100644 --- a/services/privacymanager/src/service/privacy_manager_service.cpp +++ b/services/privacymanager/src/service/privacy_manager_service.cpp @@ -184,7 +184,7 @@ int32_t PrivacyManagerService::UnRegisterPermActiveStatusCallback(const sptr Date: Thu, 8 Sep 2022 08:28:20 +0000 Subject: [PATCH 12/28] update services/privacymanager/include/service/privacy_manager_stub.h. Signed-off-by: y1585740638 --- services/privacymanager/include/service/privacy_manager_stub.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/privacymanager/include/service/privacy_manager_stub.h b/services/privacymanager/include/service/privacy_manager_stub.h index f85e34327..0e14bbdb3 100644 --- a/services/privacymanager/include/service/privacy_manager_stub.h +++ b/services/privacymanager/include/service/privacy_manager_stub.h @@ -40,7 +40,7 @@ private: void GetPermissionUsedRecordsAsyncInner(MessageParcel& data, MessageParcel& reply); void RegisterPermActiveStatusCallbackInner(MessageParcel& data, MessageParcel& reply); void UnRegisterPermActiveStatusCallbackInner(MessageParcel& data, MessageParcel& reply); - void IsAllowUsingPermissionInner(MessageParcel& data, MessageParcel& reply); + void IsAllowedUsingPermissionInner(MessageParcel& data, MessageParcel& reply); bool IsAccessTokenCalling() const; bool VerifyPermission(const std::string& permission) const; static const int32_t ACCESSTOKEN_UID = 3020; -- Gitee From 680a45d8ac2c5aff48563131e1bff939de589bf6 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:28:38 +0000 Subject: [PATCH 13/28] update services/privacymanager/include/service/privacy_manager_service.h. Signed-off-by: y1585740638 --- .../privacymanager/include/service/privacy_manager_service.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/privacymanager/include/service/privacy_manager_service.h b/services/privacymanager/include/service/privacy_manager_service.h index 2323760f3..d0e062961 100644 --- a/services/privacymanager/include/service/privacy_manager_service.h +++ b/services/privacymanager/include/service/privacy_manager_service.h @@ -48,7 +48,7 @@ public: int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) override; int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) override; - bool IsAllowUsingPermission(AccessTokenID tokenId, const std::string& permissionName) override; + bool IsAllowedUsingPermission(AccessTokenID tokenId, const std::string& permissionName) override; int32_t Dump(int fd, const std::vector& args) override; private: bool Initialize() const; -- Gitee From 974540a0b8a42da0e0959ebf850404c142d1aa42 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:28:59 +0000 Subject: [PATCH 14/28] update interfaces/innerkits/privacy/include/privacy_kit.h. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/include/privacy_kit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/include/privacy_kit.h b/interfaces/innerkits/privacy/include/privacy_kit.h index 5250343b5..9eda25157 100644 --- a/interfaces/innerkits/privacy/include/privacy_kit.h +++ b/interfaces/innerkits/privacy/include/privacy_kit.h @@ -39,7 +39,7 @@ public: const PermissionUsedRequest& request, const sptr& callback); static int32_t RegisterPermActiveStatusCallback(const std::shared_ptr& callback); static int32_t UnRegisterPermActiveStatusCallback(const std::shared_ptr& callback); - static bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName); + static bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName); }; } // namespace AccessToken } // namespace Security -- Gitee From b19c8730f68bc879570769e5f004f4b191d38b3e Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:29:22 +0000 Subject: [PATCH 15/28] update interfaces/innerkits/privacy/src/privacy_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_kit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index bdb89d56b..307f24e4f 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -80,13 +80,13 @@ int32_t PrivacyKit::UnRegisterPermActiveStatusCallback(const std::shared_ptr Date: Thu, 8 Sep 2022 08:29:41 +0000 Subject: [PATCH 16/28] update interfaces/innerkits/privacy/src/privacy_manager_client.h. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.h b/interfaces/innerkits/privacy/src/privacy_manager_client.h index 37aa4ba21..df68a40e9 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.h @@ -48,7 +48,7 @@ public: int32_t CreateActiveStatusChangeCbk( const std::shared_ptr& callback, sptr& callbackWrap); - bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName); + bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName); void OnRemoteDiedHandle(); private: PrivacyManagerClient(); -- Gitee From b221cfdc1582b5d2024afec60c4085e2367c0d1d Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:30:23 +0000 Subject: [PATCH 17/28] update interfaces/innerkits/privacy/src/privacy_manager_client.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index ab0855809..93eb1d0e0 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -215,7 +215,7 @@ int32_t PrivacyManagerClient::UnRegisterPermActiveStatusCallback( return result; } -bool PrivacyManagerClient::IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +bool PrivacyManagerClient::IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { auto proxy = GetProxy(); if (proxy == nullptr) { @@ -223,7 +223,7 @@ bool PrivacyManagerClient::IsAllowUsingPermission(AccessTokenID tokenID, const s return false; } - return proxy->IsAllowUsingPermission(tokenID, permissionName); + return proxy->IsAllowedUsingPermission(tokenID, permissionName); } void PrivacyManagerClient::InitProxy() -- Gitee From e27a1f371dd6d45dc88a878b113cec14aa5765f2 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:30:43 +0000 Subject: [PATCH 18/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.h. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.h b/interfaces/innerkits/privacy/src/privacy_manager_proxy.h index cb82c72ed..197e9cd63 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.h @@ -41,7 +41,7 @@ public: int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) override; int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) override; - bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; + bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; private: bool SendRequest(IPrivacyManager::InterfaceCode code, MessageParcel& data, MessageParcel& reply); static inline BrokerDelegator delegator_; -- Gitee From 187feb31a840b2d33b96c6d0d8689665660d11cd Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:31:18 +0000 Subject: [PATCH 19/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 6f4bf68e0..683380f51 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -273,7 +273,7 @@ int32_t PrivacyManagerProxy::UnRegisterPermActiveStatusCallback(const sptr Date: Thu, 8 Sep 2022 08:31:40 +0000 Subject: [PATCH 20/28] update frameworks/privacy/include/i_privacy_manager.h. Signed-off-by: y1585740638 --- frameworks/privacy/include/i_privacy_manager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/privacy/include/i_privacy_manager.h b/frameworks/privacy/include/i_privacy_manager.h index 7925b0702..df5f9febf 100644 --- a/frameworks/privacy/include/i_privacy_manager.h +++ b/frameworks/privacy/include/i_privacy_manager.h @@ -47,7 +47,7 @@ public: virtual int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) = 0; virtual int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) = 0; - virtual bool IsAllowUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; + virtual bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; enum class InterfaceCode { ADD_PERMISSION_USED_RECORD, START_USING_PERMISSION, @@ -58,7 +58,7 @@ public: DUMP_RECORD_INFO, REGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK, UNREGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK, - IS_ALLOW_USING_PERMISSION, + IS_ALLOWED_USING_PERMISSION, }; }; } // namespace AccessToken -- Gitee From 7ce8b5b9a7b3a11dd001374f1aca536445d511ae Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:32:58 +0000 Subject: [PATCH 21/28] update interfaces/innerkits/privacy/src/privacy_manager_client.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_client.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index 93eb1d0e0..a32ea5ca3 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -222,7 +222,6 @@ bool PrivacyManagerClient::IsAllowedUsingPermission(AccessTokenID tokenID, const ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); return false; } - return proxy->IsAllowedUsingPermission(tokenID, permissionName); } -- Gitee From e8081d76fa78b04bc1222b050eb7b680eb156349 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:39:08 +0000 Subject: [PATCH 22/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 683380f51..1e2184a4b 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -289,7 +289,7 @@ bool PrivacyManagerProxy::IsAllowedUsingPermission(AccessTokenID tokenID, const ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteString(%{public}s)", permissionName.c_str()); return false; } - int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::IS_ALLOWED_USING_PERMISSION, data, reply); + bool requestResult = SendRequest(IPrivacyManager::InterfaceCode::IS_ALLOWED_USING_PERMISSION, data, reply); if (!requestResult) { ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail, result: %{public}d", requestResult); return false; -- Gitee From e4f0cb55349db87c3706dd65c064a56707b3c892 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:51:44 +0000 Subject: [PATCH 23/28] update interfaces/innerkits/privacy/src/privacy_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_kit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index 307f24e4f..3522aa7a7 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -83,7 +83,7 @@ int32_t PrivacyKit::UnRegisterPermActiveStatusCallback(const std::shared_ptr Date: Thu, 8 Sep 2022 08:55:59 +0000 Subject: [PATCH 24/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 1e2184a4b..5eaabb699 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -291,7 +291,7 @@ bool PrivacyManagerProxy::IsAllowedUsingPermission(AccessTokenID tokenID, const } bool requestResult = SendRequest(IPrivacyManager::InterfaceCode::IS_ALLOWED_USING_PERMISSION, data, reply); if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail, result: %{public}d", requestResult); + ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail"); return false; } bool result; -- Gitee From 5bb0ceea294eda7c7a226e34cbbc4d58ba3e62ac Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 08:57:44 +0000 Subject: [PATCH 25/28] update services/privacymanager/src/service/privacy_manager_stub.cpp. Signed-off-by: y1585740638 --- services/privacymanager/src/service/privacy_manager_stub.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/privacymanager/src/service/privacy_manager_stub.cpp b/services/privacymanager/src/service/privacy_manager_stub.cpp index edadba7e0..6239f8943 100644 --- a/services/privacymanager/src/service/privacy_manager_stub.cpp +++ b/services/privacymanager/src/service/privacy_manager_stub.cpp @@ -214,8 +214,8 @@ void PrivacyManagerStub::IsAllowedUsingPermissionInner(MessageParcel& data, Mess } AccessTokenID tokenId = data.ReadUint32(); std::string permissionName = data.ReadString(); - bool allowperInfo = this->IsAllowedUsingPermission(tokenId, permissionName); - if (!reply.WriteBool(allowperInfo)) { + bool result = this->IsAllowedUsingPermission(tokenId, permissionName); + if (!reply.WriteBool(result)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteBool(%{public}s)", permissionName.c_str()); return; } -- Gitee From a1623d260c79e6cd579f0df05f393e818553d218 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 09:17:01 +0000 Subject: [PATCH 26/28] update frameworks/privacy/include/i_privacy_manager.h. Signed-off-by: y1585740638 --- frameworks/privacy/include/i_privacy_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/privacy/include/i_privacy_manager.h b/frameworks/privacy/include/i_privacy_manager.h index df5f9febf..cb80f091c 100644 --- a/frameworks/privacy/include/i_privacy_manager.h +++ b/frameworks/privacy/include/i_privacy_manager.h @@ -47,7 +47,7 @@ public: virtual int32_t RegisterPermActiveStatusCallback( std::vector& permList, const sptr& callback) = 0; virtual int32_t UnRegisterPermActiveStatusCallback(const sptr& callback) = 0; - virtual bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; + virtual bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; enum class InterfaceCode { ADD_PERMISSION_USED_RECORD, START_USING_PERMISSION, -- Gitee From 1610da4a44d1fa3c2a87a92da0b6d67a7a094094 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 09:17:51 +0000 Subject: [PATCH 27/28] update interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 5eaabb699..dc7fb7a8c 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -277,7 +277,7 @@ bool PrivacyManagerProxy::IsAllowedUsingPermission(AccessTokenID tokenID, const { MessageParcel data; MessageParcel reply; - if(!data.WriteInterfaceToken(IPrivacyManager::GetDescriptor())) { + if (!data.WriteInterfaceToken(IPrivacyManager::GetDescriptor())) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write WriteInterfaceToken."); return false; } -- Gitee From 631e12a6d6e33b4940545a271dcf528f0c79dc88 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 09:18:10 +0000 Subject: [PATCH 28/28] update interfaces/innerkits/privacy/src/privacy_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/privacy/src/privacy_kit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index 3522aa7a7..4ce616f9f 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -82,7 +82,7 @@ int32_t PrivacyKit::UnRegisterPermActiveStatusCallback(const std::shared_ptr