You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/03/26 14:25:36 UTC
svn commit: r388900 - in /webservices/axis2/trunk/java/modules/security: ./
src/org/apache/axis2/security/trust/impl/ test-resources/trust/impl/
Author: ruchithf
Date: Sun Mar 26 04:25:35 2006
New Revision: 388900
URL: http://svn.apache.org/viewcvs?rev=388900&view=rev
Log:
updating the keystores
Added:
webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts.jks (with props)
Removed:
webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/wss4j.keystore
Modified:
webservices/axis2/trunk/java/modules/security/maven.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sctIssuer.properties
webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts-services.xml
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=388900&r1=388899&r2=388900&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Sun Mar 26 04:25:35 2006
@@ -72,7 +72,7 @@
<copy file="test-resources/trust/impl/sts-services.xml" toFile="target/sts/META-INF/services.xml"/>
<copy file="test-resources/trust/impl/sctIssuer.properties" toFile="target/sts/sctIssuer.properties"/>
- <copy file="test-resources/trust/impl/wss4j.keystore" toFile="target/sts/wss4j.keystore"/>
+ <copy file="test-resources/trust/impl/sts.jks" toFile="target/sts/sts.jks"/>
<jar jarfile="target/SecurityTokenService.aar" basedir="target/sts/">
<include name="**/*"/>
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java?rev=388900&r1=388899&r2=388900&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/impl/SCTIssuer.java Sun Mar 26 04:25:35 2006
@@ -71,7 +71,6 @@
.getProperty(WSHandlerConstants.RECV_RESULTS)) == null) {
throw new TrustException(TrustException.REQUEST_FAILED);
} else {
- System.out.println("Number of results: " + results.size());
Principal principal = null;
X509Certificate cert = null;
for (int i = 0; i < results.size(); i++) {
@@ -92,20 +91,7 @@
if(principal == null) {
throw new TrustException(TrustException.REQUEST_FAILED);
}
-
-// TEMPORARY - will remove this :-)
-// X509Certificate cert = null;
-// try {
-// KeyStore ks = KeyStore.getInstance("JKS"); //KeyStore instance
-// FileInputStream ksfis = new FileInputStream("wss4j.keystore");
-// BufferedInputStream ksbufin = new BufferedInputStream(ksfis);
-// ks.load(ksbufin,"security".toCharArray());
-//
-// cert = (X509Certificate)ks.getCertificate("wss4jcert");
-// }catch (Exception e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
+
Parameter param = inMsgCtx.getParameter(SCT_ISSUER_CONFIG_PARAM);
SCTIssuerConfig config = new SCTIssuerConfig(param
.getParameterElement().getFirstChildWithName(
@@ -135,8 +121,6 @@
SOAPEnvelope env = this.getSOAPEnvelope(msgCtx);
//Get the document
Document doc = ((Element)env).getOwnerDocument();
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
Crypto crypto = CryptoFactory.getInstance(config.cryptoPropertiesFile,
Modified: webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sctIssuer.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sctIssuer.properties?rev=388900&r1=388899&r2=388900&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sctIssuer.properties (original)
+++ webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sctIssuer.properties Sun Mar 26 04:25:35 2006
@@ -1,4 +1,4 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=security
-org.apache.ws.security.crypto.merlin.file=wss4j.keystore
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.file=sts.jks
Modified: webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts-services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts-services.xml?rev=388900&r1=388899&r2=388900&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts-services.xml (original)
+++ webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts-services.xml Sun Mar 26 04:25:35 2006
@@ -25,4 +25,12 @@
<cryptoProperties>sctIssuer.properties</cryptoProperties>
</sct-issuer-config>
</parameter>
+
+ <parameter name="InflowSecurity">
+ <action>
+ <items>Timestamp Signature</items>
+ <!--<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass> -->
+ <signaturePropFile>sctIssuer.properties</signaturePropFile>
+ </action>
+ </parameter>
</service>
Added: webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts.jks
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts.jks?rev=388900&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/axis2/trunk/java/modules/security/test-resources/trust/impl/sts.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream