Author: ruchithf
Date: Wed Aug 2 11:01:51 2006
New Revision: 428074
URL: http://svn.apache.org/viewvc?rev=428074&view=rev
Log:
Allow using a default cert to encrypt symm keys within SAML tokens when issuing
SAML tokens
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java?rev=428074&r1=428073&r2=428074&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
Wed Aug 2 11:01:51 2006
@@ -63,6 +63,8 @@
Options options = new Options();
options.setTo(new EndpointReference("http://127.0.0.1:"; + port +
"/axis2/services/SecureService"));
// options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/axis2/services/UTSAMLHoK"));
+// options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/axis2/services/MutualCertsSAMLHoK"));
+// options.setTo(new EndpointReference("http://127.0.0.1:"; + 9090 +
"/axis2/services/UTSAMLBearer"));
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setAction(this.getRequestAction());
Modified:
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=428074&r1=428073&r2=428074&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
(original)
+++
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
Wed Aug 2 11:01:51 2006
@@ -392,10 +392,15 @@
if(address != null && !"".equals(address)) {
String alias = (String)config.trustedServices.get(address);;
- return (X509Certificate)crypto.getCertificates(alias)[0];
+ if(alias != null) {
+ return (X509Certificate)crypto.getCertificates(alias)[0];
+ } else {
+ alias = (String)config.trustedServices.get("*");
+ return (X509Certificate)crypto.getCertificates(alias)[0];
+ }
} else {
- //Return the STS cert
- return
(X509Certificate)crypto.getCertificates(config.issuerKeyAlias)[0];
+ String alias = (String)config.trustedServices.get("*");
+ return (X509Certificate)crypto.getCertificates(alias)[0];
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
