Skip to content

Commit

Permalink
[ES|QL] Escape backslashes last (#205680)
Browse files Browse the repository at this point in the history
## 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)
- [ ] ...
  • Loading branch information
vadimkibana authored Jan 8, 2025
1 parent e96915a commit 3d9f34c
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,42 @@ describe('literal expression', () => {
],
});
});

it('escape double-quote before backslash', () => {
const text = `ROW "a\\"\\\\b", 1`;
const { root } = parse(text);

expect(root.commands[0]).toMatchObject({
type: 'command',
args: [
{
type: 'literal',
literalType: 'keyword',
name: '"a\\"\\\\b"',
valueUnquoted: 'a"\\b',
},
{},
],
});
});

it('escape backslash before double-quote', () => {
const text = `ROW "a\\\\\\"b", 1`;
const { root } = parse(text);

expect(root.commands[0]).toMatchObject({
type: 'command',
args: [
{
type: 'literal',
literalType: 'keyword',
name: '"a\\\\\\"b"',
valueUnquoted: 'a\\"b',
},
{},
],
});
});
});

describe('triple quoted', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ export function createLiteralString(ctx: StringContext): ESQLLiteral {

if (!isTripleQuoted) {
valueUnquoted = valueUnquoted
.replace(/\\\\/g, '\\')
.replace(/\\"/g, '"')
.replace(/\\r/g, '\r')
.replace(/\\n/g, '\n')
.replace(/\\t/g, '\t');
.replace(/\\t/g, '\t')
.replace(/\\\\/g, '\\');
}

return Builder.expression.literal.string(
Expand Down

0 comments on commit 3d9f34c

Please sign in to comment.