You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2025/02/20 03:39:49 UTC

(shardingsphere) branch master updated: Complete the column information for checking if the encryption algori… (#34723)

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 7bbbacf871f Complete the column information for checking if the encryption algori… (#34723)
7bbbacf871f is described below

commit 7bbbacf871fb236252b658daffc7f463e74b9447
Author: Cong Hu <ia...@gmail.com>
AuthorDate: Thu Feb 20 11:39:43 2025 +0800

    Complete the column information for checking if the encryption algori… (#34723)
    
    * Complete the column information for checking if the encryption algorithm is the same.
    
    * Complete the column information for checking if the encryption algorithm is the same.
---
 .../InsertSelectColumnsEncryptorChecker.java}      | 37 +++++++++++++++++++---
 .../JoinConditionsEncryptorChecker.java}           | 19 +++++------
 .../EncryptPredicateColumnSupportedChecker.java    |  6 ++--
 .../EncryptInsertCipherNameTokenGenerator.java     |  5 ++-
 .../EncryptInsertDefaultColumnsTokenGenerator.java |  5 ++-
 .../InsertSelectColumnsEncryptorCheckerTest.java}  |  6 ++--
 .../generic/bound/ColumnSegmentBoundInfo.java      | 18 +++++++++++
 7 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/cryptographic/InsertSelectColumnsEncryptorChecker.java
similarity index 68%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparator.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/cryptographic/InsertSelectColumnsEncryptorChecker.java
index b53605e9e02..e43ecd99a96 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/cryptographic/InsertSelectColumnsEncryptorChecker.java
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
+package org.apache.shardingsphere.encrypt.checker.cryptographic;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.encrypt.rewrite.token.comparator.EncryptorComparator;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
@@ -26,6 +27,8 @@ import org.apache.shardingsphere.infra.binder.context.segment.select.projection.
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ExpressionProjection;
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ParameterMarkerProjection;
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.SubqueryProjection;
+import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
+import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;
@@ -39,7 +42,33 @@ import java.util.Iterator;
  * Insert select columns encryptor comparator.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class InsertSelectColumnsEncryptorComparator {
+public final class InsertSelectColumnsEncryptorChecker {
+    
+    /**
+     * Check whether same encryptor.
+     *
+     * @param insertColumns insert columns
+     * @param projections projections
+     * @param encryptRule encrypt rule
+     */
+    public static void checkIsSame(final Collection<ColumnSegment> insertColumns, final Collection<Projection> projections, final EncryptRule encryptRule) {
+        Iterator<ColumnSegment> insertColumnsIterator = insertColumns.iterator();
+        Iterator<Projection> projectionIterator = projections.iterator();
+        while (insertColumnsIterator.hasNext()) {
+            ColumnSegment insertColumnSegment = insertColumnsIterator.next();
+            Projection projection = projectionIterator.next();
+            if (isLiteralOrParameterMarker(projection)) {
+                continue;
+            }
+            ColumnSegmentBoundInfo projectionColumnBoundInfo = getColumnSegmentBoundInfo(projection);
+            EncryptAlgorithm insertColumnEncryptor = encryptRule.findQueryEncryptor(
+                    insertColumnSegment.getColumnBoundInfo().getOriginalTable().getValue(), insertColumnSegment.getColumnBoundInfo().getOriginalColumn().getValue()).orElse(null);
+            EncryptAlgorithm projectionEncryptor =
+                    encryptRule.findQueryEncryptor(projectionColumnBoundInfo.getOriginalTable().getValue(), projectionColumnBoundInfo.getOriginalColumn().getValue()).orElse(null);
+            ShardingSpherePreconditions.checkState(EncryptorComparator.isSame(insertColumnEncryptor, projectionEncryptor), () -> new UnsupportedSQLOperationException(
+                    "Can not use different encryptor for " + insertColumnSegment.getColumnBoundInfo() + " and " + projectionColumnBoundInfo + " in insert select columns"));
+        }
+    }
     
     /**
      * Compare whether same encryptor.
@@ -54,13 +83,13 @@ public final class InsertSelectColumnsEncryptorComparator {
         Iterator<Projection> projectionIterator = projections.iterator();
         while (insertColumnsIterator.hasNext()) {
             ColumnSegment insertColumnSegment = insertColumnsIterator.next();
-            EncryptAlgorithm insertColumnEncryptor = encryptRule.findQueryEncryptor(
-                    insertColumnSegment.getColumnBoundInfo().getOriginalTable().getValue(), insertColumnSegment.getColumnBoundInfo().getOriginalColumn().getValue()).orElse(null);
             Projection projection = projectionIterator.next();
             if (isLiteralOrParameterMarker(projection)) {
                 continue;
             }
             ColumnSegmentBoundInfo projectionColumnBoundInfo = getColumnSegmentBoundInfo(projection);
+            EncryptAlgorithm insertColumnEncryptor = encryptRule.findQueryEncryptor(
+                    insertColumnSegment.getColumnBoundInfo().getOriginalTable().getValue(), insertColumnSegment.getColumnBoundInfo().getOriginalColumn().getValue()).orElse(null);
             EncryptAlgorithm projectionEncryptor =
                     encryptRule.findQueryEncryptor(projectionColumnBoundInfo.getOriginalTable().getValue(), projectionColumnBoundInfo.getOriginalColumn().getValue()).orElse(null);
             if (!EncryptorComparator.isSame(insertColumnEncryptor, projectionEncryptor)) {
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/checker/cryptographic/JoinConditionsEncryptorChecker.java
similarity index 68%
rename from features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/JoinConditionsEncryptorComparator.java
rename to features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/cryptographic/JoinConditionsEncryptorChecker.java
index 35abfc56cbf..3f044f5f61d 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/checker/cryptographic/JoinConditionsEncryptorChecker.java
@@ -15,11 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
+package org.apache.shardingsphere.encrypt.checker.cryptographic;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.encrypt.rewrite.token.comparator.EncryptorComparator;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
+import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
+import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
 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;
@@ -30,26 +33,24 @@ import java.util.Collection;
  * Join conditions encryptor comparator.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class JoinConditionsEncryptorComparator {
+public final class JoinConditionsEncryptorChecker {
     
     /**
-     * Compare whether same encryptor.
+     * Check whether same encryptor.
      *
      * @param joinConditions join conditions
      * @param encryptRule encrypt rule
-     * @return same encryptors or not
+     * @param scenario scenario
      */
-    public static boolean isSame(final Collection<BinaryOperationExpression> joinConditions, final EncryptRule encryptRule) {
+    public static void checkIsSame(final Collection<BinaryOperationExpression> joinConditions, final EncryptRule encryptRule, final String scenario) {
         for (BinaryOperationExpression each : joinConditions) {
             if (!(each.getLeft() instanceof ColumnSegment) || !(each.getRight() instanceof ColumnSegment)) {
                 continue;
             }
             ColumnSegmentBoundInfo leftColumnInfo = ((ColumnSegment) each.getLeft()).getColumnBoundInfo();
             ColumnSegmentBoundInfo rightColumnInfo = ((ColumnSegment) each.getRight()).getColumnBoundInfo();
-            if (!EncryptorComparator.isSame(encryptRule, leftColumnInfo, rightColumnInfo)) {
-                return false;
-            }
+            ShardingSpherePreconditions.checkState(EncryptorComparator.isSame(encryptRule, leftColumnInfo, rightColumnInfo),
+                    () -> new UnsupportedSQLOperationException("Can not use different encryptor for " + leftColumnInfo + " and " + rightColumnInfo + " in " + scenario));
         }
-        return true;
     }
 }
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/predicate/EncryptPredicateColumnSupportedChecker.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/predicate/EncryptPredicateColumnSupportedChecker.java
index 129e69441bb..dfbd41f33d9 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/predicate/EncryptPredicateColumnSupportedChecker.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/predicate/EncryptPredicateColumnSupportedChecker.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.encrypt.checker.sql.predicate;
 
+import org.apache.shardingsphere.encrypt.checker.cryptographic.JoinConditionsEncryptorChecker;
 import org.apache.shardingsphere.encrypt.exception.metadata.MissingMatchedEncryptQueryAlgorithmException;
-import org.apache.shardingsphere.encrypt.rewrite.token.comparator.JoinConditionsEncryptorComparator;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
 import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
@@ -28,7 +28,6 @@ import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatem
 import org.apache.shardingsphere.infra.binder.context.type.WhereAvailable;
 import org.apache.shardingsphere.infra.checker.SupportedSQLChecker;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.sql.parser.statement.core.extractor.ExpressionExtractor;
@@ -56,8 +55,7 @@ public final class EncryptPredicateColumnSupportedChecker implements SupportedSQ
     public void check(final EncryptRule rule, final ShardingSphereDatabase database, final ShardingSphereSchema currentSchema, final SQLStatementContext sqlStatementContext) {
         Collection<SelectStatementContext> allSubqueryContexts = SQLStatementContextExtractor.getAllSubqueryContexts(sqlStatementContext);
         Collection<BinaryOperationExpression> joinConditions = SQLStatementContextExtractor.getJoinConditions((WhereAvailable) sqlStatementContext, allSubqueryContexts);
-        ShardingSpherePreconditions.checkState(JoinConditionsEncryptorComparator.isSame(joinConditions, rule),
-                () -> new UnsupportedSQLOperationException("Can not use different encryptor in join condition"));
+        JoinConditionsEncryptorChecker.checkIsSame(joinConditions, rule, "join condition");
         check(rule, (WhereAvailable) sqlStatementContext);
     }
     
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
index a65860305af..cfc44ad96f3 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.encrypt.rewrite.token.generator.insert;
 import com.google.common.base.Preconditions;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
-import org.apache.shardingsphere.encrypt.rewrite.token.comparator.InsertSelectColumnsEncryptorComparator;
+import org.apache.shardingsphere.encrypt.checker.cryptographic.InsertSelectColumnsEncryptorChecker;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
 import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
@@ -89,7 +89,6 @@ public final class EncryptInsertCipherNameTokenGenerator implements CollectionSQ
     private void checkInsertSelectEncryptor(final SelectStatementContext selectStatementContext, final Collection<ColumnSegment> insertColumns) {
         Collection<Projection> projections = selectStatementContext.getProjectionsContext().getExpandProjections();
         ShardingSpherePreconditions.checkState(insertColumns.size() == projections.size(), () -> new UnsupportedSQLOperationException("Column count doesn't match value count."));
-        ShardingSpherePreconditions.checkState(InsertSelectColumnsEncryptorComparator.isSame(insertColumns, projections, rule),
-                () -> new UnsupportedSQLOperationException("Can not use different encryptor in insert select columns"));
+        InsertSelectColumnsEncryptorChecker.checkIsSame(insertColumns, projections, rule);
     }
 }
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
index b748abb1d3c..6d9af7404d1 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDefaultColumnsTokenGenerator.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.encrypt.rewrite.token.generator.insert;
 import com.google.common.base.Preconditions;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
-import org.apache.shardingsphere.encrypt.rewrite.token.comparator.InsertSelectColumnsEncryptorComparator;
+import org.apache.shardingsphere.encrypt.checker.cryptographic.InsertSelectColumnsEncryptorChecker;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
 import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
@@ -95,8 +95,7 @@ public final class EncryptInsertDefaultColumnsTokenGenerator implements Optional
             Collection<ColumnSegment> derivedInsertColumns = insertStatementContext.getSqlStatement().getDerivedInsertColumns();
             Collection<Projection> projections = insertStatementContext.getInsertSelectContext().getSelectStatementContext().getProjectionsContext().getExpandProjections();
             ShardingSpherePreconditions.checkState(derivedInsertColumns.size() == projections.size(), () -> new UnsupportedSQLOperationException("Column count doesn't match value count."));
-            ShardingSpherePreconditions.checkState(InsertSelectColumnsEncryptorComparator.isSame(derivedInsertColumns, projections, rule),
-                    () -> new UnsupportedSQLOperationException("Can not use different encryptor in insert select columns"));
+            InsertSelectColumnsEncryptorChecker.checkIsSame(derivedInsertColumns, projections, rule);
         }
         QuoteCharacter quoteCharacter = new DatabaseTypeRegistry(insertStatementContext.getDatabaseType()).getDialectDatabaseMetaData().getQuoteCharacter();
         return new UseDefaultInsertColumnsToken(
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/checker/cryptographic/InsertSelectColumnsEncryptorCheckerTest.java
similarity index 95%
rename from features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/comparator/InsertSelectColumnsEncryptorComparatorTest.java
rename to features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/cryptographic/InsertSelectColumnsEncryptorCheckerTest.java
index 9a73d2b1103..df8d9f94692 100644
--- 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/checker/cryptographic/InsertSelectColumnsEncryptorCheckerTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.encrypt.rewrite.token.comparator;
+package org.apache.shardingsphere.encrypt.checker.cryptographic;
 
 import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
 import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class InsertSelectColumnsEncryptorComparatorTest {
+class InsertSelectColumnsEncryptorCheckerTest {
     
     @Test
     void assertInsertSelectIsSame() {
@@ -54,7 +54,7 @@ class InsertSelectColumnsEncryptorComparatorTest {
         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);
+        boolean result = InsertSelectColumnsEncryptorChecker.isSame(Arrays.asList(insertColumn1, insertColumn2), Arrays.asList(projection1, projection2), encryptRule);
         assertTrue(result);
     }
     
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/bound/ColumnSegmentBoundInfo.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/bound/ColumnSegmentBoundInfo.java
index e3a6f8175ba..0b57082998f 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/bound/ColumnSegmentBoundInfo.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/generic/bound/ColumnSegmentBoundInfo.java
@@ -60,4 +60,22 @@ public final class ColumnSegmentBoundInfo {
     public IdentifierValue getOriginalSchema() {
         return tableBoundInfo.getOriginalSchema();
     }
+    
+    @Override
+    public String toString() {
+        StringBuilder result = new StringBuilder();
+        if (null != getOriginalDatabase()) {
+            result.append(getOriginalDatabase().getValue()).append(".");
+        }
+        if (null != getOriginalSchema()) {
+            result.append(getOriginalSchema().getValue()).append(".");
+        }
+        if (null != originalTable) {
+            result.append(originalTable.getValue()).append(".");
+        }
+        if (null != originalColumn) {
+            result.append(originalColumn.getValue());
+        }
+        return result.toString();
+    }
 }