Repository: incubator-sentry Updated Branches: refs/heads/master 439cd651a -> e8eb01203
SENTRY-279: Revert back using lowercase for uri label Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/e8eb0120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/e8eb0120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/e8eb0120 Branch: refs/heads/master Commit: e8eb0120339069c8add074e7e7919bc904fce8cb Parents: 439cd65 Author: Jarek Jarcec Cecho <[email protected]> Authored: Tue Jun 10 22:25:42 2014 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Tue Jun 10 22:26:09 2014 -0700 ---------------------------------------------------------------------- .../apache/sentry/provider/db/service/persistent/SentryStore.java | 2 +- .../sentry/provider/db/service/persistent/TestSentryStore.java | 2 +- .../java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/e8eb0120/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java index 707641e..91669d6 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java @@ -871,7 +871,7 @@ public class SentryStore { } } } else { - authorizable.add(KV_JOINER.join(AuthorizableType.URI.name(), + authorizable.add(KV_JOINER.join(AuthorizableType.URI.name().toLowerCase(), privilege.getURI())); } if (!Strings.nullToEmpty(privilege.getAction()).isEmpty() http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/e8eb0120/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java index b90d07d..35ba83a 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java @@ -134,7 +134,7 @@ public class TestSentryStore { sentryStore.listSentryPrivilegesForProvider(new HashSet<String>(Arrays.asList("group1")), thriftRoleSet, tSentryAuthorizable); assertTrue(privs.size()==1); - assertTrue(privs.contains("server=server1->URI=" + uri + "->action=ALL")); + assertTrue(privs.contains("server=server1->uri=" + uri + "->action=ALL")); } @Test http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/e8eb0120/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 2350586..a12c9c5 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 @@ -123,7 +123,7 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration { .addRolesToGroup(USERGROUP3, "db1_tab1_all", "data_read") .addPermissionsToRole("db1_all", "server=server1->db=" + dbName) .addPermissionsToRole("db1_tab1_all", "server=server1->db=" + dbName + "->table=" + tabName) - .addPermissionsToRole("data_read", "server=server1->URI=" + tabDir) + .addPermissionsToRole("data_read", "server=server1->uri=" + tabDir) .setUserGroupMapping(StaticUserGroup.getStaticMapping()); writePolicyFile(policyFile);
