Author: indika
Date: Wed May 5 11:19:46 2010
New Revision: 941251
URL: http://svn.apache.org/viewvc?rev=941251&view=rev
Log:
some code improvement in commons security module
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/AsymmetricCipher.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SymmetricCipher.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
Wed May 5 11:19:46 2010
@@ -19,7 +19,7 @@
package org.apache.synapse.commons.datasource;
/**
- * Constants related to the DataSource component
+ * Constants related to the DataSource component
*/
public class DataSourceConstants {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
Wed May 5 11:19:46 2010
@@ -36,7 +36,7 @@ public class DatasourceMBeanRepository i
private final Map<String, DBPoolView> dataSourcesMBeans
= new HashMap<String, DBPoolView>();
- private final static DatasourceMBeanRepository DATASOURCE_M_BEAN_REPOSITORY
+ private final static DatasourceMBeanRepository DATASOURCE_MBEAN_REPOSITORY
= new DatasourceMBeanRepository();
private final static String MBEAN_CATEGORY_DATABASE_CONNECTION_POOL
= "DatabaseConnectionPool";
@@ -45,7 +45,7 @@ public class DatasourceMBeanRepository i
}
public static DatasourceMBeanRepository getInstance() {
- return DATASOURCE_M_BEAN_REPOSITORY;
+ return DATASOURCE_MBEAN_REPOSITORY;
}
public void addMBean(String name, Object mBean) {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/AsymmetricCipher.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/AsymmetricCipher.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/AsymmetricCipher.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/AsymmetricCipher.java
Wed May 5 11:19:46 2010
@@ -26,7 +26,7 @@ import org.apache.synapse.commons.securi
import java.security.Key;
/**
- * AsymmetricCipher
+ * The Cipher doing asymmetric cryptographic operations
*/
public class AsymmetricCipher extends BaseCipher {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SymmetricCipher.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SymmetricCipher.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SymmetricCipher.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/SymmetricCipher.java
Wed May 5 11:19:46 2010
@@ -27,7 +27,7 @@ import javax.crypto.spec.SecretKeySpec;
import java.security.Key;
/**
- * SymmetricCipher
+ * The Cipher doing symmetric cryptographic operations
* Uses default key when these is no SecretKey
*/
public class SymmetricCipher extends BaseCipher {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
Wed May 5 11:19:46 2010
@@ -131,52 +131,46 @@ public final class CipherTool {
String source = getArgument(cmd, SOURCE_IN_LINED, null);
assertEmpty(source, SOURCE_IN_LINED);
- Key key;
+ Key key = findKey(cmd,cipherInformation);
- // if pass phrase is specified, use simple symmetric en-/decryption
- String passphrase = getArgument(cmd, PASSPHRASE, null);
boolean isEncrypt = (cipherInformation.getCipherOperationMode() ==
CipherOperationMode.ENCRYPT);
+
EncryptionProvider encryptionProvider = null;
DecryptionProvider decryptionProvider = null;
- if (passphrase != null) {
- key = new SecretKeySpec(passphrase.getBytes(),
cipherInformation.getAlgorithm());
+
+ if (key != null) {
+
if (isEncrypt) {
encryptionProvider =
CipherFactory.createCipher(cipherInformation, key);
} else {
decryptionProvider =
CipherFactory.createCipher(cipherInformation, key);
}
+
} else {
- // Key information must not contain any password
- // If Key need to be loaded from a file
- String keyFile = getArgument(cmd, KEY_FILE, null);
boolean isTrusted = isArgumentPresent(cmd, TRUSTED);
- if (keyFile != null) {
- key = getKey(keyFile);
- if (isEncrypt) {
- encryptionProvider =
CipherFactory.createCipher(cipherInformation, key);
- } else {
- decryptionProvider =
CipherFactory.createCipher(cipherInformation, key);
- }
+
+ KeyStoreWrapper keyStoreWrapper;
+
+ if (isTrusted) {
+ keyStoreWrapper = new TrustKeyStoreWrapper();
+ ((TrustKeyStoreWrapper)
keyStoreWrapper).init(getTrustKeyStoreInformation(cmd));
+ } else {
+ keyStoreWrapper = new IdentityKeyStoreWrapper();
+ //Password for access private key
+ String keyPass = getArgument(cmd, KEY_PASS, null);
+ assertEmpty(keyPass, KEY_PASS);
+ ((IdentityKeyStoreWrapper) keyStoreWrapper).init(
+ getIdentityKeyStoreInformation(cmd), keyPass);
+ }
+
+ if (isEncrypt) {
+ encryptionProvider =
CipherFactory.createCipher(cipherInformation,
+ keyStoreWrapper);
} else {
- KeyStoreWrapper keyStoreWrapper;
- if (isTrusted) {
- keyStoreWrapper = new TrustKeyStoreWrapper();
- ((TrustKeyStoreWrapper)
keyStoreWrapper).init(getTrustKeyStoreInformation(cmd));
- } else {
- keyStoreWrapper = new IdentityKeyStoreWrapper();
- //Password for access private key
- String keyPass = getArgument(cmd, KEY_PASS, null);
- assertEmpty(keyPass, KEY_PASS);
- ((IdentityKeyStoreWrapper) keyStoreWrapper).init(
- getIdentityKeyStoreInformation(cmd), keyPass);
- }
- if (isEncrypt) {
- encryptionProvider =
CipherFactory.createCipher(cipherInformation, keyStoreWrapper);
- } else {
- decryptionProvider =
CipherFactory.createCipher(cipherInformation, keyStoreWrapper);
- }
+ decryptionProvider =
CipherFactory.createCipher(cipherInformation,
+ keyStoreWrapper);
}
}
@@ -414,6 +408,34 @@ public final class CipherTool {
return null;
}
+ /**
+ * Find the key based on the given command line arguments
+ *
+ * @param cmd command line arguments
+ * @param cipherInformation cipher information
+ * @return an valid <code>Key</code> if found , otherwise
+ */
+ private static Key findKey(CommandLine cmd, CipherInformation
cipherInformation) {
+ // if pass phrase is specified, use simple symmetric en-/decryption
+ String passPhrase = getArgument(cmd, PASSPHRASE, null);
+
+ Key key = null;
+
+ if (passPhrase != null) {
+ key = new SecretKeySpec(passPhrase.getBytes(),
cipherInformation.getAlgorithm());
+
+ } else {
+ // Key information must not contain any password
+ // If Key need to be loaded from a file
+ String keyFile = getArgument(cmd, KEY_FILE, null);
+
+ if (keyFile != null) {
+ key = getKey(keyFile);
+ }
+ }
+ return key;
+ }
+
private static void handleException(String msg, Exception e) {
log.error(msg, e);
throw new SynapseCommonsException(msg, e);
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/util/RMIRegistryController.java
Wed May 5 11:19:46 2010
@@ -33,6 +33,10 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+/**
+ * Creates and manages RMI registries
+ */
+
public class RMIRegistryController {
public static final Log log =
LogFactory.getLog(RMIRegistryController.class);
@@ -129,7 +133,7 @@ public class RMIRegistryController {
UnicastRemoteObject.unexportObject(registry, true);
registriesCache.remove(key);
} catch (NoSuchObjectException e) {
- String msg = "Error when stopping localregistry(RMI)";
+ String msg = "Error when stopping local registry(RMI)";
handleException(msg, e);
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=941251&r1=941250&r2=941251&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Wed May 5 11:19:46 2010
@@ -773,7 +773,7 @@ public class SynapseConfigUtils {
public static OMElement stringToOM(String xml) {
try {
- return AXIOMUtil.stringToOM(xml); // Just wrapp to add loging for
any errors
+ return AXIOMUtil.stringToOM(xml); // Just wrap to add logging for
any errors
} catch (XMLStreamException e) {
handleException("Unable to convert a string to OM Node as the
string " +
"is malformed , String : " + xml, e);
