svn commit: r809009 - in /webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas: TrustUtil.java impl/SAMLTokenIssuer.java

[nandana]

Author: nandana
Date: Fri Aug 28 19:54:48 2009
New Revision: 809009

URL: http://svn.apache.org/viewvc?rev=809009&view=rev
Log:
RAMPART-249 Applying the patch. Thanks Prabath

Modified:
    
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
    
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java

Modified: 
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java?rev=809009&r1=809008&r2=809009&view=diff
==============================================================================
--- 
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
 (original)
+++ 
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
 Fri Aug 28 19:54:48 2009
@@ -239,6 +239,65 @@
                 ((Element) parent).getOwnerDocument(), refUri, refValueType));
         return elem;
     }
+    
+    /**
+        * Create and add wst:AttachedReference element
+        * 
+        * @param rstrElem
+        *            wst:RequestSecurityToken element
+        * @param id
+        *            Token identifier
+        * @throws TrustException
+        */
+    public static void createRequestedAttachedRef(OMElement rstrElem, String 
id, int version)
+                       throws TrustException {
+               OMFactory fac = null;
+               OMElement rar = null;
+               OMElement str = null;
+               OMElement ki = null;
+
+               String ns = TrustUtil.getWSTNamespace(version);
+               fac = rstrElem.getOMFactory();
+               rar = fac.createOMElement(new QName(ns,
+                               
RahasConstants.IssuanceBindingLocalNames.REQUESTED_ATTACHED_REFERENCE,
+                               RahasConstants.WST_PREFIX), rstrElem);
+               str = fac.createOMElement(new QName(WSConstants.WSSE_NS,
+                               
SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_PREFIX), rar);
+               ki = fac.createOMElement(new QName(WSConstants.WSSE_NS, 
"KeyIdentifier",
+                               WSConstants.WSSE_PREFIX), str);
+               ki.addAttribute("ValueType", 
WSConstants.WSS_SAML_KI_VALUE_TYPE, null);
+               ki.setText(id);
+       }
+
+       /**
+        * Create and add wst:UnattachedReference element
+        * 
+        * @param rstrElem
+        *            wst:RequestSecurityToken element
+        * @param id
+        *            Token identifier
+        * @throws TrustException
+        */
+       public static void createRequestedUnattachedRef(OMElement rstrElem, 
String id, int version)
+                       throws TrustException {
+               OMFactory fac = null;
+               OMElement rar = null;
+               OMElement str = null;
+               OMElement ki = null;
+
+               String ns = TrustUtil.getWSTNamespace(version);
+               fac = rstrElem.getOMFactory();
+               rar = fac.createOMElement(new QName(ns,
+                               
RahasConstants.IssuanceBindingLocalNames.REQUESTED_UNATTACHED_REFERENCE,
+                               RahasConstants.WST_PREFIX), rstrElem);
+               str = fac.createOMElement(new QName(WSConstants.WSSE_NS,
+                               
SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_PREFIX), rar);
+               ki = fac.createOMElement(new QName(WSConstants.WSSE_NS, 
"KeyIdentifier",
+                               WSConstants.WSSE_PREFIX), str);
+
+               ki.addAttribute("ValueType", 
WSConstants.WSS_SAML_KI_VALUE_TYPE, null);
+               ki.setText(id);
+       }
 
     public static OMElement createKeySizeElement(int version,
                                                  OMElement parent,

Modified: 
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=809009&r1=809008&r2=809009&view=diff
==============================================================================
--- 
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
 (original)
+++ 
webservices/rampart/branches/java/1_5/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
 Fri Aug 28 19:54:48 2009
@@ -187,13 +187,11 @@
             }
 
             if (config.addRequestedAttachedRef) {
-                TrustUtil.createRequestedAttachedRef(wstVersion, rstrElem, "#"
-                        + assertion.getId(), RahasConstants.TOK_TYPE_SAML_10);
+               TrustUtil.createRequestedAttachedRef(rstrElem, 
assertion.getId(),wstVersion);
             }
 
             if (config.addRequestedUnattachedRef) {
-                TrustUtil.createRequestedUnattachedRef(wstVersion, rstrElem,
-                        assertion.getId(), RahasConstants.TOK_TYPE_SAML_10);
+               TrustUtil.createRequestedUnattachedRef(rstrElem, 
assertion.getId(),wstVersion);   
             }
 
             if (data.getAppliesToAddress() != null) {