[Backport 1.3] Preserve URL Hash for SAML based login with Tests

.github/workflows/integration-test.yml

@@ -2,19 +2,24 @@ name: Integration Tests
 
 on: [push, pull_request]
 
+env:
+  TEST_BROWSER_HEADLESS: 1
+  CI: 1
+
 jobs:
   tests:
     name: Run integration tests
     runs-on: ubuntu-latest
     steps:
       - name: Download OpenSearch Core
         run: |
-          wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.6/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-1.3.6-linux-x64.tar.gz
+          wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.4.0-linux-x64.tar.gz
           tar -xzf opensearch-*.tar.gz
           rm -f opensearch-*.tar.gz
 
       - name: Download OpenSearch Security Plugin
-        run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.6/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-1.3.6.0.zip
+        run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.4.0.0.zip
+
 
       - name: Run OpenSearch with plugin
         run: |
@@ -37,21 +42,21 @@ jobs:
           WORKDIR /opensearch/
           ENTRYPOINT /docker-host/os-ep.sh
           EOF
-          docker run -d -p 9200:9200 -p 9600:9600 -i opensearch-test:latest
+          docker run -d --network=host -i opensearch-test:latest
 
       - name: Checkout OpenSearch Dashboard
         uses: actions/checkout@v2
         with:
           path: OpenSearch-Dashboards
           repository: opensearch-project/OpenSearch-Dashboards
-          ref: '1.3'
+          ref: '2.x'
           fetch-depth: 0
-      
+
       - name: Create plugins dir
         run: |
           cd ./OpenSearch-Dashboards
           mkdir -p plugins
-      
+
       - name: Checkout OpenSearch Dashboard Security plugin
         uses: actions/checkout@v2
         with:
@@ -66,30 +71,30 @@ jobs:
       #   id: osd_version
       #   run: |
       #     echo "::set-output name=osd_version::$(jq -r '.opensearchDashboards.version' ./OpenSearch-Dashboards/plugins/security-dashboards-plugin/package.json)"
-      
+
       # - name: Check OpenSearch Dashboards release tag
       #   run: |
       #     cd ./OpenSearch-Dashboards
       #     git checkout tags/${{ steps.osd_version.outputs.osd_version }} -b v${{ steps.osd_version.outputs.osd_version }}
-      
+
       - name: Get node and yarn versions
         id: versions
         run: |
           echo "::set-output name=node_version::$(cat ./OpenSearch-Dashboards/.node-version)"
           echo "::set-output name=yarn_version::$(jq -r '.engines.yarn' ./OpenSearch-Dashboards/package.json)"
-      
+
       - name: Setup node
         uses: actions/setup-node@v1
         with:
           node-version: ${{ steps.versions.outputs.node_version }}
           registry-url: 'https://registry.npmjs.org'
-      
+
       - name: Install correct yarn version for OpenSearch Dashboards
         run: |
           npm uninstall -g yarn
           echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
           npm i -g yarn@${{ steps.versions.outputs.yarn_version }}
-      
+
       - name: Check OpenSearch Running
         continue-on-error: true
         run: curl -XGET https://localhost:9200 -u 'admin:admin' -k
@@ -98,7 +103,8 @@ jobs:
         run: |
           cd ./OpenSearch-Dashboards
           yarn osd bootstrap
-
+          node scripts/build_opensearch_dashboards_platform_plugins.js
+
       - name: Run integration tests
         run: |
           echo "check if opensearch is ready"

.github/workflows/unit-test.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           path: OpenSearch-Dashboards
           repository: opensearch-project/OpenSearch-Dashboards
-          ref: '1.x'
+          ref: 'main'
           fetch-depth: 0
       - name: Create plugins dir
         run: |
@@ -46,7 +46,7 @@ jobs:
         run: |
           npm uninstall -g yarn
           echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
-          npm i -g yarn@${{ steps.versions.outputs.yarn_version }}
+          npm i -g yarn@${{ steps.versions.outputs.yarn_version }} --ignore-engines
       - name: Bootstrap OpenSearch Dashboards
         run: |
           cd ./OpenSearch-Dashboards

DEVELOPER_GUIDE.md

@@ -28,6 +28,7 @@ plugins.security.allow_default_init_securityindex: true
 plugins.security.authcz.admin_dn:
 - CN=kirk,OU=client,O=client,L=test, C=de
 
+plugins.security.unsupported.restapi.allow_securityconfig_modification: true
 plugins.security.audit.type: internal_opensearch
 plugins.security.enable_snapshot_restore_privilege: true
 plugins.security.check_snapshot_restore_write_privileges: true
@@ -71,6 +72,8 @@ yarn build
 
 We should be able to run Dashboards now changing back to its base directory and running `yarn start`. Navigating to the URL given as console output (something like `http://localhost:5601/omf`) you should now be able to log in with user `admin` and password `admin`.
 
+To run selenium based integration tests, download and export the firefox web-driver to your PATH. Also, run `node scripts/build_opensearch_dashboards_platform_plugins.js` or `yarn start` before running the tests. This is essential to generate the bundles.
+
 ## Submitting Changes
 
 See [CONTRIBUTING](CONTRIBUTING.md).

package.json

@@ -15,20 +15,23 @@
     "build": "yarn plugin-helpers build && node build_tools/rename_zip.js",
     "start": "node ../../scripts/opensearch-dashboards --dev",
     "lint:es": "node ../../scripts/eslint",
-    "lint:sass": "node ../../scripts/sasslint",
-    "lint": "yarn run lint:es && yarn run lint:sass",
+    "lint": "yarn run lint:es && yarn run lint:style",
+    "pretest:jest_server": "node ./test/jest_integration/runIdpServer.js &",
     "test:jest_server": "node ./test/run_jest_tests.js --config ./test/jest.config.server.js",
     "test:jest_ui": "node ./test/run_jest_tests.js --config ./test/jest.config.ui.js"
   },
   "devDependencies": {
-    "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards", 
-    "typescript": "4.0.2",
+    "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
+    "@testing-library/react-hooks": "^7.0.2",
+    "@types/hapi__wreck": "^15.0.1",
     "gulp-rename": "2.0.0",
-    "@testing-library/react-hooks": "^3.4.1",
-    "@types/hapi__wreck": "^15.0.1"
+    "saml-idp": "^1.2.1",
+    "selenium-webdriver": "^4.0.0-alpha.7",
+    "selfsigned": "^2.0.1",
+    "typescript": "4.0.2"
   },
   "dependencies": {
-    "@hapi/wreck": "^15.0.2",
+    "@hapi/wreck": "^17.1.0",
     "@hapi/cryptiles": "5.0.0",
     "html-entities": "1.3.1"
   }

public/apps/account/account-nav-button.tsx

@@ -93,7 +93,11 @@ export function AccountNavButton(props: {
           <EuiListGroupItem
             color="subdued"
             key="tenant"
-            label={<EuiText size="xs">{resolveTenantName(props.tenant || '', username)}</EuiText>}
+            label={
+              <EuiText size="xs" id="tenantName">
+                {resolveTenantName(props.tenant || '', username)}
+              </EuiText>
+            }
           />
         </EuiFlexItem>
       </EuiFlexGroup>
@@ -140,7 +144,7 @@ export function AccountNavButton(props: {
     </div>
   );
   return (
-    <EuiHeaderSectionItemButton>
+    <EuiHeaderSectionItemButton id="user-icon-btn">
       <EuiPopover
         data-test-subj="account-popover"
         id="actionsMenu"

public/apps/account/test/__snapshots__/account-nav-button.test.tsx.snap

@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Account navigation button renders 1`] = `
-<EuiHeaderSectionItemButton>
+<EuiHeaderSectionItemButton
+  id="user-icon-btn"
+>
   <EuiPopover
     anchorPosition="downCenter"
     button={
@@ -16,7 +18,7 @@ exports[`Account navigation button renders 1`] = `
     id="actionsMenu"
     isOpen={false}
     onClick={[Function]}
-    ownFocus={false}
+    ownFocus={true}
     panelPaddingSize="s"
   >
     <EuiContextMenuPanel
@@ -63,6 +65,7 @@ exports[`Account navigation button renders 1`] = `
               key="tenant"
               label={
                 <EuiText
+                  id="tenantName"
                   size="xs"
                 >
                   tenant1