Author: indika
Date: Mon Mar 23 07:20:53 2009
New Revision: 757333
URL: http://svn.apache.org/viewvc?rev=757333&view=rev
Log:
Add JMX based Root Level Secret Repository password provider
Did test
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerViewMBean.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProvider.java
- copied, changed from r757314,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBeanImplementation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProviderMBean.java
- copied, changed from r757314,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBean.java
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBean.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBeanImplementation.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=757333&r1=757332&r2=757333&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
Mon Mar 23 07:20:53 2009
@@ -20,6 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.commons.util.MBeanRegistrar;
/**
* This is the core class that starts up a Synapse instance.
@@ -72,7 +73,7 @@
.createSynapseController(configurationInformation);
this.initialized = true;
-
+ registerMBean();
doInit();
return this.contextInformation.getServerState();
}
@@ -202,6 +203,11 @@
}
}
+ private void registerMBean() {
+ MBeanRegistrar.getInstance().registerMBean(new ServerManagerView(),
+ "ServerManager", "ServerManager");
+ }
+
/**
* Has server manager been initialized ?
*
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java?rev=757333&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
(added)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerView.java
Mon Mar 23 07:20:53 2009
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.synapse;
+
+/**
+ * @see org.apache.synapse.ServerManagerViewMBean
+ */
+public class ServerManagerView implements ServerManagerViewMBean {
+
+ private final ServerManager serverManager = ServerManager.getInstance();
+
+ public void start() {
+ if (serverManager.isInitialized()) {
+ serverManager.start();
+ }
+ }
+
+ public void stop() {
+ if (serverManager.isInitialized()) {
+ serverManager.stop();
+ }
+ }
+}
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerViewMBean.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerViewMBean.java?rev=757333&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerViewMBean.java
(added)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManagerViewMBean.java
Mon Mar 23 07:20:53 2009
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.synapse;
+
+/**
+ * A simple MBean for managing Server Manager
+ */
+public interface ServerManagerViewMBean {
+
+ /**
+ * Start Server Manger
+ */
+ public void start();
+
+ /**
+ * Stop Server Manger
+ */
+ public void stop();
+
+}
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProvider.java
(from r757314,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBeanImplementation.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProvider.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProvider.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBeanImplementation.java&r1=757314&r2=757333&rev=757333&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBeanImplementation.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProvider.java
Mon Mar 23 07:20:53 2009
@@ -18,19 +18,19 @@
*/
package org.apache.synapse.security.mbean;
-import org.apache.synapse.SynapseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseException;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* SecretsMBean implemetaion
*/
-public class SecretsMBeanImplementation implements SecretsMBean {
+public class JMXSecretsProvider implements JMXSecretsProviderMBean {
- private static final Log log =
LogFactory.getLog(SecretsMBeanImplementation.class);
+ private static final Log log = LogFactory.getLog(JMXSecretsProvider.class);
/* Secrets map - id vs secret */
private final Map<String, String> secrets = new HashMap<String, String>();
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProviderMBean.java
(from r757314,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBean.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProviderMBean.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProviderMBean.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBean.java&r1=757314&r2=757333&rev=757333&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretsMBean.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/JMXSecretsProviderMBean.java
Mon Mar 23 07:20:53 2009
@@ -21,7 +21,7 @@
/**
* Managing MBean for secrct
*/
-public interface SecretsMBean {
+public interface JMXSecretsProviderMBean {
/**
* Add a secret through JMX
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java?rev=757333&r1=757332&r2=757333&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
Mon Mar 23 07:20:53 2009
@@ -6,15 +6,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.MBeanRegistrar;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.secret.*;
import org.apache.synapse.security.definition.IdentityKeyStoreInformation;
import org.apache.synapse.security.definition.TrustKeyStoreInformation;
import
org.apache.synapse.security.definition.factory.KeyStoreInformationFactory;
+import org.apache.synapse.security.mbean.SecretManagerAdmin;
import org.apache.synapse.security.wrappers.IdentityKeyStoreWrapper;
import org.apache.synapse.security.wrappers.TrustKeyStoreWrapper;
-import org.apache.synapse.security.mbean.SecretManagerAdmin;
-import org.apache.synapse.commons.util.MiscellaneousUtil;
-import org.apache.synapse.commons.util.MBeanRegistrar;
-import org.apache.synapse.commons.util.secret.*;
import java.util.Properties;
@@ -46,6 +46,13 @@
/* Prompt for identity store private key password*/
private final static String IDENTITYSTORE_PRIVATE_KEY_PASSWORD_PROMPT
= "Identity Store Private Key Password > ";
+ /* ID for trust store password*/
+ private final static String TRUSTSTORE_PASSWORD_ID = "trust.store.pass";
+ /* ID for identity store password*/
+ private final static String IDENTITYSTORE_PASSWORD_ID =
"identity.store.pass";
+ /* ID for identity store private key password*/
+ private final static String IDENTITYSTORE_PRIVATE_KEY_PASSWORD_ID
+ = "identity.key.pass";
/* Dot string */
private final static String DOT = ".";
@@ -134,11 +141,14 @@
// Creating required password class backs
SingleSecretCallback trustStorePassSecretCallback
- = new SingleSecretCallback(TRUSTSTORE_PASSWORD_PROMPT);
+ = new SingleSecretCallback(TRUSTSTORE_PASSWORD_PROMPT,
+ TRUSTSTORE_PASSWORD_ID);
SingleSecretCallback identityStorePassSecretCallback
- = new SingleSecretCallback(IDENTITYSTORE_PASSWORD_PROMPT);
+ = new SingleSecretCallback(IDENTITYSTORE_PASSWORD_PROMPT,
+ IDENTITYSTORE_PASSWORD_ID);
SingleSecretCallback identityKeyPassSecretCallback
- = new
SingleSecretCallback(IDENTITYSTORE_PRIVATE_KEY_PASSWORD_PROMPT);
+ = new
SingleSecretCallback(IDENTITYSTORE_PRIVATE_KEY_PASSWORD_PROMPT,
+ IDENTITYSTORE_PRIVATE_KEY_PASSWORD_ID);
// Group all as a one callback
MultiSecretCallback callback = new MultiSecretCallback();
@@ -159,8 +169,10 @@
trustStorePass = trustStorePassSecretCallback.getSecret();
if (!validatePasswords(identityStorePass, identityKeyPass,
trustStorePass)) {
- log.info("Either Identity or Trust keystore password is mandotory"
+
+ if (log.isDebugEnabled()) {
+ log.info("Either Identity or Trust keystore password is
mandotory" +
" in order to initialized secret manager.");
+ }
return;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java?rev=757333&r1=757332&r2=757333&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/handler/JMXSecretCallbackHandler.java
Mon Mar 23 07:20:53 2009
@@ -18,28 +18,28 @@
*/
package org.apache.synapse.security.secret.handler;
+import org.apache.synapse.commons.util.MBeanRegistrar;
import org.apache.synapse.commons.util.secret.AbstractSecretCallbackHandler;
import org.apache.synapse.commons.util.secret.SingleSecretCallback;
-import org.apache.synapse.commons.util.MBeanRegistrar;
-import org.apache.synapse.security.mbean.SecretsMBeanImplementation;
+import org.apache.synapse.security.mbean.JMXSecretsProvider;
/**
* Get and propagates secrets that have been colleted through JMX Mean
*/
public class JMXSecretCallbackHandler extends AbstractSecretCallbackHandler {
- private static SecretsMBeanImplementation secretsMBean;
+ private static JMXSecretsProvider JMXSecretsMBean;
static {
- secretsMBean = new SecretsMBeanImplementation();
- MBeanRegistrar.getInstance().registerMBean(secretsMBean,
"SecretsMBean",
- "SecretsMBean");
+ JMXSecretsMBean = new JMXSecretsProvider();
+ MBeanRegistrar.getInstance().registerMBean(JMXSecretsMBean,
"SecretsProvider",
+ "SecretsProvider");
}
protected void handleSingleSecretCallback(SingleSecretCallback
singleSecretCallback) {
String id = singleSecretCallback.getId();
if (id != null && !"".equals(id)) {
- singleSecretCallback.setSecret(secretsMBean.getSecret(id));
+ singleSecretCallback.setSecret(JMXSecretsMBean.getSecret(id));
}
}
}
