You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/04/02 09:59:37 UTC
[shardingsphere] branch master updated: Add testcase for
MySQLPrivilageLoader & fix bug (#9884)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 4ee02a6 Add testcase for MySQLPrivilageLoader & fix bug (#9884)
4ee02a6 is described below
commit 4ee02a6f33a894aff4d3e8940c49d6aa999d687d
Author: Zhu jun <zh...@163.com>
AuthorDate: Fri Apr 2 17:59:16 2021 +0800
Add testcase for MySQLPrivilageLoader & fix bug (#9884)
* add testcase for MySQLPrivilageLoader
* trigger ci
* trigger ci
* trigger ci
* trigger ci
* fix review
---
.../loader/dialect/MySQLPrivilegeLoader.java | 1 +
.../loader/dialect/MySQLPrivilegeLoaderTest.java | 186 +++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoader.java
index 323d878..ecc608a 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoader.java
@@ -52,6 +52,7 @@ public final class MySQLPrivilegeLoader implements PrivilegeLoader {
@Override
public Map<ShardingSphereUser, ShardingSpherePrivilege> load(final Collection<ShardingSphereUser> users, final DataSource dataSource) throws SQLException {
Map<ShardingSphereUser, ShardingSpherePrivilege> result = new LinkedHashMap<>();
+ users.forEach(user -> result.put(user, new ShardingSpherePrivilege()));
fillGlobalPrivilege(result, dataSource, users);
fillSchemaPrivilege(result, dataSource, users);
fillTablePrivilege(result, dataSource, users);
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoaderTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoaderTest.java
new file mode 100644
index 0000000..9284f60
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/auth/builder/loader/dialect/MySQLPrivilegeLoaderTest.java
@@ -0,0 +1,186 @@
+/*
+ * 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.infra.metadata.auth.builder.loader.dialect;
+
+import org.apache.shardingsphere.infra.metadata.auth.builder.loader.PrivilegeLoader;
+import org.apache.shardingsphere.infra.metadata.auth.model.privilege.PrivilegeType;
+import org.apache.shardingsphere.infra.metadata.auth.model.privilege.ShardingSpherePrivilege;
+import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class MySQLPrivilegeLoaderTest {
+
+ @BeforeClass
+ public static void setUp() {
+ ShardingSphereServiceLoader.register(PrivilegeLoader.class);
+ }
+
+ @Test
+ public void assertLoad() throws SQLException {
+ Collection<ShardingSphereUser> users = buildUsers();
+ DataSource dataSource = mockDataSource(users);
+ assertPrivilege(getPrivilegeLoader().load(users, dataSource));
+ }
+
+ private void assertPrivilege(final Map<ShardingSphereUser, ShardingSpherePrivilege> actual) {
+ assertThat(actual.size(), is(2));
+ ShardingSphereUser root = new ShardingSphereUser("root", "", "localhost");
+ assertThat(actual.get(root).getAdministrativePrivilege().getPrivileges().size(), is(3));
+ Collection<PrivilegeType> expectedAdministrativePrivilege = new CopyOnWriteArraySet(Arrays.asList(PrivilegeType.SUPER, PrivilegeType.RELOAD, PrivilegeType.SHUTDOWN));
+ assertEquals(actual.get(root).getAdministrativePrivilege().getPrivileges(), expectedAdministrativePrivilege);
+ Collection<PrivilegeType> expectedDatabasePrivilege = new CopyOnWriteArraySet(Arrays.asList(PrivilegeType.SELECT, PrivilegeType.INSERT, PrivilegeType.UPDATE,
+ PrivilegeType.DELETE, PrivilegeType.CREATE, PrivilegeType.ALTER));
+ assertThat(actual.get(root).getDatabasePrivilege().getGlobalPrivileges().size(), is(6));
+ assertEquals(actual.get(root).getDatabasePrivilege().getGlobalPrivileges(), expectedDatabasePrivilege);
+ ShardingSphereUser sys = new ShardingSphereUser("mysql.sys", "", "localhost");
+ assertThat(actual.get(sys).getAdministrativePrivilege().getPrivileges().size(), is(0));
+ assertThat(actual.get(sys).getDatabasePrivilege().getGlobalPrivileges().size(), is(0));
+ assertThat(actual.get(sys).getDatabasePrivilege().getSpecificPrivileges().size(), is(1));
+ }
+
+ private Collection<ShardingSphereUser> buildUsers() {
+ LinkedList<ShardingSphereUser> users = new LinkedList<>();
+ users.add(new ShardingSphereUser("root", "", "localhost"));
+ users.add(new ShardingSphereUser("mysql.sys", "", "localhost"));
+ return users;
+ }
+
+ private DataSource mockDataSource(final Collection<ShardingSphereUser> users) throws SQLException {
+ ResultSet globalPrivilegeResultSet = mockGlobalPrivilegeResultSet();
+ ResultSet schemaPrivilegeResultSet = mockSchemaPrivilegeResultSet();
+ ResultSet tablePrivilegeResultSet = mockTablePrivilegeResultSet();
+ DataSource dataSource = mock(DataSource.class, RETURNS_DEEP_STUBS);
+ String globalPrivilegeSql = "SELECT * FROM mysql.user WHERE (user, host) in (%s)";
+ String schemaPrivilegeSql = "SELECT * FROM mysql.db WHERE (user, host) in (%s)";
+ String tablePrivilegeSql = "SELECT Db, Table_name, Table_priv FROM mysql.tables_priv WHERE (user, host) in (%s)";
+ String useHostTuples = users.stream().map(item -> String.format("(%s, %s)", item.getGrantee().getUsername(), item.getGrantee().getHostname())).collect(Collectors.joining(","));
+ when(dataSource.getConnection().createStatement().executeQuery(String.format(globalPrivilegeSql, useHostTuples))).thenReturn(globalPrivilegeResultSet);
+ when(dataSource.getConnection().createStatement().executeQuery(String.format(schemaPrivilegeSql, useHostTuples))).thenReturn(schemaPrivilegeResultSet);
+ when(dataSource.getConnection().createStatement().executeQuery(String.format(tablePrivilegeSql, useHostTuples))).thenReturn(tablePrivilegeResultSet);
+ return dataSource;
+ }
+
+ private ResultSet mockGlobalPrivilegeResultSet() throws SQLException {
+ ResultSet result = mock(ResultSet.class);
+ when(result.next()).thenReturn(true, true, false);
+ // AdministrativePrivilege
+ when(result.getBoolean("Super_priv")).thenReturn(true, false);
+ when(result.getBoolean("Reload_priv")).thenReturn(true, false);
+ when(result.getBoolean("Shutdown_priv")).thenReturn(true, false);
+ when(result.getBoolean("Process_priv")).thenReturn(false, false);
+ when(result.getBoolean("File_priv")).thenReturn(false, false);
+ when(result.getBoolean("Show_db_priv")).thenReturn(false, false);
+ when(result.getBoolean("Repl_slave_priv")).thenReturn(false, false);
+ when(result.getBoolean("Repl_client_priv")).thenReturn(false, false);
+ when(result.getBoolean("Create_user_priv")).thenReturn(false, false);
+ when(result.getBoolean("Create_tablespace_priv")).thenReturn(false, false);
+ // DatabasePrivilege
+ when(result.getBoolean("Select_priv")).thenReturn(true, false);
+ when(result.getBoolean("Insert_priv")).thenReturn(true, false);
+ when(result.getBoolean("Update_priv")).thenReturn(true, false);
+ when(result.getBoolean("Delete_priv")).thenReturn(true, false);
+ when(result.getBoolean("Create_priv")).thenReturn(true, false);
+ when(result.getBoolean("Alter_priv")).thenReturn(true, false);
+ when(result.getBoolean("Drop_priv")).thenReturn(false, false);
+ when(result.getBoolean("Grant_priv")).thenReturn(false, false);
+ when(result.getBoolean("Index_priv")).thenReturn(false, false);
+ when(result.getBoolean("References_priv")).thenReturn(false, false);
+ when(result.getBoolean("Create_tmp_table_priv")).thenReturn(false, false);
+ when(result.getBoolean("Lock_tables_priv")).thenReturn(false, false);
+ when(result.getBoolean("Execute_priv")).thenReturn(false, false);
+ when(result.getBoolean("Create_view_priv")).thenReturn(false, false);
+ when(result.getBoolean("Show_view_priv")).thenReturn(false, false);
+ when(result.getBoolean("Create_routine_priv")).thenReturn(false, false);
+ when(result.getBoolean("Alter_routine_priv")).thenReturn(false, false);
+ when(result.getBoolean("Event_priv")).thenReturn(false, false);
+ when(result.getBoolean("Trigger_priv")).thenReturn(false, false);
+ when(result.getString("user")).thenReturn("root", "mysql.sys");
+ when(result.getString("host")).thenReturn("localhost", "localhost");
+ return result;
+ }
+
+ private ResultSet mockSchemaPrivilegeResultSet() throws SQLException {
+ ResultSet result = mock(ResultSet.class);
+ when(result.next()).thenReturn(true, false);
+ when(result.getString("Db")).thenReturn("sys");
+ when(result.getBoolean("Select_priv")).thenReturn(false);
+ when(result.getBoolean("Insert_priv")).thenReturn(false);
+ when(result.getBoolean("Update_priv")).thenReturn(false);
+ when(result.getBoolean("Delete_priv")).thenReturn(false);
+ when(result.getBoolean("Create_priv")).thenReturn(false);
+ when(result.getBoolean("Alter_priv")).thenReturn(false);
+ when(result.getBoolean("Drop_priv")).thenReturn(false);
+ when(result.getBoolean("Grant_priv")).thenReturn(false);
+ when(result.getBoolean("Index_priv")).thenReturn(false);
+ when(result.getBoolean("References_priv")).thenReturn(false);
+ when(result.getBoolean("Create_tmp_table_priv")).thenReturn(false);
+ when(result.getBoolean("Lock_tables_priv")).thenReturn(false);
+ when(result.getBoolean("Execute_priv")).thenReturn(false);
+ when(result.getBoolean("Create_view_priv")).thenReturn(false);
+ when(result.getBoolean("Show_view_priv")).thenReturn(false);
+ when(result.getBoolean("Create_routine_priv")).thenReturn(false);
+ when(result.getBoolean("Alter_routine_priv")).thenReturn(false);
+ when(result.getBoolean("Event_priv")).thenReturn(false);
+ when(result.getBoolean("Trigger_priv")).thenReturn(true);
+ when(result.getString("user")).thenReturn("mysql.sys");
+ when(result.getString("host")).thenReturn("localhost");
+ return result;
+ }
+
+ private ResultSet mockTablePrivilegeResultSet() throws SQLException {
+ ResultSet result = mock(ResultSet.class, RETURNS_DEEP_STUBS);
+ when(result.next()).thenReturn(true, false);
+ when(result.getString("Db")).thenReturn("sys");
+ when(result.getString("Table_name")).thenReturn("sys_config");
+ when(result.getArray("Table_priv").getArray()).thenReturn(new String[]{"Select"});
+ when(result.getString("user")).thenReturn("mysql.sys");
+ when(result.getString("host")).thenReturn("localhost");
+ return result;
+ }
+
+ private PrivilegeLoader getPrivilegeLoader() {
+ for (PrivilegeLoader each : ShardingSphereServiceLoader.getSingletonServiceInstances(PrivilegeLoader.class)) {
+ if ("MySQL".equals(each.getDatabaseType())) {
+ return each;
+ }
+ }
+ throw new IllegalStateException("Can not find MySQLPrivilegeLoader");
+ }
+}