Refactors occurrences of admin:admin and remove integtest.sh #978

DarshitChanpura · 2023-12-15T22:15:41Z

Description

There were recent changes to security demo configuration setup which now requires a custom admin Password to be setup. This PR changes workflows that previously used admin as password.

Check List

Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

DarshitChanpura · 2023-12-15T22:16:58Z

This change should be backported to 2.x

derek-ho · 2023-12-18T15:32:34Z

@SuZhou-Joe @xluo-aws can you take a look at this PR and let us know what you think? Full context is that now install demo configuration requires a strong password to be set, instead of just default to admin:admin.

Hailong-am · 2023-12-18T15:57:34Z

.github/workflows/release-e2e-workflow-template-windows.yml

@@ -22,6 +22,8 @@ jobs:
      TERM: xterm
      # make Node run in ipv4 first so that cypress can detect 5601 port in CI environment
      NODE_OPTIONS: '--max-old-space-size=6144 --dns-result-order=ipv4first'
+      # 2.12 onwards security demo configuration require a custom admin password
+      OPENSEARCH_INTIAL_ADMIN_PASSWORD: 'myStrongPassword123!'


For curious, is this the new default password of admin user? or security plugin will honour env variable OPENSEARCH_INTIAL_ADMIN_PASSWORD

@derek-ho Same question here, could you clarify this?

typo here, reference: https://github.com/opensearch-project/security/blob/main/DEVELOPER_GUIDE.md?plain=1#L169

Suggested change

OPENSEARCH_INTIAL_ADMIN_PASSWORD: 'myStrongPassword123!'

OPENSEARCH_INITIAL_ADMIN_PASSWORD: 'myStrongPassword123!'

Thanks for the catch! And yes, when running the install demo config we will honor whatever you put as that variable.

SuZhou-Joe · 2023-12-19T00:45:45Z

.github/workflows/release-e2e-workflow-template-windows.yml

@@ -104,8 +106,8 @@ jobs:
          else
              echo "Keep Dashboards Security"
              bin/opensearch-dashboards.bat &
-              timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin:admin | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'
-              curl -sk localhost:5601/api/status -u admin:admin | jq
+              timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'


Suggested change

timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'

timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'

SuZhou-Joe · 2023-12-19T00:45:59Z

.github/workflows/release-e2e-workflow-template-windows.yml

-              timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin:admin | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'
-              curl -sk localhost:5601/api/status -u admin:admin | jq
+              timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'
+              curl -sk localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq


Suggested change

curl -sk localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq

curl -sk localhost:5601/api/status -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} | jq

SuZhou-Joe · 2023-12-19T00:46:19Z

.github/workflows/release-e2e-workflow-template.yml

@@ -61,8 +63,8 @@ jobs:
          else
              echo "Keep OpenSearch Security"
              ./opensearch-tar-install.sh &
-              timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin:admin -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
-              curl https://localhost:9200 -u admin:admin --insecure
+              timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'


Suggested change

timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

SuZhou-Joe · 2023-12-19T00:46:30Z

.github/workflows/release-e2e-workflow-template.yml

-              timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin:admin -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
-              curl https://localhost:9200 -u admin:admin --insecure
+              timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
+              curl https://localhost:9200 -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure


Suggested change

curl https://localhost:9200 -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure

curl https://localhost:9200 -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure

SuZhou-Joe · 2023-12-19T00:46:55Z

.github/workflows/release-e2e-workflow-template.yml

+              timeout 300 bash -c 'while [[ "$(curl -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'
+              curl http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure


Suggested change

timeout 300 bash -c 'while [[ "$(curl -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'

curl http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure

timeout 300 bash -c 'while [[ "$(curl -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'

curl http://localhost:5601/api/status -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure

SuZhou-Joe · 2023-12-19T00:47:13Z

.github/workflows/release-signoff-chrome.yml

@@ -29,7 +31,7 @@ jobs:
          tar -xzf opensearch-${{ env.VERSION }}-linux-x64.tar.gz
          cd opensearch-${{ env.VERSION }}/
          ./opensearch-tar-install.sh &
-          timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:admin -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
+          timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'


Suggested change

timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

SuZhou-Joe · 2023-12-19T00:47:24Z

.github/workflows/release-signoff-chromium-ad-only.yml

@@ -29,7 +31,7 @@ jobs:
          tar -xzf opensearch-${{ env.VERSION }}-linux-x64.tar.gz
          cd opensearch-${{ env.VERSION }}/
          ./opensearch-tar-install.sh &
-          timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:admin -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
+          timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'


Suggested change

timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

Hailong-am

please update all reference accordingly.

derek-ho · 2023-12-21T14:11:29Z

Closing this in favor of: https://github.com/opensearch-project/opensearch-dashboards-functional-test/pull/981/files, since Darshit is away on vacation

DarshitChanpura · 2024-01-02T15:38:07Z

Closing in favor of: https://github.com/opensearch-project/opensearch-dashboards-functional-test/pull/981/files

Addresses changes made to security demo config install tool

80a4a32

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

DarshitChanpura requested review from xluo-aws, Hailong-am, SuZhou-Joe, ruanyl, wanglam and raintygao as code owners December 15, 2023 22:15

DarshitChanpura mentioned this pull request Dec 15, 2023

[META] Update all instances of admin:admin across different repositories opensearch-project/security#3624

Closed

2 tasks

Hailong-am added the backport 2.x label Dec 18, 2023

Hailong-am reviewed Dec 18, 2023

View reviewed changes

SuZhou-Joe reviewed Dec 19, 2023

View reviewed changes

Hailong-am requested changes Dec 21, 2023

View reviewed changes

Hailong-am mentioned this pull request Dec 21, 2023

Remove instances of hard admin credentials #981

Merged

1 task

wanglam mentioned this pull request Dec 22, 2023

[v2.12.0] Ensure CI/documentation reflect changes to default admin credentials opensearch-project/ml-commons-dashboards#292

Closed

2 tasks

DarshitChanpura closed this Jan 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactors occurrences of admin:admin and remove integtest.sh #978

Refactors occurrences of admin:admin and remove integtest.sh #978

DarshitChanpura commented Dec 15, 2023

DarshitChanpura commented Dec 15, 2023

derek-ho commented Dec 18, 2023

Hailong-am Dec 18, 2023 •

edited

Loading

SuZhou-Joe Dec 19, 2023

Hailong-am Dec 21, 2023 •

edited

Loading

derek-ho Dec 21, 2023

SuZhou-Joe Dec 19, 2023

SuZhou-Joe Dec 19, 2023

SuZhou-Joe Dec 19, 2023

SuZhou-Joe Dec 19, 2023

SuZhou-Joe Dec 19, 2023

SuZhou-Joe Dec 19, 2023

SuZhou-Joe Dec 19, 2023

Hailong-am left a comment

derek-ho commented Dec 21, 2023 •

edited

Loading

DarshitChanpura commented Jan 2, 2024

	OPENSEARCH_INTIAL_ADMIN_PASSWORD: 'myStrongPassword123!'
	OPENSEARCH_INITIAL_ADMIN_PASSWORD: 'myStrongPassword123!'

	timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} \| jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'
	timeout 300 bash -c 'while [[ "$(curl -k http://localhost:5601/api/status -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} \| jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'

	curl -sk localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} \| jq
	curl -sk localhost:5601/api/status -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} \| jq

	timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
	timeout 900 bash -c 'while [[ "$(curl -o /dev/null -w ''%{http_code}'' -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

	curl https://localhost:9200 -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure
	curl https://localhost:9200 -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure

		timeout 300 bash -c 'while [[ "$(curl -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k http://localhost:5601/api/status \| jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'
		curl http://localhost:5601/api/status -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} --insecure

	timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'
	timeout 900 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.OPENSEARCH_INTIAL_ADMIN_PASSWORD }} -k https://localhost:9200)" != "200" ]]; do sleep 5; done'

Refactors occurrences of admin:admin and remove integtest.sh #978

Refactors occurrences of admin:admin and remove integtest.sh #978

Conversation

DarshitChanpura commented Dec 15, 2023

Description

Check List

DarshitChanpura commented Dec 15, 2023

derek-ho commented Dec 18, 2023

Hailong-am Dec 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hailong-am Dec 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hailong-am left a comment

Choose a reason for hiding this comment

derek-ho commented Dec 21, 2023 • edited Loading

DarshitChanpura commented Jan 2, 2024

Hailong-am Dec 18, 2023 •

edited

Loading

Hailong-am Dec 21, 2023 •

edited

Loading

derek-ho commented Dec 21, 2023 •

edited

Loading