libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

fix: validate that a full hostname url is expected (#33348)

Browse source 
closes: #33347

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2024-09-27 09:57:14 -04:00 committed by GitHub
parent b9d0977628
commit 9064d5159a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/src/main/java/org/keycloak/url/HostnameV2ProviderFactory.java
View file

@ -63,6 +63,10 @@ public class HostnameV2ProviderFactory implements HostnameProviderFactory, Envir
Optional.ofNullable(config.get("hostname-admin")).ifPresent(h -> Optional.ofNullable(config.get("hostname-admin")).ifPresent(h ->
adminUrl = validateAndCreateUri(h, "Provided hostname-admin is not a valid URL")); adminUrl = validateAndCreateUri(h, "Provided hostname-admin is not a valid URL"));
if (adminUrl != null && hostnameUrl == null) {
throw new IllegalArgumentException("hostname must be set to a URL when hostname-admin is set");
}
// Dynamic backchannel requires hostname to be specified as full URL. Otherwise we might end up with some parts of the // Dynamic backchannel requires hostname to be specified as full URL. Otherwise we might end up with some parts of the
// backend request in frontend URLs. Therefore frontend (and admin) needs to be fully static. // backend request in frontend URLs. Therefore frontend (and admin) needs to be fully static.
backchannelDynamic = config.getBoolean("hostname-backchannel-dynamic", false); backchannelDynamic = config.getBoolean("hostname-backchannel-dynamic", false);

12
services/src/test/java/org/keycloak/url/HostnameV2ProviderFactoryTest.java
View file

@ -17,7 +17,9 @@
package org.keycloak.url; package org.keycloak.url;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
@ -47,6 +49,16 @@ public class HostnameV2ProviderFactoryTest {
assertHostname("192.196.0.5555", false); assertHostname("192.196.0.5555", false);
} }
@Test
public void hostnameUrlExpected() throws IOException {
Map<String, String> values = new HashMap<>();
values.put("hostname", "short");
values.put("hostname-admin", "https://other");
HostnameV2ProviderFactory factory = new HostnameV2ProviderFactory();
assertEquals("hostname must be set to a URL when hostname-admin is set",
assertThrows(IllegalArgumentException.class, () -> factory.init(ScopeUtil.createScope(values))).getMessage());
}
private void assertHostname(String hostname, boolean valid) { private void assertHostname(String hostname, boolean valid) {
Map<String, String> values = new HashMap<>(); Map<String, String> values = new HashMap<>();
values.put("hostname", hostname); values.put("hostname", hostname);