Return-Path: X-Original-To: apmail-sentry-commits-archive@minotaur.apache.org Delivered-To: apmail-sentry-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2C7D718FFB for ; Tue, 23 Feb 2016 05:06:56 +0000 (UTC) Received: (qmail 61056 invoked by uid 500); 23 Feb 2016 05:06:56 -0000 Delivered-To: apmail-sentry-commits-archive@sentry.apache.org Received: (qmail 61013 invoked by uid 500); 23 Feb 2016 05:06:56 -0000 Mailing-List: contact commits-help@sentry.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sentry.incubator.apache.org Delivered-To: mailing list commits@sentry.incubator.apache.org Received: (qmail 61004 invoked by uid 99); 23 Feb 2016 05:06:56 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Feb 2016 05:06:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 993D8180A2E for ; Tue, 23 Feb 2016 05:06:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id O1fryicVH9ss for ; Tue, 23 Feb 2016 05:06:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 46BAF5FB6A for ; Tue, 23 Feb 2016 05:06:44 +0000 (UTC) Received: (qmail 60861 invoked by uid 99); 23 Feb 2016 05:06:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Feb 2016 05:06:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 516A4E0451; Tue, 23 Feb 2016 05:06:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sdp@apache.org To: commits@sentry.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-sentry git commit: SENTRY-1097: Fix compilation errors from SentryGenericPolicyProcessor (Dapeng Sun, reviewed by Hao Hao) Date: Tue, 23 Feb 2016 05:06:28 +0000 (UTC) Repository: incubator-sentry Updated Branches: refs/heads/master 59bbfdc79 -> cee623339 SENTRY-1097: Fix compilation errors from SentryGenericPolicyProcessor (Dapeng Sun, reviewed by Hao Hao) Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/cee62333 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/cee62333 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/cee62333 Branch: refs/heads/master Commit: cee62333935d8e85143a65b67e553e12e6867849 Parents: 59bbfdc Author: Sun Dapeng Authored: Tue Feb 23 13:04:15 2016 +0800 Committer: Sun Dapeng Committed: Tue Feb 23 13:04:48 2016 +0800 ---------------------------------------------------------------------- .../service/persistent/DelegateSentryStore.java | 4 ++-- .../service/thrift/SentryGenericPolicyProcessor.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/cee62333/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java index 34d3fea..1e497a0 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java @@ -436,8 +436,8 @@ public class DelegateSentryStore implements SentryStoreLayer { Preconditions.checkNotNull(component); Preconditions.checkNotNull(service); - component = toTrimedLower(component); - service = toTrimedLower(service); + component = toTrimmedLower(component); + service = toTrimmedLower(service); Set privileges = Sets.newHashSet(); PersistenceManager pm = null; http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/cee62333/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java index 69f275d..613f10f 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java @@ -606,8 +606,8 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. validateClientVersion(request.getProtocol_version()); Set groups = getRequestorGroups(conf, request.getRequestorUserName()); if (!inAdminGroups(groups)) { - Set roleNamesForGroups = toTrimedLower(store.getRolesByGroups(request.getComponent(), groups)); - if (!roleNamesForGroups.contains(toTrimedLower(request.getRoleName()))) { + Set roleNamesForGroups = toTrimmedLower(store.getRolesByGroups(request.getComponent(), groups)); + if (!roleNamesForGroups.contains(toTrimmedLower(request.getRoleName()))) { throw new SentryAccessDeniedException(ACCESS_DENIAL_MESSAGE + request.getRequestorUserName()); } } @@ -687,8 +687,8 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. // Disallow non-admin to lookup roles that they are not part of if (activeRoleSet != null && !activeRoleSet.isAll()) { - Set grantedRoles = toTrimedLower(store.getRolesByGroups(request.getComponent(), requestedGroups)); - Set activeRoleNames = toTrimedLower(activeRoleSet.getRoles()); + Set grantedRoles = toTrimmedLower(store.getRolesByGroups(request.getComponent(), requestedGroups)); + Set activeRoleNames = toTrimmedLower(activeRoleSet.getRoles()); for (String activeRole : activeRoleNames) { if (!grantedRoles.contains(activeRole)) { @@ -701,15 +701,15 @@ public class SentryGenericPolicyProcessor implements SentryGenericPolicyService. validActiveRoles.addAll(activeRoleSet.isAll() ? grantedRoles : Sets.intersection(activeRoleNames, grantedRoles)); } } else { - Set allRoles = toTrimedLower(store.getAllRoleNames()); - Set activeRoleNames = toTrimedLower(activeRoleSet.getRoles()); + Set allRoles = toTrimmedLower(store.getAllRoleNames()); + Set activeRoleNames = toTrimmedLower(activeRoleSet.getRoles()); // For admin, if requestedGroups are empty, valid active roles are intersection of active roles and all roles. // Otherwise, valid active roles are intersection of active roles and the roles of requestedGroups. if (requestedGroups == null || requestedGroups.isEmpty()) { validActiveRoles.addAll(activeRoleSet.isAll() ? allRoles : Sets.intersection(activeRoleNames, allRoles)); } else { - Set requestedRoles = toTrimedLower(store.getRolesByGroups(request.getComponent(), requestedGroups)); + Set requestedRoles = toTrimmedLower(store.getRolesByGroups(request.getComponent(), requestedGroups)); validActiveRoles.addAll(activeRoleSet.isAll() ? allRoles : Sets.intersection(activeRoleNames, requestedRoles)); } }