Skip to content

HHH-19738 mask out 'jakarta.persistence.jdbc.password' (6.6) #10818

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
merged 1 commit into from
Aug 26, 2025
Merged

HHH-19738 mask out 'jakarta.persistence.jdbc.password' (6.6) #10818

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ public final class Environment implements AvailableSettings {
InputStream stream = ConfigHelper.getResourceAsStream( "/hibernate.properties" );
try {
GLOBAL_PROPERTIES.load(stream);
LOG.propertiesLoaded( ConfigurationHelper.maskOut( GLOBAL_PROPERTIES, PASS ) );
LOG.propertiesLoaded( ConfigurationHelper.maskOut( GLOBAL_PROPERTIES,
PASS, JAKARTA_JDBC_PASSWORD, JPA_JDBC_PASSWORD ) );
}
catch (Exception e) {
LOG.unableToLoadProperties();
Expand All @@ -165,8 +166,8 @@ public final class Environment implements AvailableSettings {

try {
Properties systemProperties = System.getProperties();
// Must be thread-safe in case an application changes System properties during Hibernate initialization.
// See HHH-8383.
// Must be thread-safe in case an application changes System properties during Hibernate initialization.
// See HHH-8383.
synchronized (systemProperties) {
GLOBAL_PROPERTIES.putAll(systemProperties);
}
Expand Down
24 changes: 19 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,24 +262,38 @@ public static Map clone(Map<?,?> configurationValues) {


/**
* replace a property by a starred version
* Replace a property by a starred version
*
* @param props properties to check
* @param key property to mask
*
* @return cloned and masked properties
*/
public static Properties maskOut(Properties props, String key) {
Properties clone = ( Properties ) props.clone();
Properties clone = (Properties) props.clone();
if ( clone.get( key ) != null ) {
clone.setProperty( key, "****" );
}
return clone;
}




/**
* Replace properties by starred version
*
* @param props properties to check
* @param keys properties to mask
*
* @return cloned and masked properties
*/
public static Properties maskOut(Properties props, String... keys) {
Properties clone = (Properties) props.clone();
for ( String key : keys ) {
if ( clone.get( key ) != null ) {
clone.setProperty( key, "****" );
}
}
return clone;
}

/**
* Extract a property value by name from the given properties object.
Expand Down
Loading