Skip to content
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.

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

Don't escape config values #3728

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates.
* Copyright (c) 2020, 2021 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,12 +46,14 @@ public class MpConfigSourcesTest {
void testHelidonMap() {
Map<String, String> values = Map.of(
"key.first", "first",
"key.second", "second"
"key.second", "second",
"key.third", "<>{}().,:;/|\\~`?!@#$%^&*-=+*"
);
org.eclipse.microprofile.config.spi.ConfigSource mpSource = MpConfigSources.create(ConfigSources.create(values).build());

assertThat(mpSource.getValue("key.first"), is("first"));
assertThat(mpSource.getValue("key.second"), is("second"));
assertThat(mpSource.getValue("key.third"), is("<>{}().,:;/|\\~`?!@#$%^&*-=+*"));
}
@Test
void testHelidonParsable() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020 Oracle and/or its affiliates.
* Copyright (c) 2017, 2021 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -43,7 +43,7 @@ public static Map<String, String> flattenNodes(ConfigNode.ObjectNode objectNode)
.filter(e -> e.getValue() instanceof ValueNodeImpl)
.collect(Collectors.toMap(
e -> e.getKey().toString(),
e -> Config.Key.escapeName(((ValueNodeImpl) e.getValue()).get())
e -> ((ValueNodeImpl) e.getValue()).get()
));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public void testResolveTokenWithDottedValue() {

Config config = Config.builder()
.sources(ConfigSources.create(ConfigNode.ObjectNode.builder()
.addValue("domain", "oracle.com")
.addValue("domain", Config.Key.escapeName("oracle.com"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Value cannot be escaped.

.addValue("$domain.sso", "on")
.addValue(Config.Key.escapeName("seznam.cz") + ".sso", "off")
.build()))
Expand Down