Author: indika Date: Wed May 13 03:12:10 2009 New Revision: 35707 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=35707
Log: Change passwordProvider in the configurations into secretProvider as secret API is just not only for password Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java branches/synapse/1.3-wso2v1/repository/conf/synapse.properties branches/synapse/1.3-wso2v1/src/site/xdoc/Synapse_Samples_Setup.xml Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java?rev=35707&r1=35706&r2=35707&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/SecurityConstants.java Wed May 13 03:12:10 2009 @@ -23,7 +23,7 @@ public static final String GLOBAL_PREFIX = "synapse."; public static final String PROP_USER_NAME = "username"; public static final String PROP_PASSWORD = "password"; - public static final String PROP_PASSWORD_PROVIDER = "passwordProvider"; + public static final String PROP_SECRET_PROVIDER = "secretProvider"; public static final String PROP_PASSWORD_PROMPT = "passwordPrompt"; public static final String PROP_SECRET_CALLBACK_HANDLER = "SharedSecretCallbackHandler"; public static final String PROP_SECURITY_ADMIN_SERVICES = "SecurityAdminServices"; Modified: branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java?rev=35707&r1=35706&r2=35707&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java (original) +++ branches/synapse/1.3-wso2v1/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/SecretInformationFactory.java Wed May 13 03:12:10 2009 @@ -68,14 +68,14 @@ // set specific password provider if configured SecretCallbackHandler passwordProvider = SecretCallbackHandlerFactory.createSecretCallbackHandler(properties, - configurationPrefix + SecurityConstants.PROP_PASSWORD_PROVIDER); + configurationPrefix + SecurityConstants.PROP_SECRET_PROVIDER); // if no specific password provider configured, use default password provider if (passwordProvider == null) { passwordProvider = SecretCallbackHandlerFactory.createSecretCallbackHandler( properties, SecurityConstants.GLOBAL_PREFIX - + SecurityConstants.PROP_PASSWORD_PROVIDER); + + SecurityConstants.PROP_SECRET_PROVIDER); } secretInformation.setPasswordProvider(passwordProvider); secretInformation.setPasswordPrompt(passwordPrompt); Modified: branches/synapse/1.3-wso2v1/repository/conf/synapse.properties URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/repository/conf/synapse.properties?rev=35707&r1=35706&r2=35707&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/repository/conf/synapse.properties (original) +++ branches/synapse/1.3-wso2v1/repository/conf/synapse.properties Wed May 13 03:12:10 2009 @@ -40,12 +40,12 @@ ############################################################################# # The following property specifies a global password provider implementation # which will be used globally if not overriden in specific configurations -# synapse.passwordProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> +# synapse.secretProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> #Examples: -#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler -#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler -#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.JlineSecretCallbackHandler -#synapse.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler +#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler +#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler +#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.JlineSecretCallbackHandler +#synapse.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler # #secretRepositories=file #secretRepositories.file.provider=org.apache.synapse.commons.security.secret.repository.filebased.FileBaseSecretRepositoryProvider @@ -55,16 +55,16 @@ #keystore.identity.type=JKS #keystore.identity.alias=synapse #keystore.identity.store.password=password -#keystore.identity.store.passwordProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> +#keystore.identity.store.secretProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> #keystore.identity.key.password=password -#keystore.identity.key.passwordProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> +#keystore.identity.key.secretProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> ##keystore.identity.parameters=enableHostnameVerifier=false;keyStoreCertificateFilePath=/home/esb.cer # #keystore.trust.location=lib/trust.jks #keystore.trust.type=JKS #keystore.trust.alias=synapse #keystore.trust.store.password=password -#keystore.trust.store.passwordProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> +#keystore.trust.store.secretProvider=<any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler> # ################################################################################ # DataSources Configuration @@ -79,10 +79,10 @@ #synapse.datasources.lookupds.type=BasicDataSource #synapse.datasources.lookupds.driverClassName=org.apache.derby.jdbc.ClientDriver #synapse.datasources.lookupds.url=jdbc:derby://localhost:1527/lookupdb;create=false -# Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider -#synapse.datasources.lookupds.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler +# Optionally you can specifiy a specific secret provider implementation which overrides any globally configured provider +#synapse.datasources.lookupds.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler #synapse.datasources.lookupds.username=synapse -# Depending on the password provider used, you may have to use an encrypted password here! +# Depending on the secret provider used, you may have to use an encrypted password here! #synapse.datasources.lookupds.password=synapse #synapse.datasources.lookupds.dsName=lookupdb #synapse.datasources.lookupds.maxActive=100 @@ -97,10 +97,10 @@ #synapse.datasources.reportds.dsName=reportdb #synapse.datasources.reportds.driverClassName=org.apache.derby.jdbc.ClientDriver #synapse.datasources.reportds.url=jdbc:derby://localhost:1527/reportdb;create=false -# Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider -#synapse.datasources.reportds.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler +# Optionally you can specifiy a specific secret provider implementation which overrides any globally configured provider +#synapse.datasources.reportds.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler #synapse.datasources.reportds.username=synapse -# Depending on the password provider used, you may have to use an encrypted password here! +# Depending on the secret provider used, you may have to use an encrypted password here! #synapse.datasources.reportds.password=synapse #synapse.datasources.reportds.maxActive=100 #synapse.datasources.reportds.maxIdle=20 @@ -115,11 +115,11 @@ #synapse.jmx.rmiPort=1101 # By default the hostname will be detected, but you can force to use another network interface #synapse.jmx.hostname= -# Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider -#synapse.jmx.passwordProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler +# Optionally you can specifiy a specific secret provider implementation which overrides any globally configured provider +#synapse.jmx.secretProvider=org.apache.synapse.commons.security.secret.handler.JBossEncryptionSecretCallbackHandler # By default no authentication is required, but you may enforce this by specifying a username and password #synapse.jmx.username=admin -# Depending on the password provider used, you may have to use an encrypted password here! +# Depending on the secret provider used, you may have to use an encrypted password here! #synapse.jmx.password=admin # Optionally you may want to specify the location of an remote access file to restrict access #synapse.jmx.remote.access.file= Modified: branches/synapse/1.3-wso2v1/src/site/xdoc/Synapse_Samples_Setup.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/src/site/xdoc/Synapse_Samples_Setup.xml?rev=35707&r1=35706&r2=35707&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/src/site/xdoc/Synapse_Samples_Setup.xml (original) +++ branches/synapse/1.3-wso2v1/src/site/xdoc/Synapse_Samples_Setup.xml Wed May 13 03:12:10 2009 @@ -831,18 +831,18 @@ is an alias and to be used to get actual password In order to resolve above passwords (i.e. to get actual passwords); it is needed to provide a - <strong>password provider</strong> + <strong>secret provider</strong> for each keystore. This can be done by adding property called - <strong>passwordProvider= any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler + <strong>secretProvider= any implementation of org.apache.synapse.commons.security.secret.SecretCallbackHandler </strong> Example <pre> - keystore.identity.store.passwordProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler + keystore.identity.store.secretProvider=org.apache.synapse.commons.security.secret.handler.JMXSecretCallbackHandler </pre> </p> <p> - The <strong>password provider</strong> should be an implementation of + The <strong>secret provider</strong> should be an implementation of <strong>org.apache.synapse.commons.security.secret.SecretCallbackHandler</strong>.Synapse ships three implementations that can be used for this purpose. @@ -976,9 +976,9 @@ <p>To secure data sources password, it is need to use secret manager. Please first refer that document before reading this. If the secret manager is used, then passwords that have been specified are considered as aliases and those are used for picking actual passwords. To get - password securely, it is needed to set the password provider for each data source. + password securely, it is needed to set the secret provider for each data source. The - <strong>password provider</strong> + <strong>secret provider</strong> should be an implementation of <strong>org.apache.synapse.commons.security.secret.SecretCallbackHandler</strong>. There are few options but it is @@ -990,12 +990,12 @@ <p> <strong>A sample configuration for above <strong>lookupds</strong> - data source to use password provider + data source to use secret provider <br/> </strong> </p> <pre> - synapse.datasources.lookupds.passwordProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler + synapse.datasources.lookupds.secretProvider=org.apache.synapse.commons.security.secret.handler.SecretManagerSecretCallbackHandler </pre> </div> <h2>Using CipherTool</h2> _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
