Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

fix: quote regex input string #824

Merged
merged 1 commit into from
May 25, 2022
Merged

fix: quote regex input string #824

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
3 changes: 2 additions & 1 deletion ...ure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/GraphiQLController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Pattern;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -195,7 +196,7 @@ private String constructGraphQlEndpoint(
String contextPath, @RequestParam Map<String, String> params) {
String endpoint = graphiQLProperties.getEndpoint().getGraphql();
for (Map.Entry<String, String> param : params.entrySet()) {
endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());
endpoint = endpoint.replaceAll("\\{" + Pattern.quote(param.getKey()) + "}", param.getValue());
}
if (StringUtils.isNotBlank(contextPath) && !endpoint.startsWith(contextPath)) {
return contextPath + endpoint;
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerIndexHtmlTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringSubstitutor;
Expand Down Expand Up @@ -112,7 +113,7 @@ private String constructGraphQlEndpoint(
String contextPath, @RequestParam Map<String, String> params) {
String endpoint = voyagerConfiguration.getEndpoint();
for (Map.Entry<String, String> param : params.entrySet()) {
endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());
endpoint = endpoint.replaceAll("\\{" + Pattern.quote(param.getKey()) + "}", param.getValue());
}
if (StringUtils.isNotBlank(contextPath) && !endpoint.startsWith(contextPath)) {
return contextPath + endpoint;
Expand Down