You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2016/03/11 12:17:39 UTC
svn commit: r1734534 -
/sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
Author: stefanegli
Date: Fri Mar 11 11:17:38 2016
New Revision: 1734534
URL: http://svn.apache.org/viewvc?rev=1734534&view=rev
Log:
SLING-5596 : Patch provided by Davide Giannella which adds a dav.protectedHandlers config with a default of AclRemoveHandler to the SlingDavExServlet - avoids having no config for the JCR ProtectedRemoveManager
Modified:
sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
Modified: sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java?rev=1734534&r1=1734533&r2=1734534&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java (original)
+++ sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java Fri Mar 11 11:17:38 2016
@@ -120,10 +120,22 @@ public class SlingDavExServlet extends J
*/
private ServiceRegistration dummyService;
+ /**
+ * Default value for the configuration {@link #PROP_PROTECTED_HANDLERS}
+ */
+ public static final String DEFAULT_PROTECTED_HANDLERS = "org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler";
+
+ /**
+ * defines the Protected handlers for the Jcr Remoting Servlet
+ */
+ @Property(value=DEFAULT_PROTECTED_HANDLERS)
+ public static final String PROP_PROTECTED_HANDLERS = "dav.protectedhandlers";
+
@Activate
protected void activate(final BundleContext bundleContext, final Map<String, ?> config) {
final String davRoot = OsgiUtil.toString(config.get(PROP_DAV_ROOT), DEFAULT_DAV_ROOT);
final boolean createAbsoluteUri = OsgiUtil.toBoolean(config.get(PROP_CREATE_ABSOLUTE_URI), DEFAULT_CREATE_ABSOLUTE_URI);
+ final String protectedHandlers = OsgiUtil.toString(config.get(PROP_PROTECTED_HANDLERS), DEFAULT_PROTECTED_HANDLERS);
final AuthHttpContext context = new AuthHttpContext(davRoot);
context.setAuthenticationSupport(authSupport);
@@ -139,6 +151,8 @@ public class SlingDavExServlet extends J
// disable CSRF checks for now (should be handled by Sling)
initProps.put(INIT_PARAM_CSRF_PROTECTION, CSRFUtil.DISABLED);
+
+ initProps.put(INIT_PARAM_PROTECTED_HANDLERS_CONFIG, protectedHandlers);
// register and handle registration failure
try {