From 819c56fe4c119aa7ecdc4e227654a7a0c796e22a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 22 Feb 2016 14:58:08 +0100 Subject: [PATCH] debugging WebDAV + Crypto + NIO --- .../frontend/webdav/NioWebDavServer.java | 18 +++++++++++++++++- main/ui/src/main/resources/log4j2.xml | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java index aa9ee9c09..b473bc48d 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java @@ -19,14 +19,30 @@ import java.nio.file.Paths; import java.util.Optional; import org.cryptomator.filesystem.FileSystem; +import org.cryptomator.filesystem.crypto.CryptoEngineTestModule; +import org.cryptomator.filesystem.crypto.CryptoFileSystemDelegate; +import org.cryptomator.filesystem.crypto.CryptoFileSystemTestComponent; +import org.cryptomator.filesystem.crypto.DaggerCryptoFileSystemTestComponent; import org.cryptomator.filesystem.nio.NioFileSystem; +import org.mockito.Mockito; public class NioWebDavServer { + private static final CryptoFileSystemTestComponent CRYPTO_FS_COMP = DaggerCryptoFileSystemTestComponent.builder().cryptoEngineModule(new CryptoEngineTestModule()).build(); private static final String PATH_TO_SERVE_PROPERTY = "pathToServe"; public static void main(String[] args) throws Exception { - new FileSystemWebDavServer(nioFileSystem()).run(); + new FileSystemWebDavServer(cryptoFileSystem()).run(); + } + + private static FileSystem cryptoFileSystem() { + FileSystem shorteningFileSystem = shorteningFileSystem(); + CRYPTO_FS_COMP.cryptoFileSystemFactory().initializeNew(shorteningFileSystem, "asd"); + return CRYPTO_FS_COMP.cryptoFileSystemFactory().unlockExisting(shorteningFileSystem, "asd", Mockito.mock(CryptoFileSystemDelegate.class)); + } + + private static FileSystem shorteningFileSystem() { + return CRYPTO_FS_COMP.shorteningFileSystemFactory().get(nioFileSystem()); } private static FileSystem nioFileSystem() { diff --git a/main/ui/src/main/resources/log4j2.xml b/main/ui/src/main/resources/log4j2.xml index 438896355..45a72cd96 100644 --- a/main/ui/src/main/resources/log4j2.xml +++ b/main/ui/src/main/resources/log4j2.xml @@ -27,6 +27,7 @@ +