mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-25 06:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct answer to well-formed but still unsatisfiable range request

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-02-20 14:34:11 +01:00
parent 7f313772e5
commit 382c3a0258
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
View File

@@ -9,6 +9,7 @@ import java.util.Objects;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.DavSession;
import org.apache.jackrabbit.webdav.io.OutputContext;
import org.apache.jackrabbit.webdav.lock.LockManager;
@@ -41,9 +42,10 @@ class DavFileWithRange extends DavFile {
try (ReadableFile src = node.openReadable(); OutputStream out = outputContext.getOutputStream()) {
final long contentLength = src.size();
final Pair<Long, Long> range = getEffectiveRange(contentLength);
assert range.getLeft() >= 0;
assert range.getLeft() <= range.getRight();
assert range.getRight() <= contentLength;
if (range.getLeft() < 0 || range.getLeft() > range.getRight() || range.getRight() > contentLength) {
outputContext.setProperty(HttpHeader.CONTENT_RANGE.asString(), "bytes */" + contentLength);
throw new UncheckedDavException(DavServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE, "Valid Range would be in [0, " + contentLength + "]");
}
final Long rangeLength = range.getRight() - range.getLeft() + 1;
outputContext.setContentLength(rangeLength);
outputContext.setProperty(HttpHeader.CONTENT_RANGE.asString(), contentRangeResponseHeader(range.getLeft(), range.getRight(), contentLength));

13
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/WebDavServlet.java
View File

@@ -11,6 +11,8 @@ package org.cryptomator.frontend.webdav.jackrabbitservlet;
import java.io.IOException;
import java.net.URI;
import javax.servlet.ServletException;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavLocatorFactory;
@@ -82,6 +84,17 @@ public class WebDavServlet extends AbstractWebdavServlet {
throw new UnsupportedOperationException("Setting resourceFactory not supported.");
}
/* Unchecked DAV exception rewrapping */
@Override
protected boolean execute(WebdavRequest request, WebdavResponse response, int method, DavResource resource) throws ServletException, IOException, DavException {
try {
return super.execute(request, response, method, resource);
} catch (UncheckedDavException e) {
throw e.toDavException();
}
}
/* GET stuff */
@Override