Updated Branches: refs/heads/master c5dd7da9f -> b9aa0b7a0
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java index a301aaa..fa8a75e 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java @@ -75,7 +75,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { policyFile .setUserGroupMapping(StaticUserGroup.getStaticMapping()) .write(context.getPolicyFile()); - Connection connection = context.createConnection(ADMIN1, "hive"); + Connection connection = context.createConnection(ADMIN1); Statement statement = context.createStatement(connection); try { statement.execute("create table test (a string)"); @@ -97,7 +97,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { .setUserGroupMapping(StaticUserGroup.getStaticMapping()) .write(context.getPolicyFile()); System.out.println(Files.toString(context.getPolicyFile(), Charsets.UTF_8)); - Connection connection = context.createConnection(ADMIN1, "hive"); + Connection connection = context.createConnection(ADMIN1); Statement statement = context.createStatement(connection); try { statement.execute("create table test (a string)"); @@ -115,7 +115,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { context = createContext(properties); File policyFile = context.getPolicyFile(); assertTrue("Could not delete " + policyFile, policyFile.delete()); - Connection connection = context.createConnection(ADMIN1, "hive"); + Connection connection = context.createConnection(ADMIN1); Statement statement = context.createStatement(connection); try { statement.execute("create table test (a string)"); @@ -136,7 +136,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { FileOutputStream out = new FileOutputStream(policyFile); out.write("this is not valid".getBytes(Charsets.UTF_8)); out.close(); - Connection connection = context.createConnection(ADMIN1, "hive"); + Connection connection = context.createConnection(ADMIN1); Statement statement = context.createStatement(connection); try { statement.execute("create table test (a string)"); @@ -158,7 +158,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { .setUserGroupMapping(StaticUserGroup.getStaticMapping()) .write(context.getPolicyFile()); - Connection connection = context.createConnection(USER1_1, "password"); + Connection connection = context.createConnection(USER1_1); Statement statement = context.createStatement(connection); // disallow external executables. The external.exec is set to false by session hooks @@ -198,7 +198,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { } private void verifyConfig(String userName, String confVar, String expectedValue) throws Exception { - Connection connection = context.createConnection(userName, "password"); + Connection connection = context.createConnection(userName); Statement statement = context.createStatement(connection); statement.execute("set " + confVar); ResultSet res = statement.getResultSet(); @@ -236,22 +236,22 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer { .setUserGroupMapping(StaticUserGroup.getStaticMapping()) .write(context.getPolicyFile()); - Connection connection = context.createConnection(ADMIN1, "hive"); + Connection connection = context.createConnection(ADMIN1); Statement statement = context.createStatement(connection); statement.execute("use default"); context.close(); - connection = context.createConnection(USER1_1, "hive"); + connection = context.createConnection(USER1_1); statement = context.createStatement(connection); statement.execute("use default"); context.close(); - connection = context.createConnection(USER2_1, "hive"); + connection = context.createConnection(USER2_1); statement = context.createStatement(connection); statement.execute("use default"); context.close(); - connection = context.createConnection(USER3_1, "hive"); + connection = context.createConnection(USER3_1); statement = context.createStatement(connection); try { // user3 doesn't have any implicit permission for default http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java index ba651a9..7fd2470 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java @@ -67,7 +67,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { .write(context.getPolicyFile()); // create dbs - Connection adminCon = context.createConnection(ADMIN1, "foo"); + Connection adminCon = context.createConnection(ADMIN1); Statement adminStmt = context.createStatement(adminCon); adminStmt.execute("use default"); adminStmt.execute("DROP DATABASE IF EXISTS " + dbName + " CASCADE"); @@ -77,7 +77,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { context.close(); // positive test, user1 has access to file being loaded - userConn = context.createConnection(USER1_1, "foo"); + userConn = context.createConnection(USER1_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); userStmt.execute("load data local inpath '" + dataFilePath + @@ -89,7 +89,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { context.close(); // Negative test, user2 doesn't have access to the file being loaded - userConn = context.createConnection(USER2_1, "foo"); + userConn = context.createConnection(USER2_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); context.assertAuthzException(userStmt, "load data local inpath '" + dataFilePath + @@ -120,7 +120,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { .write(context.getPolicyFile()); // create dbs - Connection adminCon = context.createConnection(ADMIN1, "foo"); + Connection adminCon = context.createConnection(ADMIN1); Statement adminStmt = context.createStatement(adminCon); adminStmt.execute("use default"); adminStmt.execute("DROP DATABASE IF EXISTS " + dbName + " CASCADE"); @@ -130,7 +130,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { adminCon.close(); // positive test: user1 has privilege to alter table add partition but not set location - userConn = context.createConnection(USER1_1, "foo"); + userConn = context.createConnection(USER1_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); userStmt.execute("ALTER TABLE " + tabName + " ADD PARTITION (dt = '21-Dec-2012') " + @@ -141,7 +141,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { userConn.close(); // negative test: user2 doesn't have privilege to alter table add partition - userConn = context.createConnection(USER2_1, "foo"); + userConn = context.createConnection(USER2_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); context.assertAuthzException(userStmt, @@ -153,7 +153,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { userConn.close(); // negative test: user3 doesn't have privilege to add/drop partitions - userConn = context.createConnection(USER3_1, "foo"); + userConn = context.createConnection(USER3_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); context.assertAuthzException(userStmt, @@ -164,7 +164,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { userConn.close(); // positive test: user1 has privilege to alter drop partition - userConn = context.createConnection(USER1_1, "foo"); + userConn = context.createConnection(USER1_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); userStmt.execute("ALTER TABLE " + tabName + " DROP PARTITION (dt = '21-Dec-2012')"); @@ -191,7 +191,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { .write(context.getPolicyFile()); // create dbs - Connection adminCon = context.createConnection(ADMIN1, "foo"); + Connection adminCon = context.createConnection(ADMIN1); Statement adminStmt = context.createStatement(adminCon); adminStmt.execute("use default"); adminStmt.execute("DROP DATABASE IF EXISTS " + dbName + " CASCADE"); @@ -201,7 +201,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { adminCon.close(); // negative test: user2 doesn't have privilege to alter table set partition - userConn = context.createConnection(USER2_1, "foo"); + userConn = context.createConnection(USER2_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); context.assertAuthzException(userStmt, @@ -209,7 +209,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { userConn.close(); // positive test: user1 has privilege to alter table set partition - userConn = context.createConnection(USER1_1, "foo"); + userConn = context.createConnection(USER1_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); userStmt.execute("ALTER TABLE " + tabName + " SET LOCATION '" + tabDir + "'"); @@ -233,7 +233,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { .write(context.getPolicyFile()); // create dbs - Connection adminCon = context.createConnection(ADMIN1, "foo"); + Connection adminCon = context.createConnection(ADMIN1); Statement adminStmt = context.createStatement(adminCon); adminStmt.execute("use default"); adminStmt.execute("DROP DATABASE IF EXISTS " + dbName + " CASCADE"); @@ -242,7 +242,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { adminCon.close(); // negative test: user2 doesn't have privilege to create external table in given path - userConn = context.createConnection(USER2_1, "foo"); + userConn = context.createConnection(USER2_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); context.assertAuthzException(userStmt, @@ -252,7 +252,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { userConn.close(); // positive test: user1 has privilege to create external table in given path - userConn = context.createConnection(USER1_1, "foo"); + userConn = context.createConnection(USER1_1); userStmt = context.createStatement(userConn); userStmt.execute("use " + dbName); userStmt.execute("CREATE EXTERNAL TABLE extab1(id INT) LOCATION '" + tableDir + "'"); http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java index 93bfc2b..d88609a 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUserManagement.java @@ -61,7 +61,7 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { doDropDb(admin); for (String user : users) { doCreateDb(user); - Connection connection = context.createConnection(user, "password"); + Connection connection = context.createConnection(user); Statement statement = context.createStatement(connection); ResultSet res = statement.executeQuery("SHOW DATABASES"); boolean created = false; @@ -78,21 +78,21 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { } } private void doDropDb(String user) throws Exception { - Connection connection = context.createConnection(user, "password"); + Connection connection = context.createConnection(user); Statement statement = connection.createStatement(); statement.execute("DROP DATABASE IF EXISTS " + dbName + " CASCADE"); statement.close(); connection.close(); } private void doCreateDb(String user) throws Exception { - Connection connection = context.createConnection(user, "password"); + Connection connection = context.createConnection(user); Statement statement = connection.createStatement(); statement.execute("CREATE DATABASE " + dbName); statement.close(); connection.close(); } private void doCreateTableLoadData(String user) throws Exception { - Connection connection = context.createConnection(user, "password"); + Connection connection = context.createConnection(user); Statement statement = context.createStatement(connection); statement.execute("USE " + dbName); statement.execute("CREATE TABLE " + tableName + @@ -149,7 +149,7 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { .removeGroupsFromUser("admin1", ADMINGROUP) .write(context.getPolicyFile()); // verify admin1 doesn't have admin privilege - Connection connection = context.createConnection("admin1", "foo"); + Connection connection = context.createConnection("admin1"); Statement statement = connection.createStatement(); context.assertAuthzException(statement, "CREATE DATABASE somedb"); statement.close(); @@ -187,7 +187,7 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { .write(context.getPolicyFile()); doCreateDbLoadDataDropDb("admin1", "admin1"); - Connection connection = context.createConnection("user1", "password"); + Connection connection = context.createConnection("user1"); Statement statement = connection.createStatement(); context.assertAuthzException(statement, "CREATE DATABASE " + dbName); statement.close(); @@ -228,7 +228,7 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { doDropDb("admin1"); for(String user : new String[]{"user1", "user2", "user3"}) { doCreateDb("admin1"); - Connection connection = context.createConnection(user, "password"); + Connection connection = context.createConnection(user); Statement statement = context.createStatement(connection); statement.execute("USE " + dbName); statement.execute("CREATE TABLE " + tableName + @@ -321,7 +321,7 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { .addGroupsToUser("user3", "group1") .write(context.getPolicyFile()); - Connection connection = context.createConnection("admin1", "password"); + Connection connection = context.createConnection("admin1"); Statement statement = connection.createStatement(); statement.execute("DROP DATABASE IF EXISTS db1 CASCADE"); statement.execute("CREATE DATABASE db1"); @@ -331,7 +331,7 @@ public class TestUserManagement extends AbstractTestWithStaticConfiguration { connection.close(); String[] users = { "user1", "user2", "user3" }; for (String user : users) { - connection = context.createConnection(user, "foo"); + connection = context.createConnection(user); statement = context.createStatement(connection); assertFalse("No results should be returned", statement.executeQuery("SHOW TABLES").next());
