mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-19 22:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- report authentication error on the UI

Browse Source 
- reduced visibility of some classes
This commit is contained in:
Sebastian Stenzel
2016-02-18 16:39:34 +01:00
parent 5a84228678
commit b85a110a24
10 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.google.common.io.ByteStreams;
*
* @see {@link https://tools.ietf.org/html/rfc7233#section-4}
*/
public class DavFileWithRange extends DavFile {
class DavFileWithRange extends DavFile {
private final Pair<String, String> requestRange;
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithUnsatisfiableRange.java
+1 -1
View File
@@ -19,7 +19,7 @@ import com.google.common.io.ByteStreams;
*
* @see {@link https://tools.ietf.org/html/rfc7233#section-4.2}
*/
public class DavFileWithUnsatisfiableRange extends DavFile {
class DavFileWithUnsatisfiableRange extends DavFile {
public DavFileWithUnsatisfiableRange(FilesystemResourceFactory factory, LockManager lockManager, DavSession session, FileLocator node) throws DavException {
super(factory, lockManager, session, node);
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLock.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.apache.jackrabbit.webdav.lock.LockInfo;
import org.apache.jackrabbit.webdav.lock.Scope;
import org.apache.jackrabbit.webdav.lock.Type;
public class ExclusiveSharedLock extends AbstractActiveLock {
class ExclusiveSharedLock extends AbstractActiveLock {
private final String token;
private final Type type;
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.webdav.lock.Type;
import org.cryptomator.filesystem.jackrabbit.FileSystemResourceLocator;
import org.cryptomator.filesystem.jackrabbit.FolderLocator;
public class ExclusiveSharedLockManager implements LockManager {
class ExclusiveSharedLockManager implements LockManager {
private final ConcurrentMap<FileSystemResourceLocator, Map<String, ActiveLock>> lockedResources = new ConcurrentHashMap<>();
main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/WebDavServlet.java
+7 -10
View File
@@ -27,7 +27,6 @@ import org.apache.jackrabbit.webdav.lock.Type;
import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet;
import org.cryptomator.filesystem.Folder;
import org.cryptomator.filesystem.jackrabbit.FileSystemResourceLocatorFactory;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.io.EofException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,16 +86,14 @@ public class WebDavServlet extends AbstractWebdavServlet {
@Override
protected void doGet(WebdavRequest request, WebdavResponse response, DavResource resource) throws IOException, DavException {
if (request.getHeader(HttpHeader.RANGE.asString()) != null) {
try {
super.doGet(request, response, resource);
} catch (EofException e) {
if (LOG.isDebugEnabled()) {
LOG.trace("Unexpected end of stream during delivery of partial content (client hung up).");
}
}
} else {
try {
super.doGet(request, response, resource);
} catch (EofException e) {
// Jetty EOF (other than IO EOF) is thrown when the connection is closed by the client.
// If the client is no longer interested in further content, we don't care.
if (LOG.isDebugEnabled()) {
LOG.trace("Unexpected end of stream during GET (client hung up).");
}
}
}
main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/InMemoryWebDavServer.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class InMemoryWebDavServer {
server.setPort(8080);
server.start();
FileSystem fileSystem = inMemoryFileSystem();
FileSystem fileSystem = cryptoFileSystem();
ServletContextHandler servlet = server.addServlet(fileSystem, URI.create("http://localhost:8080/foo"));
servlet.addFilter(LoggingHttpFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
servlet.start();