This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2fe2e420bad Refactor encrypt comparator and add insert select test
(#33841)
2fe2e420bad is described below
commit 2fe2e420bad2cb6a6468b97c39cd43da0bf51519
Author: ZhangCheng <[email protected]>
AuthorDate: Fri Nov 29 18:01:58 2024 +0800
Refactor encrypt comparator and add insert select test (#33841)
---
.../token/comparator/EncryptorComparator.java | 16 ++++
.../JoinConditionsEncryptorComparator.java | 5 +-
...InsertSelectColumnsEncryptorComparatorTest.java | 96 ++++++++++++++++++++++
3 files changed, 113 insertions(+), 4 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/EncryptorComparator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/EncryptorComparator.java
index db393aec8ef..5095ccc17e5 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/EncryptorComparator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/EncryptorComparator.java
@@ -19,7 +19,9 @@ package
org.apache.shardingsphere.encrypt.rewrite.token.comparator;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.bound.ColumnSegmentBoundInfo;
/**
* Encryptor comparator.
@@ -27,6 +29,20 @@ import
org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class EncryptorComparator {
+ /**
+ * Compare whether same encryptor.
+ *
+ * @param encryptRule encrypt rule
+ * @param leftColumnInfo left column info
+ * @param rightColumnInfo right column info
+ * @return whether is same encryptors or not
+ */
+ public static boolean isSame(final EncryptRule encryptRule, final
ColumnSegmentBoundInfo leftColumnInfo, final ColumnSegmentBoundInfo
rightColumnInfo) {
+ EncryptAlgorithm leftColumnEncryptor =
encryptRule.findQueryEncryptor(leftColumnInfo.getOriginalTable().getValue(),
leftColumnInfo.getOriginalColumn().getValue()).orElse(null);
+ EncryptAlgorithm rightColumnEncryptor =
encryptRule.findQueryEncryptor(rightColumnInfo.getOriginalTable().getValue(),
rightColumnInfo.getOriginalColumn().getValue()).orElse(null);
+ return EncryptorComparator.isSame(leftColumnEncryptor,
rightColumnEncryptor);
+ }
+
/**
* Compare whether same encryptor.
*
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsEncryptorComparator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsEncryptorComparator.java
index 58dec2588d6..35abfc56cbf 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsEncryptorComparator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsEncryptorComparator.java
@@ -20,7 +20,6 @@ package
org.apache.shardingsphere.encrypt.rewrite.token.comparator;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.BinaryOperationExpression;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.bound.ColumnSegmentBoundInfo;
@@ -46,10 +45,8 @@ public final class JoinConditionsEncryptorComparator {
continue;
}
ColumnSegmentBoundInfo leftColumnInfo = ((ColumnSegment)
each.getLeft()).getColumnBoundInfo();
- EncryptAlgorithm leftColumnEncryptor =
encryptRule.findQueryEncryptor(leftColumnInfo.getOriginalTable().getValue(),
leftColumnInfo.getOriginalColumn().getValue()).orElse(null);
ColumnSegmentBoundInfo rightColumnInfo = ((ColumnSegment)
each.getRight()).getColumnBoundInfo();
- EncryptAlgorithm rightColumnEncryptor =
encryptRule.findQueryEncryptor(rightColumnInfo.getOriginalTable().getValue(),
rightColumnInfo.getOriginalColumn().getValue()).orElse(null);
- if (!EncryptorComparator.isSame(leftColumnEncryptor,
rightColumnEncryptor)) {
+ if (!EncryptorComparator.isSame(encryptRule, leftColumnInfo,
rightColumnInfo)) {
return false;
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparatorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparatorTest.java
new file mode 100644
index 00000000000..76be5b0c8dc
--- /dev/null
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparatorTest.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
+
+import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
+import
org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
+import
org.apache.shardingsphere.encrypt.config.rule.EncryptColumnRuleConfiguration;
+import
org.apache.shardingsphere.encrypt.config.rule.EncryptTableRuleConfiguration;
+import org.apache.shardingsphere.encrypt.rule.EncryptRule;
+import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ColumnProjection;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
+import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.bound.ColumnSegmentBoundInfo;
+import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class InsertSelectColumnsEncryptorComparatorTest {
+
+ @Test
+ void assertInsertSelectIsSame() {
+ String databaseName = "foo_db";
+ IdentifierValue databaseValue = new IdentifierValue(databaseName);
+ IdentifierValue schemaValue = new IdentifierValue("schema");
+ ColumnSegment insertColumn1 = getInsertColumnSegment(databaseValue,
schemaValue, "table1", "pwd");
+ ColumnSegment insertColumn2 = getInsertColumnSegment(databaseValue,
schemaValue, "table1", "card");
+ ColumnProjection projection1 = getSelectProjection("pwd",
databaseValue, schemaValue);
+ ColumnProjection projection2 = getSelectProjection("card",
databaseValue, schemaValue);
+ EncryptRule encryptRule = new EncryptRule(databaseName,
createEncryptRuleConfiguration());
+ boolean result =
InsertSelectColumnsEncryptorComparator.isSame(Arrays.asList(insertColumn1,
insertColumn2), Arrays.asList(projection1, projection2), encryptRule);
+ assertTrue(result);
+ }
+
+ private ColumnProjection getSelectProjection(final String pwd, final
IdentifierValue databaseValue, final IdentifierValue schemaValue) {
+ return new ColumnProjection(new IdentifierValue("table2"), new
IdentifierValue(pwd), null, null, null, null,
+ new ColumnSegmentBoundInfo(databaseValue, schemaValue, new
IdentifierValue("table2"), new IdentifierValue(pwd)));
+ }
+
+ private ColumnSegment getInsertColumnSegment(final IdentifierValue
databaseValue, final IdentifierValue schemaValue, final String tableName, final
String columnName) {
+ ColumnSegment result = mock(ColumnSegment.class);
+ when(result.getColumnBoundInfo())
+ .thenReturn(new ColumnSegmentBoundInfo(databaseValue,
schemaValue, new IdentifierValue(tableName), new IdentifierValue(columnName)));
+ return result;
+ }
+
+ private EncryptRuleConfiguration createEncryptRuleConfiguration() {
+ return new
EncryptRuleConfiguration(Arrays.asList(getEncryptTableRuleConfiguration("table1"),
getEncryptTableRuleConfiguration("table2")),
+ getEncryptors(new AlgorithmConfiguration("CORE.FIXTURE", new
Properties()),
+ new
AlgorithmConfiguration("CORE.QUERY_ASSISTED.FIXTURE", new Properties()), new
AlgorithmConfiguration("CORE.QUERY_LIKE.FIXTURE", new Properties())));
+ }
+
+ private EncryptTableRuleConfiguration
getEncryptTableRuleConfiguration(final String tableName) {
+ EncryptColumnRuleConfiguration pwdColumnConfig =
createEncryptColumnRuleConfiguration("pwd", "standard_encryptor");
+ EncryptColumnRuleConfiguration cardColumnConfig = new
EncryptColumnRuleConfiguration("card", new
EncryptColumnItemRuleConfiguration("card_cipher", "standard_encryptor"));
+ return new EncryptTableRuleConfiguration(tableName,
Arrays.asList(pwdColumnConfig, cardColumnConfig));
+ }
+
+ private EncryptColumnRuleConfiguration
createEncryptColumnRuleConfiguration(final String logicalName, final String
encryptorName) {
+ return new EncryptColumnRuleConfiguration(logicalName, new
EncryptColumnItemRuleConfiguration(logicalName, encryptorName));
+ }
+
+ private Map<String, AlgorithmConfiguration> getEncryptors(final
AlgorithmConfiguration standardEncryptConfig, final AlgorithmConfiguration
queryAssistedEncryptConfig,
+ final
AlgorithmConfiguration queryLikeEncryptConfig) {
+ Map<String, AlgorithmConfiguration> result = new HashMap<>(3, 1F);
+ result.put("standard_encryptor", standardEncryptConfig);
+ result.put("assisted_encryptor", queryAssistedEncryptConfig);
+ result.put("like_encryptor", queryLikeEncryptConfig);
+ return result;
+ }
+}
