[ISSUE#11695] fix PreviousConfigHistory encryption (#11707)

* fix PreviousConfigHistory encryption * UT fix
alibaba · Jan 31, 2024 · 817eb58 · 817eb58
1 parent bd5caa6
commit 817eb58
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java
@@ -87,6 +87,12 @@ public ConfigHistoryInfo getPreviousConfigHistoryInfo(String dataId, String grou
         }
         // check if history config match the input
         checkHistoryInfoPermission(configHistoryInfo, dataId, group, namespaceId);
+
+        String encryptedDataKey = configHistoryInfo.getEncryptedDataKey();
+        Pair<String, String> pair = EncryptionHandler
+                .decryptHandler(dataId, encryptedDataKey, configHistoryInfo.getContent());
+        configHistoryInfo.setContent(pair.getSecond());
+
         return configHistoryInfo;
     }
 

diff --git a/...rce/src/main/java/com/alibaba/nacos/plugin/datasource/mapper/HistoryConfigInfoMapper.java b/...rce/src/main/java/com/alibaba/nacos/plugin/datasource/mapper/HistoryConfigInfoMapper.java
@@ -105,7 +105,7 @@ default MapperResult findConfigHistoryFetchRows(MapperContext context) {
      */
     default MapperResult detailPreviousConfigHistory(MapperContext context) {
         return new MapperResult(
-                "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified "
+                "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified,encrypted_data_key "
                         + "FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)",
                 Collections.singletonList(context.getWhereParameter(FieldConstant.ID)));
     }

diff --git a/...va/com/alibaba/nacos/plugin/datasource/impl/derby/HistoryConfigInfoMapperByDerbyTest.java b/...va/com/alibaba/nacos/plugin/datasource/impl/derby/HistoryConfigInfoMapperByDerbyTest.java
@@ -107,7 +107,7 @@ public void testDetailPreviousConfigHistory() {
         MapperResult mapperResult = historyConfigInfoMapperByDerby.detailPreviousConfigHistory(context);
         Assert.assertEquals(mapperResult.getSql(),
                 "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,"
-                        + "gmt_modified FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
+                        + "gmt_modified,encrypted_data_key FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
         Assert.assertArrayEquals(mapperResult.getParamList().toArray(), new Object[] {id});
     }
 

diff --git a/...va/com/alibaba/nacos/plugin/datasource/impl/mysql/HistoryConfigInfoMapperByMySqlTest.java b/...va/com/alibaba/nacos/plugin/datasource/impl/mysql/HistoryConfigInfoMapperByMySqlTest.java
@@ -104,7 +104,7 @@ public void testDetailPreviousConfigHistory() {
         MapperResult mapperResult = historyConfigInfoMapperByMySql.detailPreviousConfigHistory(context);
         Assert.assertEquals(mapperResult.getSql(),
                 "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,"
-                        + "gmt_modified FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
+                        + "gmt_modified,encrypted_data_key FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
         Assert.assertArrayEquals(mapperResult.getParamList().toArray(), new Object[] {id});
     }