8000 16319 added quotes for start script config parameters by sschu · Pull Request #16339 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

16319 added quotes for start script config parameters #16339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sschu wants to merge 1 commit into from
Closed

16319 added quotes for start script config parameters #16339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions quarkus/dist/src/main/content/bin/kc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ do
if [[ "$1" = "start-dev" ]]; then
CONFIG_ARGS="$CONFIG_ARGS --profile=dev $1"
else
CONFIG_ARGS="$CONFIG_ARGS $1"
CONFIG_ARGS="$CONFIG_ARGS \"$1\""
fi
else
SERVER_OPTS="$SERVER_OPTS $1"
Expand Down Expand Up @@ -120,7 +120,7 @@ if [ "$PRINT_ENV" = "true" ]; then
echo "Using JAVA_RUN_OPTS: $JAVA_RUN_OPTS"
fi

if [[ (! $CONFIG_ARGS = *"--optimized"*) ]] && [[ ! "$CONFIG_ARGS" == " build"* ]] && [[ ! "$CONFIG_ARGS" == *"-h" ]] && [[ ! "$CONFIG_ARGS" == *"--help"* ]]; then
if [[ ! $CONFIG_ARGS = *"--optimized"* ]] && [[ ! $CONFIG_ARGS = " \"build"* ]] && [[ ! $CONFIG_ARGS = *"-h\"" ]] && [[ ! $CONFIG_ARGS = *"--help"* ]]; then
eval "'$JAVA'" -Dkc.config.build-and-exit=true $JAVA_RUN_OPTS
EXIT_CODE=$?
JAVA_RUN_OPTS="-Dkc.config.built=true $JAVA_RUN_OPTS"
Expand Down
5 changes: 5 additions & 0 deletions quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ default void assertError(String msg) {
() -> "The Error Output:\n " + getErrorOutput() + "\ndoesn't contains " + msg);
}

default void assertNoError(String msg) {
assertFalse(getErrorOutput().contains(msg),
() -> "The Error Output:\n " + getErrorOutput() + "\n contains the error " + msg);
}

default void assertHelp() {
try (NamedEnvironment env = KcNamerFactory.asWindowsOsSpecificTest()) {
Approvals.verify(getOutput());
Expand Down
2 change 8000 s: 1 addition & 1 deletion .../integration/src/test/java/org/keycloak/it/cli/dist/CustomLegacyUserProviderDistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class CustomLegacyUserProviderDistTest {

@Test
@TestProvider(CustomLegacyUserProvider.class)
@Launch({ "start-dev", "--spi-user-provider=custom_jpa --spi-user-jpa-enabled=false" })
@Launch({ "start-dev", "--spi-user-provider=custom_jpa", "--spi-user-jpa-enabled=false" })
void testUserManagedEntityNotAddedToDefaultPU(LaunchResult result) {
CLIResult cliResult = (CLIResult) result;
cliResult.assertMessage("KC-SERVICES0047: custom_jpa (com.acme.provider.legacy.jpa.user.MyUserProviderFactory) is implementing the internal SPI user. This SPI is internal and may change without notice");
Expand Down
4 changes: 2 additions & 2 deletions quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void testWinSetLastRootLevelIfMultipleSet(LaunchResult result) {

@Test
@EnabledOnOs(value = { OS.LINUX, OS.MAC }, disabledReason = "different shell escaping behaviour on Windows.")
@Launch({ "start-dev", "--log-console-format=\"%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1.}] %s%e%n\"" })
@Launch({ "start-dev", "--log-console-format=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1.}] %s%e%n" })
void testSetLogFormat(LaunchResult result) {
CLIResult cliResult = (CLIResult) result;
assertFalse(cliResult.getOutput().contains("(keycloak-cache-init)"));
Expand Down Expand Up @@ -160,7 +160,7 @@ void testWinKeycloakLogFileCreated(RawDistRootPath path) {

@Test
@EnabledOnOs(value = { OS.LINUX, OS.MAC }, disabledReason = "different shell escaping behaviour on Windows.")
@Launch({ "start-dev", "--log=console,file", "--log-file-format=\"%d{HH:mm:ss} %-5p [%c{1.}] (%t) %s%e%n\""})
@Launch({ "start-dev", "--log=console,file", "--log-file-format=%d{HH:mm:ss} %-5p [%c{1.}] (%t) %s%e%n"})
void testFileLoggingHasDifferentFormat(RawDistRootPath path) throws IOException {
Path logFilePath = Paths.get(path.getDistRootPath() + File.separator + LoggingOptions.DEFAULT_LOG_PATH);
File logFile = new File(logFilePath.toString());
Expand Down
7 changes: 7 additions & 0 deletions quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartCommandDistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,11 @@ void testStartUsingOptimizedDoesNotAllowBuildOptions(LaunchResult result) {
cliResult.assertError("Unknown option: '--cache'");
}

@Test
@Launch({ "start", "--optimized", "--hostname-strict=false", "--https-key-store-file=/tmp/te st.jks" })
void testStartParamWithBlank(LaunchResult result) {
CLIResult cliResult = (CLIResult) result;
cliResult.assertNoError("Option '--https-key-store-file' expects a single value (file)");
}

}
0