KQL removes leading zero and breaks query (#62748) (#64400)

* KQL removes leading zero and breaks query * correctly parse numbers started from '.' Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
gaurav7830 · Apr 24, 2020 · 6d2097e · 6d2097e
1 parent 3c62a6f
commit 6d2097e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/src/plugins/data/common/es_query/kuery/ast/_generated_/kuery.js b/src/plugins/data/common/es_query/kuery/ast/_generated_/kuery.js
diff --git a/src/plugins/data/common/es_query/kuery/ast/ast.test.ts b/src/plugins/data/common/es_query/kuery/ast/ast.test.ts
@@ -278,6 +278,33 @@ describe('kuery AST API', () => {
       expect(fromLiteralExpression('true')).toEqual(booleanTrueLiteral);
       expect(fromLiteralExpression('false')).toEqual(booleanFalseLiteral);
       expect(fromLiteralExpression('42')).toEqual(numberLiteral);
+
+      expect(fromLiteralExpression('.3').value).toEqual(0.3);
+      expect(fromLiteralExpression('.36').value).toEqual(0.36);
+      expect(fromLiteralExpression('.00001').value).toEqual(0.00001);
+      expect(fromLiteralExpression('3').value).toEqual(3);
+      expect(fromLiteralExpression('-4').value).toEqual(-4);
+      expect(fromLiteralExpression('0').value).toEqual(0);
+      expect(fromLiteralExpression('0.0').value).toEqual(0);
+      expect(fromLiteralExpression('2.0').value).toEqual(2.0);
+      expect(fromLiteralExpression('0.8').value).toEqual(0.8);
+      expect(fromLiteralExpression('790.9').value).toEqual(790.9);
+      expect(fromLiteralExpression('0.0001').value).toEqual(0.0001);
+      expect(fromLiteralExpression('96565646732345').value).toEqual(96565646732345);
+
+      expect(fromLiteralExpression('..4').value).toEqual('..4');
+      expect(fromLiteralExpression('.3text').value).toEqual('.3text');
+      expect(fromLiteralExpression('text').value).toEqual('text');
+      expect(fromLiteralExpression('.').value).toEqual('.');
+      expect(fromLiteralExpression('-').value).toEqual('-');
+      expect(fromLiteralExpression('001').value).toEqual('001');
+      expect(fromLiteralExpression('00.2').value).toEqual('00.2');
+      expect(fromLiteralExpression('0.0.1').value).toEqual('0.0.1');
+      expect(fromLiteralExpression('3.').value).toEqual('3.');
+      expect(fromLiteralExpression('--4').value).toEqual('--4');
+      expect(fromLiteralExpression('-.4').value).toEqual('-.4');
+      expect(fromLiteralExpression('-0').value).toEqual('-0');
+      expect(fromLiteralExpression('00949').value).toEqual('00949');
     });
 
     test('should allow escaping of special characters with a backslash', () => {

diff --git a/src/plugins/data/common/es_query/kuery/ast/kuery.peg b/src/plugins/data/common/es_query/kuery/ast/kuery.peg
@@ -247,9 +247,8 @@ UnquotedLiteral
     if (sequence === 'true') return buildLiteralNode(true);
     if (sequence === 'false') return buildLiteralNode(false);
     if (chars.includes(wildcardSymbol)) return buildWildcardNode(sequence);
-    const number = Number(sequence);
-    const value = isNaN(number) ? sequence : number;
-    return buildLiteralNode(value);
+    const isNumberPattern = /^(-?[1-9]+\d*([.]\d+)?)$|^(-?0[.]\d*[1-9]+)$|^0$|^0.0$|^[.]\d{1,}$/
+    return buildLiteralNode(isNumberPattern.test(sequence) ? Number(sequence) : sequence);
   }
 
 UnquotedCharacter