From 58347b932486e95a860a07e8c664f8295538ac09 Mon Sep 17 00:00:00 2001
From: yuqianyuan <yuqianyuan@huawei.com>
Date: Mon, 27 Sep 2021 15:32:29 +0800
Subject: [PATCH 1/3] server sync group

Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
---
 .../include/message/msg_codec.h               |  1 +
 .../include/message/msg_sync_group.h          |  4 +++
 .../src/message/msg_codec.cpp                 | 14 ++++++++++
 .../src/message/msg_sync_group.cpp            | 27 +++++++++++++++++++
 .../src/requestauth/auth_manager.cpp          | 15 +++++++++++
 5 files changed, 61 insertions(+)

diff --git a/services/devicemanagerservice/include/message/msg_codec.h b/services/devicemanagerservice/include/message/msg_codec.h
index 7c51a2de6..b0b088047 100644
--- a/services/devicemanagerservice/include/message/msg_codec.h
+++ b/services/devicemanagerservice/include/message/msg_codec.h
@@ -39,6 +39,7 @@ public:
     static std::shared_ptr<MsgRequestAuth> DecodeRequestAuth(std::string &jsonStr,
         std::shared_ptr<MsgRequestAuth> msgRequestAuth);
     static std::shared_ptr<MsgResponseAuth> DecodeResponseAuth(std::string &jsonStr);
+    static std::shared_ptr<MsgSyncGroup> DecodeSyncGroup(std::string &jsonStr);
 };
 }
 }
diff --git a/services/devicemanagerservice/include/message/msg_sync_group.h b/services/devicemanagerservice/include/message/msg_sync_group.h
index eb7961895..a19d8ff54 100644
--- a/services/devicemanagerservice/include/message/msg_sync_group.h
+++ b/services/devicemanagerservice/include/message/msg_sync_group.h
@@ -27,9 +27,13 @@ namespace OHOS {
 namespace DistributedHardware {
 class MsgSyncGroup {
 public:
+    MsgSyncGroup() {};
     MsgSyncGroup(std::vector<std::string> &groupList, std::string &deviceId);
     ~MsgSyncGroup() = default;
     void Encode(nlohmann::json &json);
+    int32_t Decode(nlohmann::json &json);
+    std::string GetDeviceId();
+    std::vector<std::string> GetGroupIdList();
 
 private:
     std::shared_ptr<MsgHead> mHead_;
diff --git a/services/devicemanagerservice/src/message/msg_codec.cpp b/services/devicemanagerservice/src/message/msg_codec.cpp
index a54d63e22..c98d5645a 100644
--- a/services/devicemanagerservice/src/message/msg_codec.cpp
+++ b/services/devicemanagerservice/src/message/msg_codec.cpp
@@ -95,5 +95,19 @@ std::shared_ptr<MsgResponseAuth> MsgCodec::DecodeResponseAuth(std::string &jsonS
     }
     return nullptr;
 }
+
+std::shared_ptr<MsgSyncGroup> MsgCodec::DecodeSyncGroup(std::string &jsonStr)
+{
+    nlohmann::json jsonObject = nlohmann::json::parse(jsonStr, nullptr, false);
+    if (jsonObject.is_discarded()) {
+        DMLOG(DM_LOG_ERROR, "DecodeSyncGroup jsonStr error");
+        return nullptr;
+    }
+    std::shared_ptr<MsgSyncGroup> msgSyncGroupPtr = std::make_shared<MsgSyncGroup>();
+    if (msgSyncGroupPtr->Decode(jsonObject) == 0) {
+        return msgSyncGroupPtr;
+    }
+    return nullptr;
+}
 }
 }
diff --git a/services/devicemanagerservice/src/message/msg_sync_group.cpp b/services/devicemanagerservice/src/message/msg_sync_group.cpp
index cccb5f197..935f1964d 100644
--- a/services/devicemanagerservice/src/message/msg_sync_group.cpp
+++ b/services/devicemanagerservice/src/message/msg_sync_group.cpp
@@ -16,6 +16,7 @@
 #include "msg_sync_group.h"
 #include "device_manager_log.h"
 #include "constants.h"
+#include "device_manager_errno.h"
 
 namespace OHOS {
 namespace DistributedHardware {
@@ -36,5 +37,31 @@ void MsgSyncGroup::Encode(nlohmann::json &json)
     json[TAG_DEVICE_ID] = mDeviceId_;
     json[TAG_GROUPIDS] = mGroupIdList_;
 }
+
+int32_t MsgSyncGroup::Decode(nlohmann::json &json)
+{
+    DMLOG(DM_LOG_INFO, "MsgSyncGroup decode started");
+    if (!json.contains(TAG_DEVICE_ID) || !json.contains(TAG_GROUPIDS)) {
+        DMLOG(DM_LOG_ERROR, "MsgSyncGroup::decode err ");
+        return MSG_DECODE_PARA_FAILED;
+    }
+
+    MsgHead msgHead;
+    mHead_ = msgHead.Decode(json);
+    mDeviceId_ = json[TAG_DEVICE_ID];
+    mGroupIdList_ = (std::vector<std::string>)json[TAG_GROUPIDS];
+    DMLOG(DM_LOG_INFO, "MsgSyncGroup decode completed");
+    return DEVICEMANAGER_OK;
+}
+
+std::string MsgSyncGroup::GetDeviceId()
+{
+    return mDeviceId_;
+}
+
+std::vector<std::string> MsgSyncGroup::GetGroupIdList()
+{
+    return mGroupIdList_;
+}
 }
 }
\ No newline at end of file
diff --git a/services/devicemanagerservice/src/requestauth/auth_manager.cpp b/services/devicemanagerservice/src/requestauth/auth_manager.cpp
index 363377913..82f7fb091 100644
--- a/services/devicemanagerservice/src/requestauth/auth_manager.cpp
+++ b/services/devicemanagerservice/src/requestauth/auth_manager.cpp
@@ -24,6 +24,7 @@
 #include "softbus_session.h"
 #include "encrypt_utils.h"
 #include "ipc_server_listener_adapter.h"
+#include "msg_sync_group.h"
 
 namespace OHOS {
 namespace DistributedHardware {
@@ -45,6 +46,9 @@ void AuthManager::OnReceiveMsg(long long channelId, std::string &message)
         case MSG_TYPE_AUTH_BY_PIN:
             OnReceiveMessage(channelId, message, msgType);
             break;
+        case MSG_TYPE_SYNC_GROUP:
+            SyncDmPrivateGroup(message);
+            break;
         default:
             DMLOG(DM_LOG_INFO, "msgType not support yet, msgType: %d", msgType);
             break;
@@ -154,6 +158,17 @@ void AuthManager::OnReceiveMessage(long long channelId, std::string &message, in
     }
 }
 
+void AuthManager::SyncDmPrivateGroup(std::string &message)
+{
+    std::shared_ptr<MsgSyncGroup> msgSyncGroupPtr = MsgCodec::DecodeSyncGroup(message);
+    if (msgSyncGroupPtr == nullptr) {
+        DMLOG(DM_LOG_ERROR, "decode syncGroup message err");
+        return;
+    }
+    std::vector<std::string> groupIdList = msgSyncGroupPtr->GetGroupIdList();
+    HichainConnector::GetInstance().SyncGroups(msgSyncGroupPtr->GetDeviceId(), groupIdList);
+}
+
 void AuthManager::MoveSessionToWaitScanMap()
 {
     DMLOG(DM_LOG_ERROR, "AuthManager::MoveSessionToWaitScanMap");
-- 
Gitee


From 18805f2d809467c0f538fabdf4912ebc44b28db8 Mon Sep 17 00:00:00 2001
From: yuqianyuan <yuqianyuan@huawei.com>
Date: Mon, 27 Sep 2021 16:49:47 +0800
Subject: [PATCH 2/3] sync group

Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
---
 OAT.xml                                       | 66 +++++++++++++++++++
 .../src/message/msg_sync_group.cpp            |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 OAT.xml

diff --git a/OAT.xml b/OAT.xml
new file mode 100644
index 000000000..02e212b1f
--- /dev/null
+++ b/OAT.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+     Notes:
+     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun.
+-->
+<!-- OAT(OSS Audit Tool) configuration guide:
+basedir: Root dir, the basedir + project path is the real source file location.
+licensefile:
+1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
+
+tasklist(only for batch mode):
+1. task: Define oat check thread, each task will start a new thread.
+2. task name: Only an name, no practical effect.
+3. task policy: Default policy for projects under this task, this field is required and the specified policy must defined in policylist.
+4. task filter: Default filefilter for projects under this task, this field is required and the specified filefilter must defined in filefilterlist.
+5. task project: Projects to be checked, the path field define the source root dir of the project.
+
+
+policyList:
+1. policy: All policyitems will be merged to default OAT.xml rules, the name of policy doesn't affect OAT check process.
+2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
+<policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
+3. policyitem type:
+    "compatibility" is used to check license compatibility in the specified path;
+    "license" is used to check source license header in the specified path;
+    "copyright" is used to check source copyright header in the specified path;
+    "import" is used to check source dependency in the specified path, such as import ... ,include ...
+    "filetype" is used to check file type in the specified path, supported file types: archive, binary
+    "filename" is used to check whether the specified file exists in the specified path(support projectroot in default OAT.xml), supported file names: LICENSE, README, README.OpenSource
+
+4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license.
+5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
+6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
+7. policyitem filefilter: Used to bind filefilter which define filter rules.
+8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
+
+Note:If the text contains special characters, please escape them according to the following rules:
+" == &gt;
+& == &gt;
+' == &gt;
+< == &gt;
+> == &gt;
+-->
+<configuration>
+    <oatconfig>
+        <filefilterlist>
+            <filefilter name="appIconPolicyFilter" desc="Filters for app icon" >
+                <filteritem type="filepath" name="display/entry/src/main/resources/base/media/.*" desc="pictures used for app icon"/>
+				<filteritem type="filepath" name="figures/.*" desc="pictures used to display project structure"/>
+            </filefilter>
+        </filefilterlist>
+    </oatconfig>
+</configuration>
diff --git a/services/devicemanagerservice/src/message/msg_sync_group.cpp b/services/devicemanagerservice/src/message/msg_sync_group.cpp
index 935f1964d..28c95bda0 100644
--- a/services/devicemanagerservice/src/message/msg_sync_group.cpp
+++ b/services/devicemanagerservice/src/message/msg_sync_group.cpp
@@ -49,7 +49,7 @@ int32_t MsgSyncGroup::Decode(nlohmann::json &json)
     MsgHead msgHead;
     mHead_ = msgHead.Decode(json);
     mDeviceId_ = json[TAG_DEVICE_ID];
-    mGroupIdList_ = (std::vector<std::string>)json[TAG_GROUPIDS];
+    mGroupIdList_ = static_cast<std::vector<std::string>>(json[TAG_GROUPIDS]);
     DMLOG(DM_LOG_INFO, "MsgSyncGroup decode completed");
     return DEVICEMANAGER_OK;
 }
-- 
Gitee


From dced5ea684e56dfdcc2e1ed40aa63d46a60732dd Mon Sep 17 00:00:00 2001
From: yuqianyuan <yuqianyuan@huawei.com>
Date: Mon, 27 Sep 2021 17:02:47 +0800
Subject: [PATCH 3/3] sync group

Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
---
 services/devicemanagerservice/src/message/msg_sync_group.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/devicemanagerservice/src/message/msg_sync_group.cpp b/services/devicemanagerservice/src/message/msg_sync_group.cpp
index 28c95bda0..5ccb56be9 100644
--- a/services/devicemanagerservice/src/message/msg_sync_group.cpp
+++ b/services/devicemanagerservice/src/message/msg_sync_group.cpp
@@ -49,7 +49,7 @@ int32_t MsgSyncGroup::Decode(nlohmann::json &json)
     MsgHead msgHead;
     mHead_ = msgHead.Decode(json);
     mDeviceId_ = json[TAG_DEVICE_ID];
-    mGroupIdList_ = static_cast<std::vector<std::string>>(json[TAG_GROUPIDS]);
+    mGroupIdList_ = json.at(TAG_GROUPIDS).get<std::vector<std::string>>();
     DMLOG(DM_LOG_INFO, "MsgSyncGroup decode completed");
     return DEVICEMANAGER_OK;
 }
-- 
Gitee