Merge branch 'master' into test-telemetry-for-metrics-and-logs

package.json

@@ -87,6 +87,7 @@
     "**/@types/hoist-non-react-statics": "^3.3.1",
     "**/@types/chai": "^4.2.11",
     "**/cypress/@types/lodash": "^4.14.155",
+    "**/cypress/lodash": "^4.15.19",
     "**/typescript": "3.9.5",
     "**/graphql-toolkit/lodash": "^4.17.15",
     "**/hoist-non-react-statics": "^3.3.2",

src/plugins/data/common/field_formats/converters/url.ts

@@ -30,7 +30,7 @@ import {
 } from '../types';
 
 const templateMatchRE = /{{([\s\S]+?)}}/g;
-const whitelistUrlSchemes = ['http://', 'https://'];
+const allowedUrlSchemes = ['http://', 'https://'];
 
 const URL_TYPES = [
   {
@@ -161,7 +161,7 @@ export class UrlFormat extends FieldFormat {
 
         return this.generateImgHtml(url, imageLabel);
       default:
-        const inWhitelist = whitelistUrlSchemes.some((scheme) => url.indexOf(scheme) === 0);
+        const inWhitelist = allowedUrlSchemes.some((scheme) => url.indexOf(scheme) === 0);
         if (!inWhitelist && !parsedUrl) {
           return url;
         }

src/plugins/data/public/public.api.md

@@ -1991,7 +1991,7 @@ export const UI_SETTINGS: {
 // src/plugins/data/public/index.ts:393:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:394:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/index.ts:397:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
-// src/plugins/data/public/query/state_sync/connect_to_query_state.ts:40:60 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
+// src/plugins/data/public/query/state_sync/connect_to_query_state.ts:41:60 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:52:5 - (ae-forgotten-export) The symbol "createFiltersFromValueClickAction" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:53:5 - (ae-forgotten-export) The symbol "createFiltersFromRangeSelectAction" needs to be exported by the entry point index.d.ts
 // src/plugins/data/public/types.ts:61:5 - (ae-forgotten-export) The symbol "IndexPatternSelectProps" needs to be exported by the entry point index.d.ts

src/plugins/data/public/query/state_sync/connect_to_query_state.ts

@@ -24,6 +24,7 @@ import { BaseStateContainer } from '../../../../kibana_utils/public';
 import { QuerySetup, QueryStart } from '../query_service';
 import { QueryState, QueryStateChange } from './types';
 import { FilterStateStore, COMPARE_ALL_OPTIONS, compareFilters } from '../../../common';
+import { validateTimeRange } from '../timefilter';
 
 /**
  * Helper to setup two-way syncing of global data and a state container
@@ -159,9 +160,9 @@ export const connectToQueryState = <S extends QueryState>(
       // cloneDeep is required because services are mutating passed objects
       // and state in state container is frozen
       if (syncConfig.time) {
-        const time = state.time || timefilter.getTimeDefaults();
+        const time = validateTimeRange(state.time) ? state.time : timefilter.getTimeDefaults();
         if (!_.isEqual(time, timefilter.getTime())) {
-          timefilter.setTime(_.cloneDeep(time));
+          timefilter.setTime(_.cloneDeep(time!));
         }
       }
 

src/plugins/data/public/query/timefilter/index.ts

@@ -24,3 +24,4 @@ export { Timefilter, TimefilterContract } from './timefilter';
 export { TimeHistory, TimeHistoryContract } from './time_history';
 export { changeTimeFilter, convertRangeFilterToTimeRangeString } from './lib/change_time_filter';
 export { extractTimeFilter } from './lib/extract_time_filter';
+export { validateTimeRange } from './lib/validate_timerange';

src/legacy/core_plugins/kibana/public/__tests__/vis_type_table/legacy.ts → src/plugins/data/public/query/timefilter/lib/validate_timerange.test.ts

@@ -16,24 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { PluginInitializerContext } from 'kibana/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { npStart, npSetup } from 'ui/new_platform';
-import {
-  TableVisPlugin,
-  TablePluginSetupDependencies,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../plugins/vis_type_table/public/plugin';
 
-const plugins: Readonly<TablePluginSetupDependencies> = {
-  expressions: npSetup.plugins.expressions,
-  visualizations: npSetup.plugins.visualizations,
-};
+import { validateTimeRange } from './validate_timerange';
 
-const pluginInstance = new TableVisPlugin({} as PluginInitializerContext);
+describe('Validate timerange', () => {
+  test('Validate no range', () => {
+    const ok = validateTimeRange();
 
-export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core, {
-  data: npStart.plugins.data,
-  kibanaLegacy: npStart.plugins.kibanaLegacy,
+    expect(ok).toBe(false);
+  });
+  test('normal range', () => {
+    const ok = validateTimeRange({
+      to: 'now',
+      from: 'now-7d',
+    });
+
+    expect(ok).toBe(true);
+  });
+  test('bad from time', () => {
+    const ok = validateTimeRange({
+      to: 'nowa',
+      from: 'now-7d',
+    });
+
+    expect(ok).toBe(false);
+  });
+  test('bad to time', () => {
+    const ok = validateTimeRange({
+      to: 'now',
+      from: 'nowa-7d',
+    });
+
+    expect(ok).toBe(false);
+  });
 });

src/plugins/data/public/query/timefilter/lib/validate_timerange.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 dateMath from '@elastic/datemath';
+import { TimeRange } from '../../../../common';
+
+export function validateTimeRange(time?: TimeRange): boolean {
+  if (!time) return false;
+  const momentDateFrom = dateMath.parse(time.from);
+  const momentDateTo = dateMath.parse(time.to);
+  return !!(momentDateFrom && momentDateFrom.isValid() && momentDateTo && momentDateTo.isValid());
+}

src/plugins/kibana_utils/public/state_management/url/hash_unhash_url.test.ts

@@ -116,7 +116,7 @@ describe('hash unhash url', () => {
         expect(mockStorage.length).toBe(3);
       });
 
-      it('hashes only whitelisted properties', () => {
+      it('hashes only allow-listed properties', () => {
         const stateParamKey1 = '_g';
         const stateParamValue1 = '(yes:!t)';
         const stateParamKey2 = '_a';
@@ -227,7 +227,7 @@ describe('hash unhash url', () => {
         );
       });
 
-      it('unhashes only whitelisted properties', () => {
+      it('un-hashes only allow-listed properties', () => {
         const stateParamKey1 = '_g';
         const stateParamValueHashed1 = 'h@4e60e02';
         const state1 = { yes: true };

src/plugins/kibana_utils/public/state_management/url/hash_unhash_url.ts

@@ -35,7 +35,7 @@ export const hashUrl = createQueryReplacer(hashQuery);
 
 // naive hack, but this allows to decouple these utils from AppState, GlobalState for now
 // when removing AppState, GlobalState and migrating to IState containers,
-// need to make sure that apps explicitly passing this whitelist to hash
+// need to make sure that apps explicitly passing this allow-list to hash
 const __HACK_HARDCODED_LEGACY_HASHABLE_PARAMS = ['_g', '_a', '_s'];
 function createQueryMapper(queryParamMapper: (q: string) => string | null) {
   return (