Commit 193b15c

committed

HHH-19738 mask out 'jakarta.persistence.jdbc.password'

1 parent 3fc398c commit 193b15cCopy full SHA for 193b15c

File tree

+23

-8

lines changed

hibernate-core/src/main/java/org/hibernate
- cfg
  - Environment.java
- internal/util/config
  - ConfigurationHelper.java

+23

-8

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ public final class Environment implements AvailableSettings {`
`145`	`145`	`InputStream stream = ConfigHelper.getResourceAsStream( "/hibernate.properties" );`
`146`	`146`	`try {`
`147`	`147`	`GLOBAL_PROPERTIES.load(stream);`
`148`		`- LOG.propertiesLoaded( ConfigurationHelper.maskOut( GLOBAL_PROPERTIES, PASS ) );`
	`148`	`+ LOG.propertiesLoaded( ConfigurationHelper.maskOut( GLOBAL_PROPERTIES,`
	`149`	`+ PASS, JAKARTA_JDBC_PASSWORD, JPA_JDBC_PASSWORD ) );`
`149`	`150`	`}`
`150`	`151`	`catch (Exception e) {`
`151`	`152`	`LOG.unableToLoadProperties();`
`@@ -165,8 +166,8 @@ public final class Environment implements AvailableSettings {`
`165`	`166`
`166`	`167`	`try {`
`167`	`168`	`Properties systemProperties = System.getProperties();`
`168`		`- // Must be thread-safe in case an application changes System properties during Hibernate initialization.`
`169`		`- // See HHH-8383.`
	`169`	`+ // Must be thread-safe in case an application changes System properties during Hibernate initialization.`
	`170`	`+ // See HHH-8383.`
`170`	`171`	`synchronized (systemProperties) {`
`171`	`172`	`GLOBAL_PROPERTIES.putAll(systemProperties);`
`172`	`173`	`}`

Lines changed: 19 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,24 +262,38 @@ public static Map clone(Map<?,?> configurationValues) {`
`262`	`262`
`263`	`263`
`264`	`264`	`/**`
`265`		`- * replace a property by a starred version`
	`265`	`+ * Replace a property by a starred version`
`266`	`266`	`*`
`267`	`267`	`* @param props properties to check`
`268`	`268`	`* @param key property to mask`
`269`	`269`	`*`
`270`	`270`	`* @return cloned and masked properties`
`271`	`271`	`*/`
`272`	`272`	`public static Properties maskOut(Properties props, String key) {`
`273`		`- Properties clone = (Properties) props.clone();`
	`273`	`+ Properties clone = (Properties) props.clone();`
`274`	`274`	`if ( clone.get( key ) != null ) {`
`275`	`275`	`clone.setProperty( key, "****" );`
`276`	`276`	`}`
`277`	`277`	`return clone;`
`278`	`278`	`}`
`279`	`279`
`280`		`-`
`281`		`-`
`282`		`-`
	`280`	`+ /**`
	`281`	`+ * Replace properties by starred version`
	`282`	`+ *`
	`283`	`+ * @param props properties to check`
	`284`	`+ * @param keys properties to mask`
	`285`	`+ *`
	`286`	`+ * @return cloned and masked properties`
	`287`	`+ */`
	`288`	`+ public static Properties maskOut(Properties props, String... keys) {`
	`289`	`+ Properties clone = (Properties) props.clone();`
	`290`	`+ for ( String key : keys ) {`
	`291`	`+ if ( clone.get( key ) != null ) {`
	`292`	`+ clone.setProperty( key, "****" );`
	`293`	`+ }`
	`294`	`+ }`
	`295`	`+ return clone;`
	`296`	`+ }`
`283`	`297`
`284`	`298`	`/**`
`285`	`299`	`* Extract a property value by name from the given properties object.`

Comments

(0)