mirrors/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-25 16:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove out-dated references to hostname v1 properties (#38255)

Browse Source 
closes: #38253

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins
2025-03-19 11:05:40 -04:00
committed by GitHub
parent 6bb33f20d0
commit 2aaf9ac008
4 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/ConstantsDebugHostname.java
View File

@@ -16,6 +16,10 @@
*/
package org.keycloak.quarkus.runtime.services.resources;
import org.keycloak.config.HostnameV2Options;
import org.keycloak.config.HttpOptions;
import org.keycloak.config.ProxyOptions;
public class ConstantsDebugHostname {
public static final String[] RELEVANT_HEADERS = new String[] {
"Host",
@@ -26,34 +30,16 @@ public class ConstantsDebugHostname {
"X-Forwarded-For"
};
public static final String[] RELEVANT_OPTIONS = {
"hostname",
"hostname-url",
"hostname-admin",
"hostname-admin-url",
"hostname-strict",
"hostname-strict-backchannel",
"hostname-strict-https",
"hostname-path",
"hostname-port",
"proxy",
"proxy-headers",
"http-enabled",
"http-relative-path",
"http-port",
"https-port"
};
public static final String[] RELEVANT_OPTIONS_V2 = {
"hostname",
"hostname-admin",
"hostname-backchannel-dynamic",
"hostname-strict",
"proxy-headers",
"http-enabled",
"http-relative-path",
"http-port",
"https-port"
HostnameV2Options.HOSTNAME.getKey(),
HostnameV2Options.HOSTNAME_ADMIN.getKey(),
HostnameV2Options.HOSTNAME_BACKCHANNEL_DYNAMIC.getKey(),
HostnameV2Options.HOSTNAME_STRICT.getKey(),
ProxyOptions.PROXY_HEADERS.getKey(),
HttpOptions.HTTP_ENABLED.getKey(),
HttpOptions.HTTP_RELATIVE_PATH.getKey(),
HttpOptions.HTTP_PORT.getKey(),
HttpOptions.HTTPS_PORT.getKey()
};
}

2
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/DebugHostnameSettingsResource.java
View File

@@ -62,7 +62,7 @@ public class DebugHostnameSettingsResource {
public DebugHostnameSettingsResource() {
this.allConfigPropertiesMap = new LinkedHashMap<>();
String[] relevantOptions = Profile.isFeatureEnabled(Profile.Feature.HOSTNAME_V2) ? ConstantsDebugHostname.RELEVANT_OPTIONS_V2 : ConstantsDebugHostname.RELEVANT_OPTIONS;
String[] relevantOptions = ConstantsDebugHostname.RELEVANT_OPTIONS_V2;
for (String key : relevantOptions) {
addOption(key);
}

2
quarkus/runtime/src/main/resources/META-INF/keycloak.conf
View File

@@ -4,7 +4,6 @@
# Default, and insecure, and non-production grade configuration for the development profile
%dev.http-enabled=true
%dev.hostname-strict=false
%dev.hostname-strict-https=false
%dev.cache=local
%dev.spi-theme-cache-themes=false
%dev.spi-theme-cache-templates=false
@@ -14,7 +13,6 @@
%nonserver.http-enabled=true
%nonserver.http-server-enabled=false
%nonserver.hostname-strict=false
%nonserver.hostname-strict-https=false
%nonserver.cache=local
#logging defaults

1
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/AbstractQuarkusDeployableContainer.java
View File

@@ -174,7 +174,6 @@ public abstract class AbstractQuarkusDeployableContainer implements DeployableCo
if (suiteContext.get().isAuthServerMigrationEnabled()) {
commands.add("--hostname-strict=false");
commands.add("--hostname-strict-https=false");
} else { // Do not set management port for older versions of Keycloak for migration tests - available since Keycloak 25
commands.add("--http-management-port=" + configuration.getManagementPort());
}