This is an automated email from the ASF dual-hosted git repository. jiangmaolin pushed a commit to branch dev-5.5.1 in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
commit 130a617756abbfc88f800aa79e0adad7d50eb9f3 Author: Raigor <[email protected]> AuthorDate: Fri Nov 1 13:12:07 2024 +0800 Add RAL ACL object to support grant/revoke ral_operate (#34) --- .../config/AuthorityRuleConfiguration.java | 2 - .../authority/operation/ACLOperationExtractor.java | 3 -- .../update/GrantDistPrivilegesExecutor.java | 6 +-- .../update/RevokeDistPrivilegesExecutor.java | 2 +- .../handler/update/CreateDistUserExecutorTest.java | 6 +-- .../antlr4/imports/authority/SphereExBaseRule.g4 | 21 +--------- .../antlr4/imports/authority/SphereExKeyword.g4 | 4 ++ .../imports/authority/SphereExRALStatement.g4 | 30 +------------- .../autogen/SphereExAuthorityDistSQLStatement.g4 | 7 ---- .../SphereExAuthorityDistSQLStatementVisitor.java | 48 ++++------------------ .../privilege/AlterPrivilegeProviderStatement.java | 3 +- .../statement/user/CreateDistUserStatement.java | 2 - .../privilege/EnterprisePermittedPrivileges.java | 10 +++-- .../DefaultLoggingRuleConfigurationBuilder.java | 5 ++- 14 files changed, 35 insertions(+), 114 deletions(-) diff --git a/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java b/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java index c620fb4e4c3..60af3ac31b5 100644 --- a/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java +++ b/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java @@ -51,7 +51,5 @@ public final class AuthorityRuleConfiguration implements GlobalRuleConfiguration this.authenticators = authenticators; this.defaultAuthenticator = defaultAuthenticator; this.subject = subject; - - // TODO when grant super to user, set admin to true } } diff --git a/kernel/authority/core/src/main/java/com/sphereex/dbplusengine/authority/operation/ACLOperationExtractor.java b/kernel/authority/core/src/main/java/com/sphereex/dbplusengine/authority/operation/ACLOperationExtractor.java index b7474f492e0..ad1bf8fd8c2 100644 --- a/kernel/authority/core/src/main/java/com/sphereex/dbplusengine/authority/operation/ACLOperationExtractor.java +++ b/kernel/authority/core/src/main/java/com/sphereex/dbplusengine/authority/operation/ACLOperationExtractor.java @@ -69,9 +69,6 @@ public final class ACLOperationExtractor { * @return ACL operation */ public static ACLOperation extract(final SQLStatement sqlStatement) { - if (sqlStatement instanceof MySQLShowDatabasesStatement) { - return ACLOperation.SHOW_DB; - } if (sqlStatement instanceof DMLStatement) { return extractDML((DMLStatement) sqlStatement); } diff --git a/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/GrantDistPrivilegesExecutor.java b/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/GrantDistPrivilegesExecutor.java index cfc0a1dcb09..e1605a4a443 100644 --- a/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/GrantDistPrivilegesExecutor.java +++ b/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/GrantDistPrivilegesExecutor.java @@ -235,7 +235,7 @@ public final class GrantDistPrivilegesExecutor implements GlobalRuleDefinitionEx } private String getDistSQLPrivilege(final GrantLevelSegment level, final ACLOperation operation, final String aclObjectType) { - if (ACLOperation.CREATE_USER == operation) { + if (ACLOperation.CREATE_USER == operation || ACLOperation.RAL_OPERATE == operation) { return operation.name(); } String databasePrivilege = null == level ? AuthorityConstants.PRIVILEGE_WILDCARD : level.getDatabaseName(); @@ -258,7 +258,7 @@ public final class GrantDistPrivilegesExecutor implements GlobalRuleDefinitionEx private void updatePrivileges(final Map<ACLSubject, Collection<String>> privileges, final Collection<ACLSubject> toBeGrantedSubjects, final Collection<String> toBeGrantedPrivileges) { for (ACLSubject each : toBeGrantedSubjects) { Collection<String> userOrRolePrivileges = privileges.getOrDefault(each, new LinkedList<>()); - userOrRolePrivileges.addAll(toBeGrantedPrivileges); + toBeGrantedPrivileges.stream().filter(privilege -> !userOrRolePrivileges.contains(privilege)).forEach(userOrRolePrivileges::add); privileges.put(each, userOrRolePrivileges); } } @@ -270,7 +270,7 @@ public final class GrantDistPrivilegesExecutor implements GlobalRuleDefinitionEx for (ACLSubject each : toBeGrantedUsers) { ShardingSpherePreconditions.checkState(each instanceof GranteeSubject, () -> new RoleToRoleException(toBeGrantedRoles.iterator().next().getRoleName(), each.toString())); Collection<RoleSubject> userRoles = configuredUserRoles.getOrDefault(each, new LinkedList<>()); - userRoles.addAll(toBeGrantedRoles); + toBeGrantedRoles.stream().filter(role -> !userRoles.contains(role)).forEach(userRoles::add); configuredUserRoles.put((GranteeSubject) each, userRoles); } } diff --git a/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/RevokeDistPrivilegesExecutor.java b/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/RevokeDistPrivilegesExecutor.java index e45ebe5c8d3..2d1a5061b07 100644 --- a/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/RevokeDistPrivilegesExecutor.java +++ b/kernel/authority/distsql/handler/src/main/java/com/sphereex/dbplusengine/authority/distsql/handler/update/RevokeDistPrivilegesExecutor.java @@ -182,7 +182,7 @@ public final class RevokeDistPrivilegesExecutor implements GlobalRuleDefinitionE } private String getDistSQLPrivilege(final GrantLevelSegment level, final ACLOperation operation, final String aclObject) { - if (ACLOperation.CREATE_USER == operation) { + if (ACLOperation.CREATE_USER == operation || ACLOperation.RAL_OPERATE == operation) { return operation.name(); } String dbPrivilege = null == level ? AuthorityConstants.PRIVILEGE_WILDCARD : level.getDatabaseName(); diff --git a/kernel/authority/distsql/handler/src/test/java/com/sphereex/dbplusengine/authority/distsql/handler/update/CreateDistUserExecutorTest.java b/kernel/authority/distsql/handler/src/test/java/com/sphereex/dbplusengine/authority/distsql/handler/update/CreateDistUserExecutorTest.java index ff108ee05f2..0ef579582fb 100644 --- a/kernel/authority/distsql/handler/src/test/java/com/sphereex/dbplusengine/authority/distsql/handler/update/CreateDistUserExecutorTest.java +++ b/kernel/authority/distsql/handler/src/test/java/com/sphereex/dbplusengine/authority/distsql/handler/update/CreateDistUserExecutorTest.java @@ -53,13 +53,13 @@ class CreateDistUserExecutorTest { when(rule.getConfiguration()).thenReturn(ruleConfig); when(rule.getGrantees()).thenReturn(ruleConfig.getUsers().stream().map(each -> new Grantee(each.getUsername(), each.getHostname())).collect(Collectors.toList())); executor.setRule(rule); - CreateDistUserStatement sqlStatement = new CreateDistUserStatement(Collections.singleton(new DistUserSegment("root", "", null, "root", false)), Collections.emptyList(), false); + CreateDistUserStatement sqlStatement = new CreateDistUserStatement(Collections.singleton(new DistUserSegment("root", "", null, "root", false)), false); assertThrows(DuplicateGranteeException.class, () -> executor.checkBeforeUpdate(sqlStatement)); } @Test void assertExecuteWithDuplicatedRole() { - CreateDistUserStatement sqlStatement = new CreateDistUserStatement(Collections.singleton(new DistUserSegment("existed_role", "", null, "foo", false)), Collections.emptyList(), false); + CreateDistUserStatement sqlStatement = new CreateDistUserStatement(Collections.singleton(new DistUserSegment("existed_role", "", null, "foo", false)), false); AuthorityRule rule = mock(AuthorityRule.class); AuthorityRuleConfiguration ruleConfig = createCurrentRuleConfiguration(); when(rule.getConfiguration()).thenReturn(ruleConfig); @@ -69,7 +69,7 @@ class CreateDistUserExecutorTest { @Test void assertExecute() { - CreateDistUserStatement sqlStatement = new CreateDistUserStatement(Collections.singleton(new DistUserSegment("sharding", "%", null, "foo", false)), Collections.emptyList(), false); + CreateDistUserStatement sqlStatement = new CreateDistUserStatement(Collections.singleton(new DistUserSegment("sharding", "%", null, "foo", false)), false); AuthorityRule rule = mock(AuthorityRule.class); AuthorityRuleConfiguration ruleConfig = createCurrentRuleConfiguration(); when(rule.getConfiguration()).thenReturn(ruleConfig); diff --git a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExBaseRule.g4 b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExBaseRule.g4 index 18fe99458d4..c3639d3f8a9 100644 --- a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExBaseRule.g4 +++ b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExBaseRule.g4 @@ -58,8 +58,7 @@ ifNotExists ; createUserEntry - : userName_ (IDENTIFIED BY password_)? # createUserEntryIdentifiedBy - | userName_ IDENTIFIED WITH plugin AS string_ # createUserEntryIdentifiedWith + : userName_ IDENTIFIED BY password_ # createUserEntryIdentifiedBy ; createUserList @@ -68,11 +67,6 @@ createUserList alterUserEntry : userName_ IDENTIFIED BY password_ # alterUserEntryIdentifiedBy - | userName_ IDENTIFIED WITH plugin AS string_ # alterUserEntryIdentifiedWith - ; - -defaultRoleClause - : DEFAULT ROLE roleName_ (COMMA_ roleName_)* ; userIdentifierOrText @@ -160,14 +154,6 @@ plugin : textOrIdentifier ; -authenticatorDefinition - : authenticatorName LP_ authAlgorithmDefinition RP_ - ; - -authenticatorName - : IDENTIFIER_ - ; - authAlgorithmDefinition : TYPE LP_ NAME EQ_ typeName propertiesDefinition? RP_ ; @@ -176,10 +162,6 @@ typeName : IDENTIFIER_ ; -string_ - : STRING_ - ; - textOrIdentifier : IDENTIFIER_ | STRING_ ; @@ -205,6 +187,7 @@ distSQLACLOperation distSQLACLOperationWithoutObjectType : CREATE_USER + | RAL_OPERATE ; aclObjectType diff --git a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExKeyword.g4 b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExKeyword.g4 index 1f69d6dec46..4bff4c7c1b0 100644 --- a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExKeyword.g4 +++ b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExKeyword.g4 @@ -91,6 +91,10 @@ CREATE_USER : C R E A T E UL_ U S E R ; +RAL_OPERATE + : R A L UL_ O P E R A T E + ; + DATABASES : D A T A B A S E S ; diff --git a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExRALStatement.g4 b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExRALStatement.g4 index 88554133d9c..3867c2d85ff 100644 --- a/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExRALStatement.g4 +++ b/kernel/authority/distsql/parser/src/main/antlr4/imports/authority/SphereExRALStatement.g4 @@ -24,7 +24,7 @@ alterPrivilegeProvider ; createDistUser - : CREATE DIST USER ifNotExists? createUserList defaultRoleClause? + : CREATE DIST USER ifNotExists? createUserList ; alterDistUser @@ -77,31 +77,3 @@ showDistUsers showDistRoles : SHOW DIST ROLES ; - -createAuthenticator - : CREATE AUTHENTICATOR authenticatorDefinition - ; - -alterAuthenticator - : ALTER AUTHENTICATOR authenticatorDefinition - ; - -dropAuthenticator - : DROP AUTHENTICATOR authenticatorName (COMMA_ authenticatorName)* - ; - -createDefaultAuthenticator - : CREATE DEFAULT AUTHENTICATOR authenticatorName - ; - -alterDefaultAuthenticator - : ALTER DEFAULT AUTHENTICATOR authenticatorName - ; - -dropDefaultAuthenticator - : DROP DEFAULT AUTHENTICATOR - ; - -showAuthenticators - : SHOW AUTHENTICATORS - ; diff --git a/kernel/authority/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/SphereExAuthorityDistSQLStatement.g4 b/kernel/authority/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/SphereExAuthorityDistSQLStatement.g4 index a27c1289855..d97e053e54e 100644 --- a/kernel/authority/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/SphereExAuthorityDistSQLStatement.g4 +++ b/kernel/authority/distsql/parser/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/SphereExAuthorityDistSQLStatement.g4 @@ -33,12 +33,5 @@ execute | showDistGrants | showDistUsers | showDistRoles - | showAuthenticators - | createAuthenticator - | alterAuthenticator - | dropAuthenticator - | createDefaultAuthenticator - | alterDefaultAuthenticator - | dropDefaultAuthenticator ) SEMI_? EOF ; diff --git a/kernel/authority/distsql/parser/src/main/java/com/sphereex/dbplusengine/authority/distsql/parser/core/SphereExAuthorityDistSQLStatementVisitor.java b/kernel/authority/distsql/parser/src/main/java/com/sphereex/dbplusengine/authority/distsql/parser/core/SphereExAuthorityDistSQLStatementVisitor.java index 310c47eed30..224e3ddc722 100644 --- a/kernel/authority/distsql/parser/src/main/java/com/sphereex/dbplusengine/authority/distsql/parser/core/SphereExAuthorityDistSQLStatementVisitor.java +++ b/kernel/authority/distsql/parser/src/main/java/com/sphereex/dbplusengine/authority/distsql/parser/core/SphereExAuthorityDistSQLStatementVisitor.java @@ -34,7 +34,6 @@ import com.sphereex.dbplusengine.authority.distsql.statement.user.CreateDistUser import com.sphereex.dbplusengine.authority.distsql.statement.user.DropDistUserStatement; import com.sphereex.dbplusengine.authority.distsql.statement.user.ShowDistUsersStatement; import com.sphereex.dbplusengine.authority.model.operation.ACLOperation; -import org.antlr.v4.runtime.RuleContext; import org.antlr.v4.runtime.tree.ParseTree; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementBaseVisitor; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.AclObjectTypeContext; @@ -42,13 +41,10 @@ import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQL import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.AlterDistUserContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.AlterPrivilegeProviderContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.AlterUserEntryIdentifiedByContext; -import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.AlterUserEntryIdentifiedWithContext; -import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.AuthAlgorithmDefinitionContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.ColumnNamesContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.CreateDistRoleContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.CreateDistUserContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.CreateUserEntryIdentifiedByContext; -import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.CreateUserEntryIdentifiedWithContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.DistSQLOperationContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.DistSQLOperationWithoutObjectTypeContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.DropDistRoleContext; @@ -85,7 +81,6 @@ import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQL import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.StaticPrivilegeUpdateContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.StaticPrivilegeUsageContext; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.StorageUnitContext; -import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.String_Context; import org.apache.shardingsphere.distsql.parser.autogen.SphereExAuthorityDistSQLStatementParser.UserName_Context; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; @@ -107,10 +102,7 @@ public final class SphereExAuthorityDistSQLStatementVisitor extends SphereExAuth @Override public ASTNode visitCreateDistUser(final CreateDistUserContext ctx) { Collection<DistUserSegment> users = ctx.createUserList().createUserEntry().stream().map(each -> (DistUserSegment) visit(each)).collect(Collectors.toList()); - Collection<String> defaultRoles = null == ctx.defaultRoleClause() - ? Collections.emptyList() - : ctx.defaultRoleClause().roleName_().stream().map(RuleContext::getText).collect(Collectors.toList()); - return new CreateDistUserStatement(users, defaultRoles, null != ctx.ifNotExists()); + return new CreateDistUserStatement(users, null != ctx.ifNotExists()); } @Override @@ -121,30 +113,11 @@ public final class SphereExAuthorityDistSQLStatementVisitor extends SphereExAuth return new DistUserSegment(user, host, null, auth, false); } - @Override - public ASTNode visitCreateUserEntryIdentifiedWith(final CreateUserEntryIdentifiedWithContext ctx) { - String user = getIdentifierValue(ctx.userName_().userIdentifierOrText().textOrIdentifier(0)); - String host = null == ctx.userName_().userIdentifierOrText().AT_() ? null : getIdentifierValue(ctx.userName_().userIdentifierOrText().textOrIdentifier(1)); - return new DistUserSegment(user, host, ctx.plugin().getText(), ((StringLiteralValue) visit(ctx.string_())).getValue(), true); - } - - @Override - public ASTNode visitUserName_(final UserName_Context ctx) { - String user = getIdentifierValue(ctx.userIdentifierOrText().textOrIdentifier(0)); - String host = null == ctx.userIdentifierOrText().AT_() ? null : getIdentifierValue(ctx.userIdentifierOrText().textOrIdentifier(1)); - return new DistUserSegment(user, host, null, null, false); - } - @Override public ASTNode visitPassword_(final Password_Context ctx) { return new StringLiteralValue(ctx.getText()); } - @Override - public ASTNode visitString_(final String_Context ctx) { - return new StringLiteralValue(ctx.getText()); - } - @Override public ASTNode visitAlterDistUser(final AlterDistUserContext ctx) { return new AlterDistUserStatement((DistUserSegment) visit(ctx.alterUserEntry()), null != ctx.ifExists()); @@ -158,13 +131,6 @@ public final class SphereExAuthorityDistSQLStatementVisitor extends SphereExAuth return new DistUserSegment(user, host, null, auth, false); } - @Override - public ASTNode visitAlterUserEntryIdentifiedWith(final AlterUserEntryIdentifiedWithContext ctx) { - String user = getIdentifierValue(ctx.userName_().userIdentifierOrText().textOrIdentifier(0)); - String host = null == ctx.userName_().userIdentifierOrText().AT_() ? null : getIdentifierValue(ctx.userName_().userIdentifierOrText().textOrIdentifier(1)); - return new DistUserSegment(user, host, ctx.plugin().getText(), ((StringLiteralValue) visit(ctx.string_())).getValue(), true); - } - @Override public ASTNode visitDropDistUser(final DropDistUserContext ctx) { return new DropDistUserStatement(ctx.userList().userName_().stream().map(each -> (DistUserSegment) visit(each)).collect(Collectors.toList()), null != ctx.ifExists()); @@ -352,6 +318,13 @@ public final class SphereExAuthorityDistSQLStatementVisitor extends SphereExAuth return new ShowDistGrantsStatement((DistUserSegment) visit(ctx.userName_()), ctx.roleName_().stream().map(each -> new IdentifierValue(each.getText()).getValue()).collect(Collectors.toList())); } + @Override + public ASTNode visitUserName_(final UserName_Context ctx) { + String user = getIdentifierValue(ctx.userIdentifierOrText().textOrIdentifier(0)); + String host = null == ctx.userIdentifierOrText().AT_() ? null : getIdentifierValue(ctx.userIdentifierOrText().textOrIdentifier(1)); + return new DistUserSegment(user, host, null, null, false); + } + @Override public ASTNode visitShowDistUsers(final ShowDistUsersContext ctx) { return new ShowDistUsersStatement(); @@ -362,11 +335,6 @@ public final class SphereExAuthorityDistSQLStatementVisitor extends SphereExAuth return new ShowDistRolesStatement(); } - @Override - public ASTNode visitAuthAlgorithmDefinition(final AuthAlgorithmDefinitionContext ctx) { - return new AlgorithmSegment(getIdentifierValue(ctx.typeName()), getProperties(ctx.propertiesDefinition())); - } - @Override public ASTNode visitAlterPrivilegeProvider(final AlterPrivilegeProviderContext ctx) { return new AlterPrivilegeProviderStatement((AlgorithmSegment) visit(ctx.algorithmDefinition())); diff --git a/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/privilege/AlterPrivilegeProviderStatement.java b/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/privilege/AlterPrivilegeProviderStatement.java index 842bda30dca..47450c10a83 100644 --- a/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/privilege/AlterPrivilegeProviderStatement.java +++ b/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/privilege/AlterPrivilegeProviderStatement.java @@ -21,13 +21,14 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DCLStatement; /** * Alter privilege provider statement. */ @RequiredArgsConstructor @Getter -public final class AlterPrivilegeProviderStatement extends GlobalRuleDefinitionStatement { +public final class AlterPrivilegeProviderStatement extends GlobalRuleDefinitionStatement implements DCLStatement { private final AlgorithmSegment provider; } diff --git a/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/user/CreateDistUserStatement.java b/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/user/CreateDistUserStatement.java index 05f769851b0..2e0b3379521 100644 --- a/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/user/CreateDistUserStatement.java +++ b/kernel/authority/distsql/statement/src/main/java/com/sphereex/dbplusengine/authority/distsql/statement/user/CreateDistUserStatement.java @@ -34,7 +34,5 @@ public final class CreateDistUserStatement extends GlobalRuleDefinitionStatement private final Collection<DistUserSegment> users; - private final Collection<String> defaultRoles; - private final boolean ifNotExists; } diff --git a/kernel/authority/provider/enterprise/src/main/java/com/sphereex/dbplusengine/authority/provider/enterprise/privilege/EnterprisePermittedPrivileges.java b/kernel/authority/provider/enterprise/src/main/java/com/sphereex/dbplusengine/authority/provider/enterprise/privilege/EnterprisePermittedPrivileges.java index d018f1eafba..93591714481 100644 --- a/kernel/authority/provider/enterprise/src/main/java/com/sphereex/dbplusengine/authority/provider/enterprise/privilege/EnterprisePermittedPrivileges.java +++ b/kernel/authority/provider/enterprise/src/main/java/com/sphereex/dbplusengine/authority/provider/enterprise/privilege/EnterprisePermittedPrivileges.java @@ -23,6 +23,7 @@ import com.sphereex.dbplusengine.authority.obj.domain.ColumnACLObject; import com.sphereex.dbplusengine.authority.obj.domain.DCLACLObject; import com.sphereex.dbplusengine.authority.obj.domain.DistSQLACLObject; import com.sphereex.dbplusengine.authority.obj.domain.ProjectionACLObject; +import com.sphereex.dbplusengine.authority.obj.domain.RALACLObject; import com.sphereex.dbplusengine.authority.obj.domain.TableACLObject; import com.sphereex.dbplusengine.authority.provider.enterprise.shiro.EnterpriseRealm; import com.sphereex.dbplusengine.authority.provider.enterprise.shiro.permission.EnterpriseColumnPermission; @@ -70,13 +71,16 @@ public final class EnterprisePermittedPrivileges implements ShardingSpherePrivil TableACLObject tableACLObject = (TableACLObject) aclObject; return owner.isPermitted(new EnterpriseTablePermission(tableACLObject.getDatabase(), tableACLObject.getTable(), operation.name().toLowerCase())); } + if (aclObject instanceof DCLACLObject) { + return owner.isPermitted(new EnterpriseDCLPermission(operation.name().toLowerCase())); + } + if (aclObject instanceof RALACLObject) { + return owner.isPermitted(new EnterpriseDCLPermission(operation.name().toLowerCase())); + } if (aclObject instanceof DistSQLACLObject) { DistSQLACLObject distSQLACLObject = (DistSQLACLObject) aclObject; return owner.isPermitted(new EnterpriseDistSQLPermission(distSQLACLObject.getDatabase(), distSQLACLObject.getResource(), distSQLACLObject.getType(), operation.name().toLowerCase())); } - if (aclObject instanceof DCLACLObject) { - return owner.isPermitted(new EnterpriseDCLPermission(operation.name().toLowerCase())); - } return true; } } diff --git a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java index 107bb0dcb4c..aeefff50023 100644 --- a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java +++ b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java @@ -35,7 +35,10 @@ public final class DefaultLoggingRuleConfigurationBuilder implements DefaultGlob @SuppressWarnings("unchecked") @Override public LoggingRuleConfiguration build() { - return new LoggingRuleConfiguration(Collections.emptyList(), Collections.emptySet()); + ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); + return TypedSPILoader.findService(ShardingSphereLogBuilder.class, loggerFactory.getClass()) + .map(optional -> new LoggingRuleConfiguration(optional.getDefaultLoggers(loggerFactory), optional.getDefaultAppenders(loggerFactory))) + .orElseGet(() -> new LoggingRuleConfiguration(Collections.emptyList(), Collections.emptySet())); } @Override
