inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACE-2919 - ACE-2836 Not all properties can be used when they were encrypted by the Encrypted Properties Management tool

Browse Source 
- made encrypted properties work with subsystems.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@91072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-11-25 15:30:10 +00:00
parent 2012116cf9
commit 444ed8ff23
4 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
View File

@@ -86,6 +86,9 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
/** Property defaults provided by the installer or System properties. */
private Properties propertyDefaults;
/** Property defaults provided by the JASYPT decryptor. */
private Properties encryptedPropertyDefaults;
/** Resolves placeholders in the property defaults. */
private DefaultResolver defaultResolver = new DefaultResolver();
@@ -222,6 +225,12 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
{
this.propertyDefaults = propertyDefaults;
}
public void setEncryptedPropertyDefaults(Properties propertyDefaults)
{
this.encryptedPropertyDefaults = propertyDefaults;
}
/**
* Gets the property defaults provided by the installer or System properties.
@@ -242,7 +251,25 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
*/
protected String resolveDefault(String name)
{
String value = this.propertyDefaults.getProperty(name);
Properties props = new Properties();
if(propertyDefaults != null)
{
for( Object key : propertyDefaults.keySet())
{
props.setProperty((String)key, propertyDefaults.getProperty((String)key));
}
}
if(encryptedPropertyDefaults != null)
{
for( Object key : encryptedPropertyDefaults.keySet())
{
props.setProperty((String)key, encryptedPropertyDefaults.getProperty((String)key));
}
}
String value = props.getProperty(name);
if (value != null)
{
value = this.defaultResolver.resolveValue(value);
@@ -1094,8 +1121,24 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
*/
public String resolveValue(String val)
{
return AbstractPropertyBackedBean.this.propertyDefaults == null ? null : replacePlaceholders(
val, AbstractPropertyBackedBean.this.propertyDefaults);
Properties props = new Properties();
if(propertyDefaults != null)
{
for( Object key : propertyDefaults.keySet())
{
props.setProperty((String)key, propertyDefaults.getProperty((String)key));
}
}
if(encryptedPropertyDefaults != null)
{
for( Object key : encryptedPropertyDefaults.keySet())
{
props.setProperty((String)key, encryptedPropertyDefaults.getProperty((String)key));
}
}
return replacePlaceholders(val, props);
}
}