Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-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 C649B10141 for ; Thu, 3 Oct 2013 09:39:29 +0000 (UTC) Received: (qmail 42422 invoked by uid 500); 3 Oct 2013 09:39:29 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 42377 invoked by uid 500); 3 Oct 2013 09:39:27 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 42359 invoked by uid 99); 3 Oct 2013 09:39:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 09:39:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 09:39:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 314F8238883D; Thu, 3 Oct 2013 09:38:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528768 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerTest.java Date: Thu, 03 Oct 2013 09:38:59 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131003093859.314F8238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Thu Oct 3 09:38:58 2013 New Revision: 1528768 URL: http://svn.apache.org/r1528768 Log: OAK-1073 : PrivilegeManager#getPrivilege throws RepositoryException rather than AccessControlException Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java?rev=1528768&r1=1528767&r2=1528768&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java Thu Oct 3 09:38:58 2013 @@ -116,7 +116,11 @@ class PrivilegeManagerImpl implements Pr if (jcrName == null) { throw new AccessControlException("Invalid privilege name 'null'"); } - return namePathMapper.getOakName(jcrName); + String oakName = namePathMapper.getOakNameOrNull(jcrName); + if (oakName == null) { + throw new AccessControlException("Cannot resolve privilege name " + jcrName); + } + return oakName; } @Nonnull Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerTest.java?rev=1528768&r1=1528767&r2=1528768&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerTest.java Thu Oct 3 09:38:58 2013 @@ -64,7 +64,7 @@ public class PrivilegeManagerTest extend } assertTrue(set.isEmpty()); } - + @Test public void testGetPrivilege() throws RepositoryException { Set aggregatedPrivilegeNames = ImmutableSet.of("jcr:read", @@ -147,6 +147,16 @@ public class PrivilegeManagerTest extend } @Test + public void testGetPrivilegesFromInvalidName2() throws RepositoryException { + String nonExistingPrivilegeName = "{http://www.nonexisting.com/1.0}nonexisting"; + try{ + privilegeManager.getPrivilege(nonExistingPrivilegeName); + } catch(AccessControlException e){ + //expected + } + } + + @Test public void testGetPrivilegesFromEmptyNames() { try { privilegeManager.getPrivilege(""); @@ -167,4 +177,4 @@ public class PrivilegeManagerTest extend // OK } } -} \ No newline at end of file +}