Skip to content

pw_hash: Use JVM-wide mutex to prevent race conditions #1461

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

Open
seqizz wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

pw_hash: Use JVM-wide mutex to prevent race conditions #1461

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
13 changes: 12 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 @@ -3,6 +3,10 @@
# Please note: This function is an implementation of a Ruby class and as such may not be entirely UTF8 compatible.
# To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
#

# Mutex for MRI Ruby - native crypt(3) is not thread-safe
PW_HASH_CRYPT_LOCK = Mutex.new unless RUBY_PLATFORM == 'java'

Puppet::Parser::Functions.newfunction(:pw_hash, type: :rvalue, arity: 3, doc: <<-DOC
@summary
Hashes a password using the crypt function. Provides a hash usable
Expand Down Expand Up @@ -79,8 +83,15 @@
if RUBY_PLATFORM == 'java' && !args[1].downcase.start_with?('bcrypt')
# puppetserver bundles Apache Commons Codec
org.apache.commons.codec.digest.Crypt.crypt(password.to_java_bytes, salt)
elsif RUBY_PLATFORM == 'java'
# JVM-wide lock for bcrypt on JRuby - crypt(3) uses static buffer, not thread-safe across workers
org.apache.commons.codec.digest.Crypt.java_class.synchronized do
raise Puppet::ParseError, 'system does not support enhanced salts' unless (+'test').crypt('$1$1') == '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
password.crypt(salt)
end
elsif (+'test').crypt('$1$1') == '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
password.crypt(salt)
# MRI Ruby with thread-safety mutex
PW_HASH_CRYPT_LOCK.synchronize { password.crypt(salt) }
else
# JRuby < 1.7.17
# MS Windows and other systems that don't support enhanced salts
Expand Down
Loading