fix DataAuthorization

xlorne · xlorne · commit a4ca886855c1 · 2024-12-18T16:54:57.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.43</version>
+        <version>3.3.44</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.43</version>
+        <version>3.3.44</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.43</version>
+        <version>3.3.44</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.43</version>
+        <version>3.3.44</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.43</version>
+        <version>3.3.44</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.43</version>
+    <version>3.3.44</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.43</version>
+    <version>3.3.44</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.43</version>
+        <version>3.3.44</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
@@ -28,12 +28,24 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/DataAuthorizationConfiguration.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/DataAuthorizationConfiguration.java
@@ -5,7 +5,7 @@
 import com.codingapi.springboot.authorization.handler.ColumnHandler;
 import com.codingapi.springboot.authorization.handler.RowHandler;
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptor;
-import com.codingapi.springboot.authorization.properties.DataAuthorizationProperty;
+import com.codingapi.springboot.authorization.properties.DataAuthorizationProperties;
 import com.codingapi.springboot.authorization.register.ConditionHandlerRegister;
 import com.codingapi.springboot.authorization.register.DataAuthorizationContextRegister;
 import com.codingapi.springboot.authorization.register.ResultSetHandlerRegister;
@@ -22,8 +22,8 @@ public class DataAuthorizationConfiguration {
 
     @Bean
     @ConfigurationProperties(prefix = "codingapi.data-authorization")
-    public DataAuthorizationProperty dataAuthorizationProperty(){
-        return new DataAuthorizationProperty();
+    public DataAuthorizationProperties dataAuthorizationProperties(){
+        return new DataAuthorizationProperties();
     }
 
     @Bean
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/enhancer/DataPermissionSQLEnhancer.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/enhancer/DataPermissionSQLEnhancer.java
@@ -1,5 +1,6 @@
 package com.codingapi.springboot.authorization.enhancer;
 
+
 import com.codingapi.springboot.authorization.handler.Condition;
 import com.codingapi.springboot.authorization.handler.RowHandler;
 import lombok.Getter;
@@ -69,7 +70,8 @@ private void enhanceDataPermissionInSelect(PlainSelect plainSelect) throws Excep
         if (plainSelect.getJoins() != null) {
             for (Join join : plainSelect.getJoins()) {
                 if (join.getRightItem() instanceof Select) {
-                    this.applyDataPermissionToSubquery((Select) join.getRightItem());
+                    PlainSelect subPlainSelect =  ((Select) join.getRightItem()).getPlainSelect();
+                    this.enhanceDataPermissionInSelect(subPlainSelect);
                 }
                 if(join.getRightItem() instanceof Table){
                     injectDataPermissionCondition(plainSelect, (Table) join.getRightItem(), where);
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/properties/DataAuthorizationProperties.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/properties/DataAuthorizationProperties.java
@@ -6,12 +6,12 @@
 
 @Setter
 @Getter
-public class DataAuthorizationProperty {
+public class DataAuthorizationProperties {
 
     private boolean showSql = false;
 
-    public DataAuthorizationProperty() {
-        DataAuthorizationPropertyContext.getInstance().setDataAuthorizationProperty(this);
+    public DataAuthorizationProperties() {
+        DataAuthorizationPropertyContext.getInstance().setDataAuthorizationProperties(this);
     }
 
 }
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/properties/DataAuthorizationPropertyContext.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/properties/DataAuthorizationPropertyContext.java
@@ -9,13 +9,16 @@ public class DataAuthorizationPropertyContext {
 
     private DataAuthorizationPropertyContext(){}
 
-    private DataAuthorizationProperty dataAuthorizationProperty;
+    private DataAuthorizationProperties dataAuthorizationProperties;
 
-    protected void setDataAuthorizationProperty(DataAuthorizationProperty dataAuthorizationProperty){
-        this.dataAuthorizationProperty = dataAuthorizationProperty;
+    protected void setDataAuthorizationProperties(DataAuthorizationProperties dataAuthorizationProperties){
+        this.dataAuthorizationProperties = dataAuthorizationProperties;
     }
 
     public boolean showSql(){
-        return dataAuthorizationProperty.isShowSql();
+        if(dataAuthorizationProperties!=null) {
+            return dataAuthorizationProperties.isShowSql();
+        }
+        return false;
     }
 }
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/utils/SQLUtils.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/utils/SQLUtils.java
@@ -1,25 +1,24 @@
 package com.codingapi.springboot.authorization.utils;
 
-import java.util.regex.Pattern;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.Select;
 
 public class SQLUtils {
 
-    // 定义正则表达式
-    private static final Pattern QUERY_SQL_PATTERN = Pattern.compile(
-            "^\\s*select\\s+(?!.*\\binto\\b).*",
-            Pattern.CASE_INSENSITIVE // 忽略大小写
-    );
-
     /**
-     * 判断是否为查询 SQL（排除 SELECT INTO 类型的语句）
+     * 判断是否为查询
      */
     public static boolean isQuerySql(String sql) {
         if (sql == null || sql.trim().isEmpty()) {
             return false; // 空字符串或 null 不是有效 SQL
         }
-
-        // 使用正则表达式匹配
-        return QUERY_SQL_PATTERN.matcher(sql.trim()).matches();
+        try {
+            Statement statement = CCJSqlParserUtil.parse(sql);
+            return statement instanceof Select;
+        } catch (Exception e) {
+            return false;
+        }
     }
 
 
diff --git a/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java b/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java
@@ -23,10 +23,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.Rollback;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,6 +45,8 @@ public class DataAuthorizationContextTest {
     private DepartRepository departRepository;
     @Autowired
     private UnitRepository unitRepository;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
 
     @Test
     @Order(1)
@@ -157,7 +161,7 @@ public <T> T columnAuthorization(String tableName, String columnName, T value) {
             @Override
             public boolean supportColumnAuthorization(String tableName, String columnName, Object value) {
                 User user = CurrentUser.getInstance().getUser();
-                return user.getName().equalsIgnoreCase("bob");
+                return user != null && user.getName().equalsIgnoreCase("bob");
             }
 
         });
@@ -183,7 +187,7 @@ public boolean supportColumnAuthorization(String tableName, String columnName, O
         userRepository.save(bob);
         userRepository.save(tom);
 
-        assertTrue( SQLRunningContext.getInstance().skipDataAuthorization(()->userRepository.findAll()).size()>=3);
+        assertTrue(SQLRunningContext.getInstance().skipDataAuthorization(() -> userRepository.findAll()).size() >= 3);
 
         CurrentUser.getInstance().setUser(bob);
 
@@ -206,4 +210,143 @@ public boolean supportColumnAuthorization(String tableName, String columnName, O
 
 
     }
+
+
+    @Test
+    @Order(3)
+    void test3() {
+
+        ColumnMaskContext.getInstance().addColumnMask(new IDCardMask());
+        ColumnMaskContext.getInstance().addColumnMask(new PhoneMask());
+        ColumnMaskContext.getInstance().addColumnMask(new BankCardMask());
+
+        DataAuthorizationContext.getInstance().clearDataAuthorizationFilters();
+
+        DataAuthorizationContext.getInstance().addDataAuthorizationFilter(new DefaultDataAuthorizationFilter() {
+            @Override
+            public <T> T columnAuthorization(String tableName, String columnName, T value) {
+                return ColumnMaskContext.getInstance().mask(value);
+            }
+
+            @Override
+            public boolean supportColumnAuthorization(String tableName, String columnName, Object value) {
+                return true;
+            }
+
+        });
+
+        Unit rootUnit = new Unit("Coding总公司");
+        unitRepository.save(rootUnit);
+
+        Unit sdUnit = new Unit("Coding山东分公司", rootUnit.getId());
+        unitRepository.save(sdUnit);
+
+        Depart jgbDepart = new Depart("Coding架构部", rootUnit.getId());
+        departRepository.save(jgbDepart);
+
+        Depart xmbDepart = new Depart("Coding项目部", sdUnit.getId());
+        departRepository.save(xmbDepart);
+
+        User lorne = new User("lorne", LocalDate.parse("1991-01-01"), "beijing", "110105199003078999", "13812345678", jgbDepart);
+        User bob = new User("bob", LocalDate.parse("1991-01-01"), "beijing", "110105199003078999", "13812345678", xmbDepart);
+        User tom = new User("tom", LocalDate.parse("1991-01-01"), "beijing", "110105199003078999", "13812345678", xmbDepart);
+
+        userRepository.save(lorne);
+        userRepository.save(bob);
+        userRepository.save(tom);
+
+        List<Map<String, Object>> users = jdbcTemplate.queryForList("select * from t_user");
+        System.out.println(users);
+        assertEquals(3, users.size());
+
+        for (Map<String, Object> user : users) {
+            assertEquals("138****5678", user.get("phone"));
+        }
+
+    }
+
+
+    @Test
+    @Order(4)
+    void test4() {
+        String sql = "SELECT\n" +
+                "\tUNYiV.id AS '历史工作经历编号',\n" +
+                "\tUNYiV.company_name AS '历史工作单位',\n" +
+                "\tUNYiV.depart_name AS '历史工作部门',\n" +
+                "\tUNYiV.post_name AS '历史工作岗位',\n" +
+                "\tUNYiV.start_date AS '开始时间',\n" +
+                "\tUNYiV.end_date AS '结束时间',\n" +
+                "\towasH.员工编号 AS '员工编号',\n" +
+                "\towasH.员工姓名 AS '员工姓名',\n" +
+                "\towasH.员工生日 AS '员工生日',\n" +
+                "\towasH.员工地址 AS '员工地址',\n" +
+                "\towasH.身份证号码 AS '身份证号码',\n" +
+                "\towasH.手机号 AS '手机号',\n" +
+                "\towasH.部门编号 AS '部门编号',\n" +
+                "\towasH.岗位编号 AS '岗位编号',\n" +
+                "\towasH.任现职编号 AS '任现职编号',\n" +
+                "\towasH.社团编号 AS '社团编号',\n" +
+                "\towasH.社团名称 AS '社团名称',\n" +
+                "\towasH.创建时间 AS '创建时间' \n" +
+                "FROM\n" +
+                "\tt_work AS pehMS,\n" +
+                "\tt_employee AS OGwG7,\n" +
+                "\tt_work_history AS UNYiV,\n" +
+                "\t(\n" +
+                "\t\tSELECT\n" +
+                "\t\t\tWXJj8.id AS '员工编号',\n" +
+                "\t\t\tWXJj8.NAME AS '员工姓名',\n" +
+                "\t\t\tWXJj8.birth_date AS '员工生日',\n" +
+                "\t\t\tWXJj8.address AS '员工地址',\n" +
+                "\t\t\tWXJj8.id_card AS '身份证号码',\n" +
+                "\t\t\tWXJj8.phone AS '手机号',\n" +
+                "\t\t\tWXJj8.depart_id AS '部门编号',\n" +
+                "\t\t\tWXJj8.post_id AS '岗位编号',\n" +
+                "\t\t\tWXJj8.work_id AS '任现职编号',\n" +
+                "\t\t\trnGD4.id AS '社团编号',\n" +
+                "\t\t\trnGD4.NAME AS '社团名称',\n" +
+                "\t\t\trnGD4.create_date AS '创建时间' \n" +
+                "\t\tFROM\n" +
+                "\t\t\tt_employee AS WXJj8,\n" +
+                "\t\t\tt_league_employee AS dEj96,\n" +
+                "\t\t\tt_league AS rnGD4 \n" +
+                "\t\tWHERE\n" +
+                "\t\t\tdEj96.employee_id = WXJj8.id \n" +
+                "\t\t\tAND dEj96.league_id = rnGD4.id \n" +
+                "\t\t\tAND 1 = 1 \n" +
+                "\t) AS owasH \n" +
+                "WHERE\n" +
+                "\tUNYiV.employee_id = OGwG7.id \n" +
+                "\tAND OGwG7.work_id = pehMS.id \n" +
+                "\tAND owasH.任现职编号 = pehMS.id \n" +
+                "\tAND 1 = 1";
+
+        DataAuthorizationContext.getInstance().clearDataAuthorizationFilters();
+        DataAuthorizationContext.getInstance().addDataAuthorizationFilter(new DefaultDataAuthorizationFilter() {
+            @Override
+            public Condition rowAuthorization(String tableName, String tableAlias) {
+                return super.rowAuthorization(tableName, tableAlias);
+            }
+
+            @Override
+            public <T> T columnAuthorization(String tableName, String columnName, T value) {
+                System.out.println(tableName + " " + columnName + " " + value);
+                return value;
+            }
+
+            @Override
+            public boolean supportColumnAuthorization(String tableName, String columnName, Object value) {
+                return true;
+            }
+
+            @Override
+            public boolean supportRowAuthorization(String tableName, String tableAlias) {
+                return true;
+            }
+        });
+
+
+        List<Map<String, Object>> data = jdbcTemplate.queryForList(sql);
+        System.out.println(data);
+    }
 }
diff --git a/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/analyzer/SelectSQLAnalyzerTest.java b/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/analyzer/SelectSQLAnalyzerTest.java
diff --git a/springboot-starter-data-authorization/src/test/resources/application.properties b/springboot-starter-data-authorization/src/test/resources/application.properties
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
