juergen 02/03/14 23:38:29
Modified: src/webdav/server/org/apache/slide/webdav/util
PropertyRetrieverImpl.java
Log:
fixed bug in showAcl method that occured in case of read-acl deny (Eckehard)
Revision Changes Path
1.6 +10 -14
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertyRetrieverImpl.java 13 Mar 2002 09:22:38 -0000 1.5
+++ PropertyRetrieverImpl.java 15 Mar 2002 07:38:29 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
1.5 2002/03/13 09:22:38 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/13 09:22:38 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
1.6 2002/03/15 07:38:29 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/15 07:38:29 $
*
* ====================================================================
*
@@ -134,7 +134,7 @@
* providing property information (<code>PropFindMethod</code>,
* <code>ReportMethod</code>) should use this class.
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -534,7 +534,11 @@
if( org.apache.slide.util.Configuration.useIntegratedSecurity() ) {
showSupportedPrivilegeSet(generatedXML);
showCurrentUserPrivilegeSet(object, generatedXML);
+ try {
showAcl(object, contextPath, generatedXML);
+ } catch (AccessDeniedException ade) {
+ } catch (ServiceAccessException sae){
+ }
showAclSemantics(generatedXML);
showPrincipalCollectionSet(contextPath, generatedXML);
}
@@ -1065,22 +1069,14 @@
*/
protected void showAcl(ObjectNode object, String contextPath, XMLPrinter
generatedXML) throws AccessDeniedException, ServiceAccessException {
- generatedXML.writeElement(null, DEFAULT_NAMESPACE, ACL, XMLPrinter.OPENING);
-
NamespaceConfig config = token.getNamespaceConfig();
// check read-acl permission
Security securityHelper = token.getSecurityHelper();
-// try {
+
securityHelper.checkCredentials(slideToken, object,
config.getReadPermissionsAction());
-// } catch (AccessDeniedException ade) {
-// // resp.sendError(WebdavStatus.SC_FORBIDDEN,
WebdavStatus.getStatusText(WebdavStatus.SC_FORBIDDEN));
-// throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
-// } catch (ServiceAccessException sae) {
-// // resp.sendError(WebdavStatus.SC_FORBIDDEN,
WebdavStatus.getStatusText(WebdavStatus.SC_FORBIDDEN));
-// throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
-// }
+ generatedXML.writeElement(null, DEFAULT_NAMESPACE, ACL, XMLPrinter.OPENING);
// read
String readObjectUri = config.getReadObjectAction().getUri();
String readRevisionMetadataUri =
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
