From 585f06b901d0756f4589650c738423da08312dcc Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Tue, 12 Nov 2019 12:32:12 +0100
Subject: [PATCH] Bugfix: Interpreter conversion of string to number should
 throw on NaN #27788 (#50063) (#50287)

---
 .../public/expression_types/number.ts         | 16 ++++++++++-
 .../expression_types/tests/number.test.ts     | 28 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/expressions/public/expression_types/tests/number.test.ts

diff --git a/src/plugins/expressions/public/expression_types/number.ts b/src/plugins/expressions/public/expression_types/number.ts
index 8434536f8f6b83..52b2bb1ff3194a 100644
--- a/src/plugins/expressions/public/expression_types/number.ts
+++ b/src/plugins/expressions/public/expression_types/number.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { i18n } from '@kbn/i18n';
 import { ExpressionType } from '../types';
 import { Datatable } from './datatable';
 import { Render } from './render';
@@ -28,7 +29,20 @@ export const number = (): ExpressionType<typeof name, number> => ({
   from: {
     null: () => 0,
     boolean: b => Number(b),
-    string: n => Number(n),
+    string: n => {
+      const value = Number(n);
+      if (Number.isNaN(value)) {
+        throw new Error(
+          i18n.translate('expressions_np.types.number.fromStringConversionErrorMessage', {
+            defaultMessage: 'Can\'t typecast "{string}" string to number',
+            values: {
+              string: n,
+            },
+          })
+        );
+      }
+      return value;
+    },
   },
   to: {
     render: (value: number): Render<{ text: string }> => {
diff --git a/src/plugins/expressions/public/expression_types/tests/number.test.ts b/src/plugins/expressions/public/expression_types/tests/number.test.ts
new file mode 100644
index 00000000000000..3336a1384ea797
--- /dev/null
+++ b/src/plugins/expressions/public/expression_types/tests/number.test.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { number } from '../number';
+
+describe('number', () => {
+  it('should fail when typecasting not numeric string to number', () => {
+    expect(() => number().from!.string('123test', {})).toThrowErrorMatchingInlineSnapshot(
+      `"Can't typecast \\"123test\\" string to number"`
+    );
+  });
+});