mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-24 05:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify port/scheme check

Browse Source
This commit is contained in:
Sebastian Stenzel
2026-03-19 16:27:09 +01:00
parent 4be327608a
commit 6c2865a09d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java
View File

@@ -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

4
src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java
View File

@@ -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) {