From 4261fbeea99fa3a0d34e0df4a87512e7a9061612 Mon Sep 17 00:00:00 2001
From: Diana Derevyankina <dziyana_dzeraviankina@epam.com>
Date: Mon, 21 Dec 2020 11:10:03 +0300
Subject: [PATCH] Rename validateObject function to ensureNoUnsafeProperties

---
 ...t.ts.snap => ensure_no_unsafe_properties.test.ts.snap} | 0
 ...object.test.ts => ensure_no_unsafe_properties.test.ts} | 8 ++++----
 ...{validate_object.ts => ensure_no_unsafe_properties.ts} | 2 +-
 packages/kbn-std/src/index.ts                             | 2 +-
 src/core/server/http/http_tools.ts                        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/kbn-std/src/__snapshots__/{validate_object.test.ts.snap => ensure_no_unsafe_properties.test.ts.snap} (100%)
 rename packages/kbn-std/src/{validate_object.test.ts => ensure_no_unsafe_properties.test.ts} (89%)
 rename packages/kbn-std/src/{validate_object.ts => ensure_no_unsafe_properties.ts} (97%)

diff --git a/packages/kbn-std/src/__snapshots__/validate_object.test.ts.snap b/packages/kbn-std/src/__snapshots__/ensure_no_unsafe_properties.test.ts.snap
similarity index 100%
rename from packages/kbn-std/src/__snapshots__/validate_object.test.ts.snap
rename to packages/kbn-std/src/__snapshots__/ensure_no_unsafe_properties.test.ts.snap
diff --git a/packages/kbn-std/src/validate_object.test.ts b/packages/kbn-std/src/ensure_no_unsafe_properties.test.ts
similarity index 89%
rename from packages/kbn-std/src/validate_object.test.ts
rename to packages/kbn-std/src/ensure_no_unsafe_properties.test.ts
index 23d6c4ae3b49f..c12626b8d777e 100644
--- a/packages/kbn-std/src/validate_object.test.ts
+++ b/packages/kbn-std/src/ensure_no_unsafe_properties.test.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { validateObject } from './validate_object';
+import { ensureNoUnsafeProperties } from './ensure_no_unsafe_properties';
 
 test(`fails on circular references`, () => {
   const foo: Record<string, any> = {};
   foo.myself = foo;
 
   expect(() =>
-    validateObject({
+    ensureNoUnsafeProperties({
       payload: foo,
     })
   ).toThrowErrorMatchingInlineSnapshot(`"circular reference detected"`);
@@ -57,7 +57,7 @@ test(`fails on circular references`, () => {
       [property]: value,
     };
     test(`can submit ${JSON.stringify(obj)}`, () => {
-      expect(() => validateObject(obj)).not.toThrowError();
+      expect(() => ensureNoUnsafeProperties(obj)).not.toThrowError();
     });
   });
 });
@@ -74,6 +74,6 @@ test(`fails on circular references`, () => {
   JSON.parse(`{ "foo": { "bar": { "constructor": { "prototype" : null } } } }`),
 ].forEach((value) => {
   test(`can't submit ${JSON.stringify(value)}`, () => {
-    expect(() => validateObject(value)).toThrowErrorMatchingSnapshot();
+    expect(() => ensureNoUnsafeProperties(value)).toThrowErrorMatchingSnapshot();
   });
 });
diff --git a/packages/kbn-std/src/validate_object.ts b/packages/kbn-std/src/ensure_no_unsafe_properties.ts
similarity index 97%
rename from packages/kbn-std/src/validate_object.ts
rename to packages/kbn-std/src/ensure_no_unsafe_properties.ts
index cab6ce295ce92..47cbea5ecf3ee 100644
--- a/packages/kbn-std/src/validate_object.ts
+++ b/packages/kbn-std/src/ensure_no_unsafe_properties.ts
@@ -31,7 +31,7 @@ const hasOwnProperty = (obj: any, property: string) =>
 const isObject = (obj: any) => typeof obj === 'object' && obj !== null;
 
 // we're using a stack instead of recursion so we aren't limited by the call stack
-export function validateObject(obj: any) {
+export function ensureNoUnsafeProperties(obj: any) {
   if (!isObject(obj)) {
     return;
   }
diff --git a/packages/kbn-std/src/index.ts b/packages/kbn-std/src/index.ts
index fb0d6e5db2bba..a5b5088f9105f 100644
--- a/packages/kbn-std/src/index.ts
+++ b/packages/kbn-std/src/index.ts
@@ -27,5 +27,5 @@ export { withTimeout } from './promise';
 export { isRelativeUrl, modifyUrl, getUrlOrigin, URLMeaningfulParts } from './url';
 export { unset } from './unset';
 export { getFlattenedObject } from './get_flattened_object';
-export { validateObject } from './validate_object';
+export { ensureNoUnsafeProperties } from './ensure_no_unsafe_properties';
 export * from './rxjs_7';
diff --git a/src/core/server/http/http_tools.ts b/src/core/server/http/http_tools.ts
index a215dd8e07375..f09f3dc2730a1 100644
--- a/src/core/server/http/http_tools.ts
+++ b/src/core/server/http/http_tools.ts
@@ -29,7 +29,7 @@ import Hoek from '@hapi/hoek';
 import type { ServerOptions as TLSOptions } from 'https';
 import type { ValidationError } from 'joi';
 import uuid from 'uuid';
-import { validateObject } from '@kbn/std';
+import { ensureNoUnsafeProperties } from '@kbn/std';
 import { HttpConfig } from './http_config';
 
 const corsAllowedHeaders = ['Accept', 'Authorization', 'Content-Type', 'If-None-Match', 'kbn-xsrf'];
@@ -69,7 +69,7 @@ export function getServerOptions(config: HttpConfig, { configureTLS = true } = {
         // This is a default payload validation which applies to all LP routes which do not specify their own
         // `validate.payload` handler, in order to reduce the likelyhood of prototype pollution vulnerabilities.
         // (All NP routes are already required to specify their own validation in order to access the payload)
-        payload: (value) => Promise.resolve(validateObject(value)),
+        payload: (value) => Promise.resolve(ensureNoUnsafeProperties(value)),
       },
     },
     state: {