Skip to content

Fixed 217 Log-explorer-query-crashed-when-type-something #398

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

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Fixed 217 Log-explorer-query-crashed-when-type-something #398

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 backend/src/main/java/com/park/utmstack/service/elasticsearch/SearchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private static void buildIsInFields(BoolQuery.Builder bool, FilterType filter) {
final String ctx = CLASSNAME + ".buildIsInFields";
try {
filter.validate();
String value = CustomStringEscapeUtil.opensearchQueryStringEscape(String.valueOf(filter.getValue()));
String value = CustomStringEscapeUtil.openSearchQueryStringEscap(String.valueOf(filter.getValue()));
bool.filter(f -> f.queryString(q -> q
.defaultField("*")
.query("*" + value + "*")));
Expand All @@ -242,7 +242,7 @@ private static void buildIsNotInFields(BoolQuery.Builder bool, FilterType filter
final String ctx = CLASSNAME + ".buildIsNotInFields";
try {
filter.validate();
String value = CustomStringEscapeUtil.opensearchQueryStringEscape(String.valueOf(filter.getValue()));
String value = CustomStringEscapeUtil.openSearchQueryStringEscap(String.valueOf(filter.getValue()));
bool.filter(f -> f.bool(b -> b.mustNot(n -> n.queryString(q -> q
.defaultField("*")
.query("*" + value + "*")))));
Expand Down
22 changes: 14 additions & 8 deletions backend/src/main/java/com/park/utmstack/util/CustomStringEscapeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@
import java.util.Map;

public class CustomStringEscapeUtil {
public static String opensearchQueryStringEscape(String str) {
final String[] chars = new String[] {"+", "-", "=", "&&", "||", "!", "(", ")", "{", "}", "[", "]", "^", "\"", "~", "*", "?", ":", "\\", "/"};
final Map<CharSequence, CharSequence> escapeCustomMap = new HashMap<>();
escapeCustomMap.put("<", "");
escapeCustomMap.put(">", "");
for (String s : chars)
escapeCustomMap.put(s, "\\\\" + s);
return new AggregateTranslator(new LookupTranslator(escapeCustomMap)).translate(str);

private static final String[] CHARS = new String[] {"+", "-", "=", "&&", "||", "!", "(", ")", "{", "}", "[", "]", "^", "\"", "~", "*", "?", ":", "\\", "/"};

private static final Map<CharSequence, CharSequence> ESCAPE_CUSTOM_MAP = new HashMap<>();

static {
ESCAPE_CUSTOM_MAP.put("<", "");
ESCAPE_CUSTOM_MAP.put(">", "");
for (String s : CHARS)
ESCAPE_CUSTOM_MAP.put(s, "\\" + s);
}

public static String openSearchQueryStringEscap(String str) {
return new AggregateTranslator(new LookupTranslator(ESCAPE_CUSTOM_MAP)).translate(str);
}
}