[Test] Adjust assertions ReloadSecureSettings test for FIPS jvm #66965
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ywangd
added
>test
|
Pinging @elastic/es-security (Team:Security) |
jkakavas
reviewed
Jan 5, 2021
| equalTo("Provided keystore password was incorrect"), | ||
| equalTo("Keystore has been corrupted or tampered with"))); | ||
| assertThat(ObjectPath.eval("reload_exception.type", node), equalTo("security_exception")); | ||
| if (inFipsJvm()) { |
There was a problem hiding this comment.
The "keystore is tampered with" is also thrown in fips, see #57050
There was a problem hiding this comment.
For this specific case, i.e. empty password, the error message should always be
Error generating an encryption key from the provided password because it is generated without even reading the keystore file as opposed to other error messages. With this being said, I like @tvernum's suggestion as well. So we are settled here.
tvernum
reviewed
Jan 5, 2021
...rch/password_protected_keystore/ReloadSecureSettingsWithPasswordProtectedKeystoreRestIT.java
Outdated
Show resolved
Hide resolved
…csearch/password_protected_keystore/ReloadSecureSettingsWithPasswordProtectedKeystoreRestIT.java Co-authored-by: Tim Vernum <[email protected]>
|
@albertzaharovits @BigPandaToo I added more people as reviewers since I wasn't sure who would be around to help it out. But I really just need one approval for this simple change. Given @tvernum has approved it, I am going to merge it without further delay. Thanks! |
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Jan 5, 2021
…tic#66965) When the JVM is configured to be in FIPS mode, the reload security settings API returns a different error message that is specific to FIPS when given an empty password. This PR adjust the assertions so that they are matched correspondingly. Co-authored-by: Tim Vernum <[email protected]>
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Jan 5, 2021
…tic#66965) When the JVM is configured to be in FIPS mode, the reload security settings API returns a different error message that is specific to FIPS when given an empty password. This PR adjust the assertions so that they are matched correspondingly. Co-authored-by: Tim Vernum <[email protected]>
ywangd
added a commit
that referenced
this pull request
Jan 5, 2021
…) (#66966) When the JVM is configured to be in FIPS mode, the reload security settings API returns a different error message that is specific to FIPS when given an empty password. This PR adjust the assertions so that they are matched correspondingly. Co-authored-by: Tim Vernum <[email protected]>
ywangd
added a commit
that referenced
this pull request
Jan 5, 2021
…) (#66967) When the JVM is configured to be in FIPS mode, the reload security settings API returns a different error message that is specific to FIPS when given an empty password. This PR adjust the assertions so that they are matched correspondingly. Co-authored-by: Tim Vernum <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the JVM is configured to be in FIPS mode, the reload security settings API returns a different error message that is specific to FIPS when given an empty password. This PR adjust the assertions so that they are matched correspondingly.
Resolves: #66880