You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2021/11/05 06:38:16 UTC

[shardingsphere] branch master updated: fix: filter out null in privileges before authority check (#13468)

This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 a52996a  fix: filter out null in privileges before authority check (#13468)
a52996a is described below

commit a52996acd64283ef491dfdd04851eaff444a6491
Author: Chillax-0v0 <78...@users.noreply.github.com>
AuthorDate: Fri Nov 5 14:37:38 2021 +0800

    fix: filter out null in privileges before authority check (#13468)
    
    Co-authored-by: ningyu.ning <ni...@alibaba-inc.com>
---
 .../provider/natived/model/privilege/NativePrivileges.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java
index ec24a5e..435baee 100644
--- a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java
+++ b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java
@@ -28,6 +28,8 @@ import org.apache.shardingsphere.authority.provider.natived.model.subject.Schema
 import org.apache.shardingsphere.authority.provider.natived.model.subject.TableAccessSubject;
 
 import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * Native Privileges.
@@ -53,16 +55,16 @@ public final class NativePrivileges implements ShardingSpherePrivileges {
     
     @Override
     public boolean hasPrivileges(final Collection<PrivilegeType> privileges) {
-        return administrativePrivileges.hasPrivileges(privileges);
+        return administrativePrivileges.hasPrivileges(filterPrivileges(privileges));
     }
     
     @Override
     public boolean hasPrivileges(final AccessSubject accessSubject, final Collection<PrivilegeType> privileges) {
         if (accessSubject instanceof SchemaAccessSubject) {
-            return hasPrivileges(((SchemaAccessSubject) accessSubject).getSchema(), privileges);
+            return hasPrivileges(((SchemaAccessSubject) accessSubject).getSchema(), filterPrivileges(privileges));
         }
         if (accessSubject instanceof TableAccessSubject) {
-            return hasPrivileges(((TableAccessSubject) accessSubject).getSchema(), ((TableAccessSubject) accessSubject).getTable(), privileges);
+            return hasPrivileges(((TableAccessSubject) accessSubject).getSchema(), ((TableAccessSubject) accessSubject).getTable(), filterPrivileges(privileges));
         }
         throw new UnsupportedOperationException(accessSubject.getClass().getCanonicalName());
     }
@@ -74,4 +76,10 @@ public final class NativePrivileges implements ShardingSpherePrivileges {
     private boolean hasPrivileges(final String schema, final String table, final Collection<PrivilegeType> privileges) {
         return administrativePrivileges.hasPrivileges(privileges) || databasePrivileges.hasPrivileges(schema, table, privileges);
     }
+
+    private Collection<PrivilegeType> filterPrivileges(final Collection<PrivilegeType> privileges) {
+        return privileges.stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
 }