Merge pull request #12845 from iterate-ch/bugfix/GH-12812

Workaround .NET assembly loading IKVM ServiceLoader interoperability screw-up
iterate-ch · Feb 3, 2022 · 78e810f · 78e810f
2 parents 8405814 + afdc7e7
commit 78e810f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs b/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs
@@ -17,7 +17,6 @@
 // 
 
 using ch.cyberduck.cli;
-using ch.cyberduck.core.preferences;
 using org.apache.commons.cli;
 using Console = System.Console;
 
@@ -32,6 +31,14 @@ public WindowsTerminal(TerminalPreferences defaults, Options options, CommandLin
 
         private static void Main(string[] args)
         {
+            // HACK Cyberduck.Cryptomator.dll includes cryptolib v2, which uses java ServiceLoader.
+            // Without this hack the ServiceLoader is incapable of finding org.cryptomator.cryptolib.api.v1.CryptorProviderImpl,
+            // which results in non-working state of ch.cyberduck.core.cryptomator.CryptoVault.
+            // This is a transient dependency coming from Cyberduck.Cryptomator through Cyberduck.Cli,
+            // which isn't used in duck. Thus crazy stuff happens, and we have to force-load Cyberduck.Cryptomator here.
+            // ref https://github.com/iterate-ch/cyberduck/issues/12812
+            _ = typeof(org.cryptomator.cryptolib.api.CryptorProvider);
+
             // set UTF-8 encoding, tested in mintty (cygwin, babun) and cmd.exe
             java.lang.System.setProperty("file.encoding", "UTF-8");
             Console.OutputEncoding = System.Text.Encoding.UTF8;

diff --git a/cli/src/main/csharp/duck.csproj b/cli/src/main/csharp/duck.csproj
@@ -15,7 +15,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <CyberduckReference Include="Core;Core.Native;Protocols;Cli" />
+        <CyberduckReference Include="Core;Core.Native;Protocols;Cli;Cryptomator" />
     </ItemGroup>
 
     <ItemGroup>