You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/05/14 07:49:57 UTC
svn commit: r774646 - in
/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons:
datasource/ datasource/factory/ datasource/serializer/ jmx/
security/definition/ security/secret/ security/tool/
Author: indika
Date: Thu May 14 05:49:56 2009
New Revision: 774646
URL: http://svn.apache.org/viewvc?rev=774646&view=rev
Log:
chage 'name' password into secret in SecretInformation
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/tool/CipherTool.java
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java Thu May 14 05:49:56 2009
@@ -119,7 +119,7 @@
String url = information.getUrl();
String user = information.getSecretInformation().getUser();
- String password = information.getSecretInformation().getResolvedPassword();
+ String password = information.getSecretInformation().getResolvedSecret();
String maxActive = String.valueOf(information.getMaxActive());
String maxIdle = String.valueOf(information.getMaxIdle());
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java Thu May 14 05:49:56 2009
@@ -64,7 +64,7 @@
}
String user = dataSourceInformation.getSecretInformation().getUser();
- String password = dataSourceInformation.getSecretInformation().getResolvedPassword();
+ String password = dataSourceInformation.getSecretInformation().getResolvedSecret();
int defaultTransactionIsolation = dataSourceInformation.getDefaultTransactionIsolation();
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java Thu May 14 05:49:56 2009
@@ -61,7 +61,7 @@
user);
}
- String password = secretInformation.getAliasPassword();
+ String password = secretInformation.getAliasSecret();
if (password != null && !"".equals(password)) {
addProperty(properties, prefix + SecurityConstants.PROP_PASSWORD,
password);
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxSecretAuthenticator.java Thu May 14 05:49:56 2009
@@ -40,7 +40,7 @@
String password = (aCredentials[1] != null ? aCredentials[1] : "");
// perform authentication
- if (secretInformation.getUser().equals(username) && password.equals(secretInformation.getResolvedPassword())) {
+ if (secretInformation.getUser().equals(username) && password.equals(secretInformation.getResolvedSecret())) {
return new Subject(true,
Collections.singleton(new JMXPrincipal(username)),
Collections.EMPTY_SET,
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/IdentityKeyStoreInformation.java Thu May 14 05:49:56 2009
@@ -50,7 +50,7 @@
KeyStore keyStore = this.getIdentityKeyStore();
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(
KeyManagerFactory.getDefaultAlgorithm());
- keyManagerFactory.init(keyStore, keyPasswordProvider.getResolvedPassword().toCharArray());
+ keyManagerFactory.init(keyStore, keyPasswordProvider.getResolvedSecret().toCharArray());
return keyManagerFactory;
} catch (Exception e) {
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/definition/KeyStoreInformation.java Thu May 14 05:49:56 2009
@@ -120,7 +120,7 @@
if (log.isDebugEnabled()) {
log.debug("Loading KeyStore with type : " + storeType);
}
- String keyStorePassword = this.keyStorePasswordProvider.getResolvedPassword();
+ String keyStorePassword = this.keyStorePasswordProvider.getResolvedSecret();
switch (storeType) {
case JKS:
IKeyStoreLoader jksKeyStoreLoader = new JKSKeyStoreLoader(location,
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformation.java Thu May 14 05:49:56 2009
@@ -25,10 +25,10 @@
public class SecretInformation {
private String user;
- private String aliasPassword;
- private String passwordPrompt;
- private SecretCallbackHandler passwordProvider;
-
+ private String aliasSecret;
+ private String secretPrompt;
+ private SecretCallbackHandler secretProvider;
+
public String getUser() {
return user;
}
@@ -37,20 +37,20 @@
this.user = user;
}
- public String getAliasPassword() {
- return aliasPassword;
+ public String getAliasSecret() {
+ return aliasSecret;
}
- public void setAliasPassword(String aliasPassword) {
- this.aliasPassword = aliasPassword;
+ public void setAliasSecret(String aliasSecret) {
+ this.aliasSecret = aliasSecret;
}
- public String getPasswordPrompt() {
- return passwordPrompt;
+ public String getSecretPrompt() {
+ return secretPrompt;
}
- public void setPasswordPrompt(String passwordPrompt) {
- this.passwordPrompt = passwordPrompt;
+ public void setSecretPrompt(String secretPrompt) {
+ this.secretPrompt = secretPrompt;
}
/**
@@ -58,22 +58,22 @@
* If SecretCallbackHandler is null, then returns alias password
* @return Actual password
*/
- public String getResolvedPassword() {
+ public String getResolvedSecret() {
- if (passwordProvider != null) {
- if (aliasPassword != null && !"".equals(aliasPassword)) {
- return getSecret(passwordProvider, aliasPassword, passwordPrompt);
+ if (secretProvider != null) {
+ if (aliasSecret != null && !"".equals(aliasSecret)) {
+ return getSecret(secretProvider, aliasSecret, secretPrompt);
}
}
- return aliasPassword;
+ return aliasSecret;
}
- public SecretCallbackHandler getPasswordProvider() {
- return passwordProvider;
+ public SecretCallbackHandler getSecretProvider() {
+ return secretProvider;
}
- public void setPasswordProvider(SecretCallbackHandler passwordProvider) {
- this.passwordProvider = passwordProvider;
+ public void setSecretProvider(SecretCallbackHandler secretProvider) {
+ this.secretProvider = secretProvider;
}
private String getSecret(SecretCallbackHandler secretCallbackHanlder, String encryptedPassword, String prompt) {
@@ -87,5 +87,5 @@
return secretCallback.getSecret();
}
-
+
}
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java Thu May 14 05:49:56 2009
@@ -62,7 +62,7 @@
String.class);
if (password != null && !"".equals(password)) {
- secretInformation.setAliasPassword(password);
+ secretInformation.setAliasSecret(password);
}
// set specific password provider if configured
@@ -77,8 +77,8 @@
SecurityConstants.GLOBAL_PREFIX
+ SecurityConstants.PROP_SECRET_PROVIDER);
}
- secretInformation.setPasswordProvider(passwordProvider);
- secretInformation.setPasswordPrompt(passwordPrompt);
+ secretInformation.setSecretProvider(passwordProvider);
+ secretInformation.setSecretPrompt(passwordPrompt);
return secretInformation;
}
@@ -97,10 +97,10 @@
String passwordPrompt) {
SecretInformation secretInformation = new SecretInformation();
- secretInformation.setAliasPassword(aliasPassword);
- secretInformation.setPasswordProvider(
+ secretInformation.setAliasSecret(aliasPassword);
+ secretInformation.setSecretProvider(
SecretCallbackHandlerFactory.createSecretCallbackHandler(secretProvider));
- secretInformation.setPasswordPrompt(passwordPrompt);
+ secretInformation.setSecretPrompt(passwordPrompt);
return secretInformation;
}
}
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java?rev=774646&r1=774645&r2=774646&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretManager.java Thu May 14 05:49:56 2009
@@ -109,11 +109,11 @@
String identityKeyPass = identityInformation
- .getKeyPasswordProvider().getResolvedPassword();
+ .getKeyPasswordProvider().getResolvedSecret();
String identityStorePass = identityInformation
- .getKeyStorePasswordProvider().getResolvedPassword();
+ .getKeyStorePasswordProvider().getResolvedSecret();
String trustStorePass = trustInformation
- .getKeyStorePasswordProvider().getResolvedPassword();
+ .getKeyStorePasswordProvider().getResolvedSecret();
if (!validatePasswords(identityStorePass, identityKeyPass, trustStorePass)) {
if (log.isDebugEnabled()) {
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=774646&r1=774645&r2=774646&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 Thu May 14 05:49:56 2009
@@ -280,7 +280,7 @@
String storePass = getArgument(cmd, STORE_PASS, null);
assertEmpty(storePass, STORE_PASS);
SecretInformation secretInformation = new SecretInformation();
- secretInformation.setAliasPassword(storePass);
+ secretInformation.setAliasSecret(storePass);
information.setKeyStorePasswordProvider(secretInformation);
return information;
@@ -303,7 +303,7 @@
String storePass = getArgument(cmd, STORE_PASS, null);
assertEmpty(storePass, STORE_PASS);
SecretInformation secretInformation = new SecretInformation();
- secretInformation.setAliasPassword(storePass);
+ secretInformation.setAliasSecret(storePass);
information.setKeyStorePasswordProvider(secretInformation);
return information;