CAMEL-4974: Added santizie option to JMX to hide sensitive information like password in URIs exposed in JMX MBean names and attributes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d157664 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d157664 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d157664 Branch: refs/heads/master Commit: 3d15766435d90cc1b3c1805b10ea713400a06b8b Parents: 4b07f91 Author: Claus Ibsen <[email protected]> Authored: Tue Jul 30 14:10:57 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Tue Jul 30 16:28:00 2013 +0200 ---------------------------------------------------------------------- .../camel/management/DefaultManagementMBeanAssembler.java | 3 +-- .../org/apache/camel/management/DefaultRequiredModelMBean.java | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3d157664/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java index 45969fe..fe23006 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java @@ -76,9 +76,8 @@ public class DefaultManagementMBeanAssembler implements ManagementMBeanAssembler } boolean santizie = camelContext.getManagementStrategy().getManagementAgent().getSanitize() != null && camelContext.getManagementStrategy().getManagementAgent().getSanitize(); - DefaultRequiredModelMBean mbean = (DefaultRequiredModelMBean) mBeanServer.instantiate(DefaultRequiredModelMBean.class.getName()); + DefaultRequiredModelMBean mbean = new DefaultRequiredModelMBean(mbi); mbean.setSanitize(santizie); - mbean.setModelMBeanInfo(mbi); try { mbean.setManagedResource(obj, "ObjectReference"); http://git-wip-us.apache.org/repos/asf/camel/blob/3d157664/camel-core/src/main/java/org/apache/camel/management/DefaultRequiredModelMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultRequiredModelMBean.java b/camel-core/src/main/java/org/apache/camel/management/DefaultRequiredModelMBean.java index fd6fdad..5664e17 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultRequiredModelMBean.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultRequiredModelMBean.java @@ -21,6 +21,7 @@ import javax.management.MBeanException; import javax.management.MBeanOperationInfo; import javax.management.ReflectionException; import javax.management.RuntimeOperationsException; +import javax.management.modelmbean.ModelMBeanInfo; import javax.management.modelmbean.RequiredModelMBean; import org.apache.camel.util.ObjectHelper; @@ -43,6 +44,10 @@ public class DefaultRequiredModelMBean extends RequiredModelMBean { // must have default no-arg constructor } + public DefaultRequiredModelMBean(ModelMBeanInfo mbi) throws MBeanException, RuntimeOperationsException { + super(mbi); + } + public boolean isSanitize() { return sanitize; }
