Fix password_encryption for DBVERSION in server::role #1515
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
cruelsmith
requested review from
alexjfisher,
bastelfreak,
deric,
ekohl,
SimonHoenscheid,
smortex and
a team
as code owners
|
@cruelsmith can you add a unit test to ensure the logic correct now? |
bastelfreak
reviewed
Sep 11, 2023
| @@ -142,7 +142,7 @@ | |||
| $_hash = if $hash { | |||
| $hash | |||
| } elsif $connect_settings != undef and 'DBVERSION' in $connect_settings { | |||
| if (versioncmp($version, '14') >= 0) { 'scram-sha-256' } else { undef } | |||
| versioncmp($version, '14') ? { -1 => 'md5', default => 'scram-sha-256' } | |||
There was a problem hiding this comment.
derp, I missed that earlier :(
|
Added acceptance unit test that now works as wanted. Needed some test since i was not sure how to do it. The failing |
bastelfreak
approved these changes
Sep 12, 2023
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.
Summary
After #1512 the
postgresql::postgresql_password()must not default to 'md5' anymore which creates a edge case inpostgresql::server::role. WhenDBVERSIONin paramterconnect_settingsis set to a version before 14 and the global version is 14 or above, the usedhashparameter ofpostgresql::postgresql_password()will be set to undef instead of 'md5'.This PR fixes that edge case by setting the wanted hash type and do not relay anymore on the default hash type of
postgresql::postgresql_password()itself.Additional Context
Add any additional context about the problem here.
Related Issues (if any)
Fixes #1512
Checklist
puppet apply)