Skip to content

Fix pw_hash() on JRuby < 1.7.17 #446

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.

Sign up for GitHub

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

Merged
DavidS merged 1 commit into from
May 6, 2015
Merged

Fix pw_hash() on JRuby < 1.7.17 #446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/puppet/parser/functions/pw_hash.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
password = args[0]
return nil if password.nil? or password.empty?

salt = "$#{hash_type}$#{args[2]}"

# handle weak implementations of String#crypt
if 'test'.crypt('$1$1') != '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
# JRuby < 1.7.17
Expand All @@ -49,6 +51,6 @@
raise Puppet::ParseError, 'system does not support enhanced salts'
end
else
password.crypt("$#{hash_type}$#{args[2]}")
password.crypt(salt)
end
end
⚡