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/16 11:12:56 UTC
svn commit: r775439 - in /synapse/trunk/java:
modules/commons/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/
modules/commons/src/main/java/org/apache/synapse/commons/security/tool/
modules/commons/src/main/java/org/apach...
Author: indika
Date: Sat May 16 09:12:54 2009
New Revision: 775439
URL: http://svn.apache.org/viewvc?rev=775439&view=rev
Log:
fix an issue with key usage
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.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/security/wrappers/IdentityKeyStoreWrapper.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java
synapse/trunk/java/repository/conf/cipher-text.properties
synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java?rev=775439&r1=775438&r2=775439&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/secret/repository/filebased/FileBaseSecretRepository.java Sat May 16 09:12:54 2009
@@ -31,6 +31,7 @@
import java.io.ByteArrayInputStream;
import java.security.PublicKey;
+import java.security.Key;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -148,7 +149,7 @@
String aliasOfCert = MiscellaneousUtil.getProperty(
cipherProperties, sbThree.toString(), null);
- PublicKey key;
+ Key key;
if (TRUSTED.equals(keyStore)) {
if (aliasOfCert == null) {
key = trust.getPublicKey();
@@ -157,9 +158,9 @@
}
} else {
if (aliasOfCert == null) {
- key = identity.getPublicKey();
+ key = identity.getPrivateKey();
} else {
- key = identity.getPublicKey(aliasOfCert);
+ key = identity.getPrivateKey(aliasOfCert); //TODO use password per 'alias'
}
}
//Creates a cipherInformation
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=775439&r1=775438&r2=775439&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 Sat May 16 09:12:54 2009
@@ -159,9 +159,9 @@
assertEmpty(keyPass, KEY_PASS);
storeWrapper.init(getIdentityKeyStoreInformation(cmd), keyPass);
if (cipherInformation.getCipherOperationMode() == CipherOperationMode.ENCRYPT) {
- key = storeWrapper.getPrivateKey();
- } else {
key = storeWrapper.getPublicKey();
+ } else {
+ key = storeWrapper.getPrivateKey();
}
}
}
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java?rev=775439&r1=775438&r2=775439&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/IdentityKeyStoreWrapper.java Sat May 16 09:12:54 2009
@@ -69,6 +69,19 @@
}
/**
+ * Returns the private key based on initialization data
+ *
+ * @return PrivateKey if there is a one , otherwise null
+ */
+ public PrivateKey getPrivateKey(String alias) {
+ Key key = super.getPrivateKey(alias);
+ if (key instanceof PrivateKey) {
+ return (PrivateKey) key;
+ }
+ return null;
+ }
+
+ /**
* Returns the secret key
*
* @param alias The alias of the certificate in the specified keyStore
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java?rev=775439&r1=775438&r2=775439&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/security/wrappers/KeyStoreWrapper.java Sat May 16 09:12:54 2009
@@ -127,6 +127,16 @@
}
/**
+ * Returns the key based on default key password
+ *
+ * @param alias The alias
+ * @return Key , if there is a one , otherwise null
+ */
+ protected Key getPrivateKey(String alias) {
+ return getKey(alias, keyPassword);
+ }
+
+ /**
* Returns the public key for the given alias
*
* @param alias The alias of the certificate in the specified keyStore
Modified: synapse/trunk/java/repository/conf/cipher-text.properties
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/cipher-text.properties?rev=775439&r1=775438&r2=775439&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/cipher-text.properties (original)
+++ synapse/trunk/java/repository/conf/cipher-text.properties Sat May 16 09:12:54 2009
@@ -1,7 +1,7 @@
#aliases=synapse,password
#
## configuration per each plaintext
-#synapse.secret=EsY65tztE9R5b9pErVxLp8Br5d3ol6vRdWAkYHdc7XkZteGf37VJ+iNlCenqxYSEto0vcjpcmmzwf7K2wd9u3KQtVGKEoNLSe2LYZtrm3tKmGd6PX9YpdN72ml3JISNXPJ69yybFi6DVUIJfE5MFOd7gswWfCnkmZ3eJ6M1nuiI=
+#synapse.secret=P6myYYDEmiILYid7Du1GGCHJMbdehU5SAEYHtE1ArBeJnLo+72+evwAA80+D3RcNRukqvKzlkiKBAdOtU3ppujHhi5UndGhzubjrYhU7YvnhqCK+ulaW78KaQqTlFoM26v+Oa/jgzdJ5ucXhe6SWJxPM7LlAVAE+jFNHFxNgHmo=
#synapse.secret.algorithm=RSA
#synapse.secret.alias=synapse
#synapse.secret.keystore=identity
Modified: synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml?rev=775439&r1=775438&r2=775439&view=diff
==============================================================================
--- synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml (original)
+++ synapse/trunk/java/src/site/xdoc/Synapse_Samples_Setup.xml Sat May 16 09:12:54 2009
@@ -1033,17 +1033,15 @@
</strong>
</p>
<p>
- <strong>ciphertool.bat -source testpass -keystore lib\identity.jks -storepass password -alias synapse -keypass password -outencode base64
+ <strong>ciphertool.bat -source synapse -keystore lib\trust.jks -storepass password -alias synapse -outencode base64 -trusted
<br/>
</strong>
</p>
- <pre>ciphertool.bat -source testpass -keystore lib\identity.jks -storepass password -alias synapse -keypass password -outencode base64
-
- Using SYNAPSE_HOME: C:\Project\apache\synapse\synapse4\modules\distribution\ta
- rget\synapse-SNAPSHOT
+ <pre>ciphertool.bat -source synapse -keystore lib\trust.jks -storepass password -alias synapse -outencode base64 -trusted
+ Using SYNAPSE_HOME: C:\Project\apache\synapse\trunck2\modules\distribution\target\synapse-SNAPSHOT
Using JAVA_HOME: C:\Program Files\Java\jdk1.5.0_14
- Output :
- UJqoweKO4+qL9ivJlDkjIBE4XOBuGSplkHAwjS3R/nUi7LH+/AH6jfu0rW74WrrjDE1LMaWDJvsEQvLFkTVCYMdm5rkqpkqxBsz0/q0o+OGF+e1taSF3OzmqmUxs1yEK0q7vFUbfDkRWW9frrP5UF9nMtl9H3brOm/YtbpgyLMw=
+ Output : VbwH1pePwf4XmUtCdIvO0MA/EZPl8YK+E0kGkMpFd7CbWKpR2h1evTv902zoVorbJbHsVDNXfuvUUGmQAptUl4GknAm4bgZsgQ/pbsRbXivRkNzg9JVqw3FzWkR2uN2ZCHSacC4IdUwOjSDOTQ+kH7se
+ 58kt2xqJSax2a9pdL1w=
</pre>
</div>
</div>