mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

now really: fixed invalid URI during MOVE, if dest path contains special chars (like spaces)

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-02-22 11:37:37 +01:00
parent 7bc678d4dc
commit ac4a68649e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilter.java
View File

@@ -128,26 +128,25 @@ public class UriNormalizationFilter implements HttpFilter {
@Override
public String getHeader(String name) {
if ((METHOD_MOVE.equalsIgnoreCase(getMethod()) || METHOD_COPY.equalsIgnoreCase(getMethod())) && HEADER_DESTINATION.equalsIgnoreCase(name)) {
final String uri = URI.create(super.getHeader(name)).getRawPath();
return bestGuess(uri);
return bestGuess(URI.create(super.getHeader(name)));
} else {
return super.getHeader(name);
}
}
private String bestGuess(String uri) {
final String pathWithinContext = StringUtils.removeStart(uri, contextPath);
private String bestGuess(URI uri) {
final String pathWithinContext = StringUtils.removeStart(uri.getPath(), contextPath);
final ResourceType resourceType = resourceTypeChecker.typeOfResource(pathWithinContext);
switch (resourceType) {
case FILE:
return asFileUri(uri);
return asFileUri(uri.getRawPath());
case FOLDER:
return asFolderUri(uri);
return asFolderUri(uri.getRawPath());
default:
if (this.getRequestURI().endsWith("/")) {
return asFolderUri(uri);
return asFolderUri(uri.getRawPath());
} else {
return asFileUri(uri);
return asFileUri(uri.getRawPath());
}
}
}