Merge branch '7.x' into backport/7.x/pr-72020

src/dev/build/tasks/os_packages/package_scripts/post_install.sh

@@ -3,6 +3,22 @@ set -e
 
 export KBN_PATH_CONF=${KBN_PATH_CONF:-<%= configDir %>}
 
+set_chmod() {
+  chmod -f 660 ${KBN_PATH_CONF}/kibana.yml || true
+  chmod -f 2750 <%= dataDir %> || true
+  chmod -f 2750 ${KBN_PATH_CONF} || true
+}
+
+set_chown() {
+  chown -R <%= user %>:<%= group %> <%= dataDir %>
+  chown -R root:<%= group %> ${KBN_PATH_CONF}
+}
+
+set_access() {
+  set_chmod
+  set_chown
+}
+
 case $1 in
   # Debian
   configure)
@@ -14,6 +30,8 @@ case $1 in
       adduser --quiet --system --no-create-home --disabled-password \
       --ingroup "<%= group %>" --shell /bin/false "<%= user %>"
     fi
+
+    set_access
   ;;
   abort-deconfigure|abort-upgrade|abort-remove)
   ;;
@@ -28,20 +46,12 @@ case $1 in
       useradd -r -g "<%= group %>" -M -s /sbin/nologin \
       -c "kibana service user" "<%= user %>"
     fi
+
+    set_access
   ;;
 
   *)
       echo "post install script called with unknown argument \`$1'" >&2
       exit 1
   ;;
 esac
-
-chown -R <%= user %>:<%= group %> <%= dataDir %>
-chown -R <%= user %>:<%= group %> <%= optimizeDir %>
-chmod 2750 <%= dataDir %>
-chmod -R 2755 <%= dataDir %>/*
-
-chown :<%= group %> ${KBN_PATH_CONF}
-chown :<%= group %> ${KBN_PATH_CONF}/kibana.yml
-chmod 2750 ${KBN_PATH_CONF}
-chmod 660 ${KBN_PATH_CONF}/kibana.yml

x-pack/plugins/security_solution/cypress/fixtures/value_list.txt

@@ -0,0 +1,6 @@
+these
+are
+keywords
+for
+a
+list

x-pack/plugins/security_solution/cypress/integration/value_lists.spec.ts

@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
+import { DETECTIONS_URL } from '../urls/navigation';
+import {
+  waitForAlertsPanelToBeLoaded,
+  waitForAlertsIndexToBeCreated,
+  goToManageAlertsDetectionRules,
+} from '../tasks/alerts';
+import {
+  waitForListsIndexToBeCreated,
+  waitForValueListsModalToBeLoaded,
+  openValueListsModal,
+  selectValueListsFile,
+  uploadValueList,
+} from '../tasks/lists';
+import { VALUE_LISTS_TABLE, VALUE_LISTS_ROW } from '../screens/lists';
+
+describe('value lists', () => {
+  describe('management modal', () => {
+    it('creates a keyword list from an uploaded file', () => {
+      loginAndWaitForPageWithoutDateRange(DETECTIONS_URL);
+      waitForAlertsPanelToBeLoaded();
+      waitForAlertsIndexToBeCreated();
+      waitForListsIndexToBeCreated();
+      goToManageAlertsDetectionRules();
+      waitForValueListsModalToBeLoaded();
+      openValueListsModal();
+      selectValueListsFile();
+      uploadValueList();
+
+      cy.get(VALUE_LISTS_TABLE)
+        .find(VALUE_LISTS_ROW)
+        .should(($row) => {
+          expect($row.text()).to.contain('value_list.txt');
+        });
+    });
+  });
+});

x-pack/plugins/security_solution/cypress/screens/lists.ts

@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const VALUE_LISTS_MODAL_ACTIVATOR = '[data-test-subj="open-value-lists-modal-button"]';
+export const VALUE_LISTS_TABLE = '[data-test-subj="value-lists-table"]';
+export const VALUE_LISTS_ROW = '.euiTableRow';
+export const VALUE_LIST_FILE_PICKER = '[data-test-subj="value-list-file-picker"]';
+export const VALUE_LIST_FILE_UPLOAD_BUTTON = '[data-test-subj="value-lists-form-import-action"]';

x-pack/plugins/security_solution/cypress/support/commands.js

@@ -39,3 +39,22 @@ Cypress.Commands.add('stubSecurityApi', function (dataFileName) {
   cy.fixture(dataFileName).as(`${dataFileName}JSON`);
   cy.route('POST', 'api/solutions/security/graphql', `@${dataFileName}JSON`);
 });
+
+Cypress.Commands.add(
+  'attachFile',
+  {
+    prevSubject: 'element',
+  },
+  (input, fileName, fileType = 'text/plain') => {
+    cy.fixture(fileName)
+      .then((content) => Cypress.Blob.base64StringToBlob(content, fileType))
+      .then((blob) => {
+        const testFile = new File([blob], fileName, { type: fileType });
+        const dataTransfer = new DataTransfer();
+
+        dataTransfer.items.add(testFile);
+        input[0].files = dataTransfer.files;
+        return input;
+      });
+  }
+);

x-pack/plugins/security_solution/cypress/support/index.d.ts

@@ -7,5 +7,6 @@
 declare namespace Cypress {
   interface Chainable<Subject> {
     stubSecurityApi(dataFileName: string): Chainable<Subject>;
+    attachFile(fileName: string, fileType?: string): Chainable<JQuery>;
   }
 }

x-pack/plugins/security_solution/cypress/tasks/lists.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  VALUE_LISTS_MODAL_ACTIVATOR,
+  VALUE_LIST_FILE_PICKER,
+  VALUE_LIST_FILE_UPLOAD_BUTTON,
+} from '../screens/lists';
+
+export const waitForListsIndexToBeCreated = () => {
+  cy.request({ url: '/api/lists/index', retryOnStatusCodeFailure: true }).then((response) => {
+    if (response.status !== 200) {
+      cy.wait(7500);
+    }
+  });
+};
+
+export const waitForValueListsModalToBeLoaded = () => {
+  cy.get(VALUE_LISTS_MODAL_ACTIVATOR).should('exist');
+  cy.get(VALUE_LISTS_MODAL_ACTIVATOR).should('not.be.disabled');
+};
+
+export const openValueListsModal = () => {
+  cy.get(VALUE_LISTS_MODAL_ACTIVATOR).click();
+};
+
+export const selectValueListsFile = () => {
+  cy.get(VALUE_LIST_FILE_PICKER).attachFile('value_list.txt').trigger('change', { force: true });
+};
+
+export const uploadValueList = () => {
+  cy.get(VALUE_LIST_FILE_UPLOAD_BUTTON).click();
+};

x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/form.tsx

@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback, useState, ReactNode, useEffect, useRef } from 'react';
-import styled from 'styled-components';
+import React, { useCallback, useState, useEffect, useRef } from 'react';
 import {
   EuiButton,
   EuiButtonEmpty,
@@ -14,34 +13,30 @@ import {
   EuiFilePicker,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiRadioGroup,
+  EuiSelect,
+  EuiSelectOption,
 } from '@elastic/eui';
 
 import { useImportList, ListSchema, Type } from '../../../shared_imports';
 import * as i18n from './translations';
 import { useKibana } from '../../../common/lib/kibana';
 
-const InlineRadioGroup = styled(EuiRadioGroup)`
-  display: flex;
-
-  .euiRadioGroup__item + .euiRadioGroup__item {
-    margin: 0 0 0 12px;
-  }
-`;
-
-interface ListTypeOptions {
-  id: Type;
-  label: ReactNode;
-}
-
-const options: ListTypeOptions[] = [
+const options: EuiSelectOption[] = [
   {
-    id: 'keyword',
-    label: i18n.KEYWORDS_RADIO,
+    value: 'keyword',
+    text: i18n.KEYWORDS_RADIO,
   },
   {
-    id: 'ip',
-    label: i18n.IP_RADIO,
+    value: 'ip',
+    text: i18n.IP_RADIO,
+  },
+  {
+    value: 'ip_range',
+    text: i18n.IP_RANGE_RADIO,
+  },
+  {
+    value: 'text',
+    text: i18n.TEXT_RADIO,
   },
 ];
 
@@ -63,8 +58,10 @@ export const ValueListsFormComponent: React.FC<ValueListsFormProps> = ({ onError
 
   const fileIsValid = !file || validFileTypes.some((fileType) => file.type === fileType);
 
-  // EuiRadioGroup's onChange only infers 'string' from our options
-  const handleRadioChange = useCallback((t: string) => setType(t as Type), [setType]);
+  const handleRadioChange = useCallback(
+    (event: React.ChangeEvent<HTMLSelectElement>) => setType(event.target.value as Type),
+    [setType]
+  );
 
   const handleFileChange = useCallback((files: FileList | null) => {
     setFile(files?.item(0) ?? null);
@@ -133,6 +130,7 @@ export const ValueListsFormComponent: React.FC<ValueListsFormProps> = ({ onError
       >
         <EuiFilePicker
           accept={validFileTypes.join()}
+          data-test-subj="value-list-file-picker"
           id="value-list-file-picker"
           initialPromptText={i18n.FILE_PICKER_PROMPT}
           ref={filePickerRef}
@@ -146,16 +144,16 @@ export const ValueListsFormComponent: React.FC<ValueListsFormProps> = ({ onError
         <EuiFlexGroup>
           <EuiFlexItem>
             <EuiFormRow label={i18n.LIST_TYPES_RADIO_LABEL}>
-              <InlineRadioGroup
+              <EuiSelect
                 options={options}
-                idSelected={type}
+                value={type}
                 onChange={handleRadioChange}
                 name="valueListType"
               />
             </EuiFormRow>
           </EuiFlexItem>
           <EuiFlexItem>
-            <EuiFormRow>
+            <EuiFormRow hasEmptyLabelSpace={true}>
               <EuiFlexGroup alignItems="flexEnd">
                 <EuiFlexItem>
                   {importState.loading && (

x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/table.tsx

@@ -35,6 +35,7 @@ export const ValueListsTableComponent: React.FC<ValueListsTableProps> = ({
         <h2>{i18n.TABLE_TITLE}</h2>
       </EuiText>
       <EuiBasicTable
+        data-test-subj="value-lists-table"
         columns={columns}
         items={items}
         loading={loading}

x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/translations.ts

@@ -142,3 +142,17 @@ export const KEYWORDS_RADIO = i18n.translate(
     defaultMessage: 'Keywords',
   }
 );
+
+export const IP_RANGE_RADIO = i18n.translate(
+  'xpack.securitySolution.lists.valueListsForm.ipRangesRadioLabel',
+  {
+    defaultMessage: 'IP ranges',
+  }
+);
+
+export const TEXT_RADIO = i18n.translate(
+  'xpack.securitySolution.lists.valueListsForm.textRadioLabel',
+  {
+    defaultMessage: 'Text',
+  }
+);

x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx

@@ -205,6 +205,7 @@ const RulesPageComponent: React.FC = () => {
             )}
             <EuiFlexItem grow={false}>
               <EuiButton
+                data-test-subj="open-value-lists-modal-button"
                 iconType="importAction"
                 isDisabled={userHasNoPermissions(canUserCRUD) || loading}
                 onClick={showValueListsModal}

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts

@@ -12,6 +12,7 @@ import {
 import { ServerApiError } from '../../../../common/types';
 import { GetPolicyListResponse } from '../../policy/types';
 import { GetPackagesResponse } from '../../../../../../ingest_manager/common';
+import { HostState } from '../types';
 
 interface ServerReturnedHostList {
   type: 'serverReturnedHostList';
@@ -75,6 +76,11 @@ interface ServerReturnedEndpointPackageInfo {
   payload: GetPackagesResponse['response'][0];
 }
 
+interface ServerReturnedHostNonExistingPolicies {
+  type: 'serverReturnedHostNonExistingPolicies';
+  payload: HostState['nonExistingPolicies'];
+}
+
 export type HostAction =
   | ServerReturnedHostList
   | ServerFailedToReturnHostList
@@ -87,4 +93,5 @@ export type HostAction =
   | UserSelectedEndpointPolicy
   | ServerCancelledHostListLoading
   | ServerCancelledPolicyItemsLoading
-  | ServerReturnedEndpointPackageInfo;
+  | ServerReturnedEndpointPackageInfo
+  | ServerReturnedHostNonExistingPolicies;

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts

@@ -50,6 +50,7 @@ describe('HostList store concerns', () => {
         selectedPolicyId: undefined,
         policyItemsLoading: false,
         endpointPackageInfo: undefined,
+        nonExistingPolicies: {},
       });
     });