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

Merge release/V2.7 into release/V3.0.

Browse Source
This commit is contained in:
Tom Page
2020-02-28 08:08:29 +00:00
parent 597b6a063e a03c61b241
commit eeb23b51e1
2 changed files with 114 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java
View File

@@ -33,8 +33,11 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -51,7 +54,7 @@ import org.springframework.beans.factory.config.TypedStringValue;
*/
public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
{
private static Log logger = LogFactory.getLog(RMMethodSecurityPostProcessor.class);
private static final Logger LOGGER = LoggerFactory.getLogger(RMMethodSecurityPostProcessor.class);
public static final String PROP_OBJECT_DEFINITION_SOURCE = "objectDefinitionSource";
public static final String PROPERTY_PREFIX = "rm.methodsecurity.";
@@ -94,10 +97,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
{
if (beanFactory.containsBeanDefinition(bean))
{
if (logger.isDebugEnabled())
{
logger.debug("Adding RM method security definitions for " + bean);
}
LOGGER.debug("Adding RM method security definitions for {}", bean);
BeanDefinition beanDef = beanFactory.getBeanDefinition(bean);
PropertyValue beanValue = beanDef.getPropertyValues().getPropertyValue(PROP_OBJECT_DEFINITION_SOURCE);
@@ -134,10 +134,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
String securityBeanName = split[index] + SECURITY_BEAN_POSTFIX;
if (!securityBeanNameCache.contains(securityBeanName) && beanFactory.containsBean(securityBeanName))
{
if (logger.isDebugEnabled())
{
logger.debug("Adding " + securityBeanName + " to list from properties.");
}
LOGGER.debug("Adding {} to list from properties.", securityBeanName);
securityBeanNameCache.add(securityBeanName);
}
@@ -166,10 +163,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
}
else
{
if (logger.isWarnEnabled())
{
logger.warn("Missing RM security definition for method " + key);
}
LOGGER.warn("Missing RM security definition for method {}", key);
}
}
@@ -177,16 +171,28 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
}
/**
* @param stringValue
* @return
* Convert the lines of a string to a map, separating keys from values by the first "=" sign.
*
* @param stringValue The multi-line string.
* @return The resulting map.
* @throws AlfrescoRuntimeException If a non-blank line does not contain an "=" sign.
*/
private Map<String, String> convertToMap(String stringValue)
protected Map<String, String> convertToMap(String stringValue)
{
String[] values = stringValue.trim().split("\n");
Map<String, String> map = new HashMap<>(values.length);
for (String value : values)
{
String[] pair = value.trim().split("=");
String trimmed = value.trim();
if (trimmed.isEmpty())
{
continue;
}
String[] pair = trimmed.split("=", 2);
if (pair.length != 2)
{
throw new AlfrescoRuntimeException("Could not convert string to map " + trimmed);
}
map.put(pair[0], pair[1]);
}
return map;