From fc23c3f0f953931f04dd27e7c2a78c2804f778a8 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 27 May 2014 22:27:53 +0000 Subject: [PATCH] Fixed major issues ("Malicious code vulnerability - Field isn't final") reported in Sonar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@71959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../capability/declarative/DeclarativeCapability.java | 8 ++++---- .../org_alfresco_module_rm/model/BaseBehaviourBean.java | 2 +- .../org_alfresco_module_rm/patch/AbstractModulePatch.java | 2 +- .../patch/ModulePatchExecuterImpl.java | 2 +- .../patch/compatibility/ModulePatchComponent.java | 2 +- .../security/FilePlanPermissionServiceImpl.java | 2 +- .../security/RMMethodSecurityInterceptor.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java index 1cce4da0b8..aab8465553 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java @@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFactory; public class DeclarativeCapability extends AbstractCapability { /** Logger */ - protected static Log logger = LogFactory.getLog(DeclarativeCapability.class); + protected static final Log logger = LogFactory.getLog(DeclarativeCapability.class); /** Required permissions */ protected List permissions; @@ -212,10 +212,10 @@ public class DeclarativeCapability extends AbstractCapability // determine the actual value boolean actual = condition.evaluate(nodeRef); - + // report information about condition (for exception reporting) RMMethodSecurityInterceptor.reportCapabilityCondition(getName(), condition.getName(), expected, actual); - + if (expected != actual) { result = false; @@ -224,7 +224,7 @@ public class DeclarativeCapability extends AbstractCapability { logger.debug("FAIL: Condition " + condition.getName() + " failed for capability " + getName() + " on nodeRef " + nodeRef.toString()); } - + break; } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java index 991325f678..6d40c4e71d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java @@ -24,7 +24,7 @@ public abstract class BaseBehaviourBean extends ServiceBaseImpl BehaviourRegistry { /** Logger */ - protected static Log logger = LogFactory.getLog(BaseBehaviourBean.class); + protected static final Log logger = LogFactory.getLog(BaseBehaviourBean.class); /** behaviour filter */ protected BehaviourFilter behaviourFilter; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java index a6221956cc..fc42a1b97f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.BeanNameAware; public abstract class AbstractModulePatch implements ModulePatch, BeanNameAware { /** logger */ - protected static Log logger = LogFactory.getLog(ModulePatch.class); + protected static final Log logger = LogFactory.getLog(ModulePatch.class); /** module patch service */ private ModulePatchExecuter modulePatchExecuter; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java index e31fc4bfc0..bfb6935c50 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java @@ -40,7 +40,7 @@ public class ModulePatchExecuterImpl extends AbstractModuleComponent implements ModulePatchExecuter { /** logger */ - protected static Log logger = LogFactory.getLog(ModulePatchExecuterImpl.class); + protected static final Log logger = LogFactory.getLog(ModulePatchExecuterImpl.class); /** default start schema */ private static final int START_SCHEMA = 0; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java index 2373c0094a..19fe2928e0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory; public abstract class ModulePatchComponent extends AbstractModuleComponent { /** logger */ - protected static Log logger = LogFactory.getLog(ModulePatchComponent.class); + protected static final Log logger = LogFactory.getLog(ModulePatchComponent.class); /** Retrying transaction helper */ protected RetryingTransactionHelper retryingTransactionHelper; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java index 13421cebb8..9a3caf209f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java @@ -67,7 +67,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl protected PolicyComponent policyComponent; /** Logger */ - protected static Log logger = LogFactory.getLog(FilePlanPermissionServiceImpl.class); + protected static final Log logger = LogFactory.getLog(FilePlanPermissionServiceImpl.class); /** * Initialisation method diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java index 836122a0d6..9a0d831ee2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory; public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor { /** logger */ - protected static Log logger = LogFactory.getLog(RMMethodSecurityInterceptor.class); + protected static final Log logger = LogFactory.getLog(RMMethodSecurityInterceptor.class); /** * Helper class to hold capability report information