Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Dashboard TLS Configuration Details Bug into release/1.15.x #23727

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #23726 to be assessed for backporting due to the inclusion of the label backport/1.15.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zofskeez
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


The TLS field of the configuration details section on the dashboard was not displaying accurately based on the configuration settings. Since the tls_disable default value is false, it doesn't need to be defined and could be missing from the configuration. In addition, when using TLS the tls_cert_file and tls_key_file values are required. I updated to check that tls_disable is either undefined or false and both file properties have value to determine if TLS is enabled.

The screen shot below is after the changes with the following config:

api_addr = "https://127.0.0.1:8200"
disable_mlock = true

listener "tcp" {
  address = "127.0.0.1:8200"
  tls_cert_file = "./certs/vault-cert.pem"
  tls_key_file = "./certs/vault-key.pem"
}

storage "inmem" {}

image

I also noticed when running a dev server that it was incorrectly reporting that TLS was Enabled which is now showing Disabled as expected.

image


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/ui/VAULT-20758/dashboard-tls/globally-proper-roughy branch from 1bfcfea to 21398ee Compare October 18, 2023 21:48
@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Oct 18, 2023
@github-actions
Copy link

CI Results:
Failures:

Test Type Package Test Logs
builtin/logical/pkiext/pkiext_binary Test_ACME view test results
builtin/logical/pkiext/pkiext_binary Test_ACME/group view test results
builtin/logical/pkiext/pkiext_binary Test_ACME/group/caddy_http view test results
builtin/logical/pkiext/pkiext_binary Test_ACME/group/caddy_http_eab view test results
builtin/logical/pkiext/pkiext_binary Test_ACME/group/caddy_tls-alpn view test results

@zofskeez zofskeez closed this Oct 19, 2023
@zofskeez zofskeez deleted the backport/ui/VAULT-20758/dashboard-tls/globally-proper-roughy branch October 19, 2023 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants