Author: enorman
Date: Sat Feb 27 18:32:52 2010
New Revision: 917006
URL: http://svn.apache.org/viewvc?rev=917006&view=rev
Log:
SLING-1411 Clarify how to un-set a privilege and fix the sample ACE edit script
from the launchpad.content bundle
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
sling/trunk/launchpad/content/src/main/resources/content/apps/sling/servlet/default/ace.html.esp
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java?rev=917006&r1=917005&r2=917006&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
Sat Feb 27 18:32:52 2010
@@ -132,7 +132,7 @@
grantedPrivilegeNames.add(privilegeName);
} else if
("denied".equals(parameterValue)) {
deniedPrivilegeNames.add(privilegeName);
- } else {
+ } else if
("none".equals(parameterValue)){
removedPrivilegeNames.add(privilegeName);
}
}
Modified:
sling/trunk/launchpad/content/src/main/resources/content/apps/sling/servlet/default/ace.html.esp
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/content/src/main/resources/content/apps/sling/servlet/default/ace.html.esp?rev=917006&r1=917005&r2=917006&view=diff
==============================================================================
---
sling/trunk/launchpad/content/src/main/resources/content/apps/sling/servlet/default/ace.html.esp
(original)
+++
sling/trunk/launchpad/content/src/main/resources/content/apps/sling/servlet/default/ace.html.esp
Sat Feb 27 18:32:52 2010
@@ -87,7 +87,7 @@
%>
<tr>
<td align="left" width="<%=isUser ? '70%' :
'55%'%>"><%=p.getName()%></td>
- <td align="center" width="15%"><input type="radio"
name="privilege@<%=p.getName()%>" value="" <%=granted.contains(p) ||
denied.contains(p) ? "" : "checked"%> /></td>
+ <td align="center" width="15%"><input type="radio"
name="privilege@<%=p.getName()%>" value="none" <%=granted.contains(p) ||
denied.contains(p) ? "" : "checked"%> /></td>
<td align="center" width="15%"><input type="radio"
name="privilege@<%=p.getName()%>" value="granted" <%=granted.contains(p) ?
"checked" : ""%> /></td>
<% if (isUser) { %>
<td align="center" width="15%"><input type="radio"
name="privilege@<%=p.getName()%>" value="denied" <%=denied.contains(p) ?
"checked" : ""%> /></td>
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java?rev=917006&r1=917005&r2=917006&view=diff
==============================================================================
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
Sat Feb 27 18:32:52 2010
@@ -78,6 +78,7 @@
postParams.add(new NameValuePair("principalId", testUserId));
postParams.add(new NameValuePair("privil...@jcr:read",
"granted"));
postParams.add(new NameValuePair("privil...@jcr:write",
"denied"));
+ postParams.add(new
NameValuePair("privil...@jcr:modifyAccessControl", "bogus")); //invalid value
should be ignored.
Credentials creds = new UsernamePasswordCredentials("admin",
"admin");
assertAuthenticatedPostStatus(creds, postUrl,
HttpServletResponse.SC_OK, postParams, null);
@@ -97,10 +98,12 @@
JSONArray grantedArray = aceObject.getJSONArray("granted");
assertNotNull(grantedArray);
+ assertEquals(1, grantedArray.length());
assertEquals("jcr:read", grantedArray.getString(0));
JSONArray deniedArray = aceObject.getJSONArray("denied");
assertNotNull(deniedArray);
+ assertEquals(1, deniedArray.length());
assertEquals("jcr:write", deniedArray.getString(0));
}
@@ -115,6 +118,7 @@
postParams.add(new NameValuePair("principalId", testGroupId));
postParams.add(new NameValuePair("privil...@jcr:read",
"granted"));
postParams.add(new NameValuePair("privil...@jcr:write",
"denied"));
+ postParams.add(new
NameValuePair("privil...@jcr:modifyAccessControl", "bogus")); //invalid value
should be ignored.
Credentials creds = new UsernamePasswordCredentials("admin",
"admin");
assertAuthenticatedPostStatus(creds, postUrl,
HttpServletResponse.SC_OK, postParams, null);
@@ -134,6 +138,7 @@
JSONArray grantedArray = aceObject.getJSONArray("granted");
assertNotNull(grantedArray);
+ assertEquals(1, grantedArray.length());
assertEquals("jcr:read", grantedArray.getString(0));
//denied rights are not applied for groups, so make sure it is
not there
