Merge branch 'profiling-fleet-support' of github.com:cauemarcondes/ki…

…bana into profiling-fleet-support
elastic · Apr 13, 2023 · 14d4035 · 14d4035
2 parents a0c4b63 + 721a365
commit 14d4035
Show file tree

Hide file tree

Showing 117 changed files with 2,360 additions and 1,426 deletions.
diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -131,8 +131,9 @@ const uploadPipeline = (pipelineContent: string | object) => {
     }
 
     if (
-      (await doAnyChangesMatch([/^x-pack\/plugins\/osquery/, /^x-pack\/test\/osquery_cypress/])) ||
-      GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+      ((await doAnyChangesMatch([/^x-pack\/plugins\/osquery/, /^x-pack\/test\/osquery_cypress/])) ||
+        GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
+      !GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/osquery_cypress.yml'));
     }

diff --git a/packages/kbn-apm-config-loader/src/utils/ensure_deep_object.ts b/packages/kbn-apm-config-loader/src/utils/ensure_deep_object.ts
diff --git a/packages/kbn-apm-config-loader/src/utils/read_config.ts b/packages/kbn-apm-config-loader/src/utils/read_config.ts
@@ -10,8 +10,8 @@ import { readFileSync } from 'fs';
 import { safeLoad } from 'js-yaml';
 
 import { set } from '@kbn/safer-lodash-set';
+import { ensureDeepObject } from '@kbn/std';
 import { isPlainObject } from 'lodash';
-import { ensureDeepObject } from './ensure_deep_object';
 
 const readYaml = (path: string) => {
   try {

diff --git a/packages/kbn-apm-config-loader/tsconfig.json b/packages/kbn-apm-config-loader/tsconfig.json
@@ -14,6 +14,7 @@
     "@kbn/safer-lodash-set",
     "@kbn/utils",
     "@kbn/config-schema",
+    "@kbn/std",
   ],
   "exclude": [
     "target/**/*",

diff --git a/packages/kbn-config/src/__fixtures__/forbidden_1.yml b/packages/kbn-config/src/__fixtures__/forbidden_1.yml
@@ -0,0 +1,5 @@
+test: {
+  "aaa['__proto__.hello']": "Hello",
+  "aaa['__proto__.nested.there']": "There",
+  "aaa['__proto__.nested.here']": "This JS syntax is apparently valid for our parser"
+}
diff --git a/packages/kbn-config/src/__fixtures__/forbidden_2.yml b/packages/kbn-config/src/__fixtures__/forbidden_2.yml
@@ -0,0 +1,3 @@
+test:
+  hello:
+    '__proto__.dolly': "Well hello there"
diff --git a/packages/kbn-config/src/raw/ensure_deep_object.test.ts b/packages/kbn-config/src/raw/ensure_deep_object.test.ts
diff --git a/packages/kbn-config/src/raw/ensure_deep_object.ts b/packages/kbn-config/src/raw/ensure_deep_object.ts
diff --git a/packages/kbn-config/src/raw/read_config.test.ts b/packages/kbn-config/src/raw/read_config.test.ts
@@ -47,6 +47,18 @@ test('should throw an exception when referenced environment variable in a config
   ).toThrowErrorMatchingSnapshot();
 });
 
+test('throws parsing a config with forbidden paths', () => {
+  expect(() =>
+    getConfigFromFiles([fixtureFile('forbidden_1.yml')])
+  ).toThrowErrorMatchingInlineSnapshot(`"Forbidden path detected: test.aaa.__proto__.hello"`);
+});
+
+test('throws parsing another config with forbidden paths', () => {
+  expect(() =>
+    getConfigFromFiles([fixtureFile('forbidden_2.yml')])
+  ).toThrowErrorMatchingInlineSnapshot(`"Forbidden path detected: test.hello.__proto__"`);
+});
+
 describe('different cwd()', () => {
   const originalCwd = process.cwd();
   const tempCwd = resolve(__dirname);

diff --git a/packages/kbn-config/src/raw/read_config.ts b/packages/kbn-config/src/raw/read_config.ts
@@ -11,7 +11,7 @@ import { safeLoad } from 'js-yaml';
 
 import { set } from '@kbn/safer-lodash-set';
 import { isPlainObject } from 'lodash';
-import { ensureDeepObject } from './ensure_deep_object';
+import { ensureDeepObject } from '@kbn/std';
 
 const readYaml = (path: string) => safeLoad(readFileSync(path, 'utf8'));
 

diff --git a/packages/kbn-std/index.ts b/packages/kbn-std/index.ts
@@ -27,4 +27,5 @@ export {
   asyncForEach,
   asyncForEachWithLimit,
 } from './src/iteration';
+export { ensureDeepObject } from './src/ensure_deep_object';
 export { Semaphore } from './src/semaphore';