Skip to content

Commit 3d9f34c

Browse files
authored
[ES|QL] Escape backslashes last (#205680)
## Summary Closes elastic/kibana-team#1365 https://github.com/elastic/kibana/security/code-scanning/500 Moves backslash un-escaping last, after rall other un-escaping. ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The `release_note:breaking` label should be applied in these situations. - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed - [ ] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) ### Identify risks Does this PR introduce any risks? For example, consider risks like hard to test bugs, performance regression, potential of data loss. Describe the risk, its severity, and mitigation for each identified risk. Invite stakeholders and evaluate how to proceed before merging. - [ ] [See some risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) - [ ] ...
1 parent e96915a commit 3d9f34c

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

src/platform/packages/shared/kbn-esql-ast/src/parser/__tests__/literal.test.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,42 @@ describe('literal expression', () => {
116116
],
117117
});
118118
});
119+
120+
it('escape double-quote before backslash', () => {
121+
const text = `ROW "a\\"\\\\b", 1`;
122+
const { root } = parse(text);
123+
124+
expect(root.commands[0]).toMatchObject({
125+
type: 'command',
126+
args: [
127+
{
128+
type: 'literal',
129+
literalType: 'keyword',
130+
name: '"a\\"\\\\b"',
131+
valueUnquoted: 'a"\\b',
132+
},
133+
{},
134+
],
135+
});
136+
});
137+
138+
it('escape backslash before double-quote', () => {
139+
const text = `ROW "a\\\\\\"b", 1`;
140+
const { root } = parse(text);
141+
142+
expect(root.commands[0]).toMatchObject({
143+
type: 'command',
144+
args: [
145+
{
146+
type: 'literal',
147+
literalType: 'keyword',
148+
name: '"a\\\\\\"b"',
149+
valueUnquoted: 'a\\"b',
150+
},
151+
{},
152+
],
153+
});
154+
});
119155
});
120156

121157
describe('triple quoted', () => {

src/platform/packages/shared/kbn-esql-ast/src/parser/factories.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ export function createLiteralString(ctx: StringContext): ESQLLiteral {
127127

128128
if (!isTripleQuoted) {
129129
valueUnquoted = valueUnquoted
130-
.replace(/\\\\/g, '\\')
131130
.replace(/\\"/g, '"')
132131
.replace(/\\r/g, '\r')
133132
.replace(/\\n/g, '\n')
134-
.replace(/\\t/g, '\t');
133+
.replace(/\\t/g, '\t')
134+
.replace(/\\\\/g, '\\');
135135
}
136136

137137
return Builder.expression.literal.string(

0 commit comments

Comments
 (0)