svn commit: r1885238 - in /jackrabbit/trunk: jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java

[re...@apache.org]

Author: reschke
Date: Thu Jan  7 10:31:01 2021
New Revision: 1885238

URL: http://svn.apache.org/viewvc?rev=1885238&view=rev
Log:
JCR-4663: webdav: check Content-Range on PUT

Added:
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java

Added: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java?rev=1885238&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java (added)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java Thu Jan  7 10:31:01 2021
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.webdav.server;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+
+/**
+ * Test cases for HTTP PUT method
+ */
+public class PutTest extends WebDAVTestBase {
+
+    public void testPutWithContentRange() throws IOException, ParseException {
+        String testUri = this.uri.toString() + (this.uri.toString().endsWith("/") ? "" : "/") + "testPutWithContentRange";
+        HttpPut put = new HttpPut(testUri);
+        put.addHeader("Content-Range", "bytes 0-5/6");
+        put.setEntity(new StringEntity("foobar"));
+        HttpResponse response = this.client.execute(put, this.context);
+        int status = response.getStatusLine().getStatusCode();
+        assertEquals(400, status);
+    }
+}

Propchange: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java?rev=1885238&r1=1885237&r2=1885238&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java Thu Jan  7 10:31:01 2021
@@ -690,6 +690,11 @@ abstract public class AbstractWebdavServ
     protected void doPut(WebdavRequest request, WebdavResponse response,
                          DavResource resource) throws IOException, DavException {
 
+        if (request.getHeader("Content-Range") != null) {
+            response.sendError(DavServletResponse.SC_BAD_REQUEST, "Content-Range in PUT request not supported");
+            return;
+        }
+
         DavResource parentResource = resource.getCollection();
         if (parentResource == null || !parentResource.exists()) {
             // parent does not exist