diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ceb3fc1c..25b940a11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,12 @@ Changes to prior versions can be found on the [Github release page](https://gith No changes yet. +## [1.19.2](https://github.com/cryptomator/cryptomator/releases/1.19.2) - 2026-03-20 + +### Security +* Cryptomamtor Hub Vaults: Additional patch for (#4179, [GHSA-34rf-rwr3-7g43](https://github.com/cryptomator/cryptomator/security/advisories/GHSA-34rf-rwr3-7g43)) + + ## [1.19.1](https://github.com/cryptomator/cryptomator/releases/1.19.1) - 2026-03-12 ### Security diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index 4fe637189..8a788e537 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -84,6 +84,9 @@ + + https://github.com/cryptomator/cryptomator/releases/1.19.2 + https://github.com/cryptomator/cryptomator/releases/1.19.1 diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java index 2201ed18d..18bdbfead 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java @@ -160,12 +160,11 @@ public class CheckHostTrustController implements FxController { } public static String getAuthority(URI uri) { - return switch (uri.getPort()) { - case -1 -> "%s://%s".formatted(uri.getScheme(), uri.getHost()); - case 80 -> "http://%s".formatted(uri.getHost()); - case 443 -> "https://%s".formatted(uri.getHost()); - default -> "%s://%s:%s".formatted(uri.getScheme(), uri.getHost(), uri.getPort()); - }; + if (uri.getPort() == -1) { + return "%s://%s".formatted(uri.getScheme(), uri.getHost()); + } else { + return "%s://%s:%s".formatted(uri.getScheme(), uri.getHost(), uri.getPort()); + } } //--- JavaFX property getter & setter diff --git a/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java b/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java index d6d104b7d..d6feefdb6 100644 --- a/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java +++ b/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java @@ -34,8 +34,8 @@ class CheckHostTrustControllerTest { "https://example.com/foo/bar, https://example.com", "https://example.com:8080, https://example.com:8080", "https://user@example.com:8080/foo/bar, https://example.com:8080", - "https://user@example.com:443/foo/bar, https://example.com", - "http://user@example.com:80/foo/bar?foo=bar, http://example.com", + "https://user@example.com:443/foo/bar, https://example.com:443", + "http://user@example.com:80/foo/bar?foo=bar, http://example.com:80", "http://user@example.com:8080/foo/bar?foo=bar, http://example.com:8080" }) void testGetAuthority(String input, String expected) {