svn commit: r554666 - in /webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas: RahasData.java client/STSClient.java impl/SAMLTokenIssuerConfig.java

[ruchithf]

Author: ruchithf
Date: Mon Jul  9 07:55:22 2007
New Revision: 554666

URL: http://svn.apache.org/viewvc?view=rev&rev=554666
Log:
Updated rampart to handle changes in WSS4J (r554665)

Modified:
    
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
    
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
    
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java?view=diff&rev=554666&r1=554665&r2=554666
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
 Mon Jul  9 07:55:22 2007
@@ -152,13 +152,21 @@
                 for (int j = 0; j < wsSecEngineResults.size(); j++) {
                     WSSecurityEngineResult wser = (WSSecurityEngineResult) 
wsSecEngineResults
                             .get(j);
-                    if (wser.getAction() == WSConstants.SIGN
-                        && wser.getPrincipal() != null) {
-                        this.clientCert = wser.getCertificate();
-                        this.principal = wser.getPrincipal();
-                    } else if (wser.getAction() == WSConstants.UT
-                               && wser.getPrincipal() != null) {
-                        this.principal = wser.getPrincipal();
+                    Object principalObject = 
wser.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+                    int act = 
((Integer)wser.get(WSSecurityEngineResult.TAG_ACTION)).
+                            intValue();
+                    if (act == WSConstants.SIGN && principalObject != null) {
+                        this.clientCert = (X509Certificate) wser
+                                
.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+                        this.principal = (Principal)principalObject;
+                    } else if (act == WSConstants.UT && principalObject != 
null) {
+                        this.principal = (Principal)principalObject;
+                    } else if (act == WSConstants.BST) {
+                        final X509Certificate[] certificates = 
+                            (X509Certificate[]) wser
+                                
.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
+                        this.clientCert = certificates[0];
+                        this.principal = this.clientCert.getSubjectDN();
                     }
                 }
             }

Modified: 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?view=diff&rev=554666&r1=554665&r2=554666
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
 Mon Jul  9 07:55:22 2007
@@ -121,6 +121,7 @@
             client.getServiceContext().setProperty(RAMPART_POLICY, 
issuerPolicy);
             client.getOptions().setSoapVersionURI(this.soapVersion); 
             client.engageModule("addressing");
+            client.engageModule("rampart");
 
             //Process the STS and service policy policy
             this.processPolicy(issuerPolicy, servicePolicy);

Modified: 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?view=diff&rev=554666&r1=554665&r2=554666
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
 Mon Jul  9 07:55:22 2007
@@ -280,7 +280,11 @@
             
         }
         
+        param.setName(SAML_ISSUER_CONFIG.getLocalPart());
         param.setParameterElement(paramElem);
+        param.setValue(paramElem);
+        param.setParameterType(Parameter.OM_PARAMETER);
+        
         return param;
     }