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/09/15 11:58:49 UTC
svn commit: r446563 -
/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/SymmetricBindingBuilder.java
Author: ruchithf
Date: Fri Sep 15 02:58:48 2006
New Revision: 446563
URL: http://svn.apache.org/viewvc?view=rev&rev=446563
Log:
Added server side symetric binding processing
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/SymmetricBindingBuilder.java
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/SymmetricBindingBuilder.java?view=diff&rev=446563&r1=446562&r2=446563
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/SymmetricBindingBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/builder/SymmetricBindingBuilder.java Fri Sep 15 02:58:48 2006
@@ -167,22 +167,32 @@
this.setInsertionLocation(refList);
-// Now add the supporting tokens
- SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
-
- HashMap sigSuppTokMap = this.handleSupportingTokens(rmd, sgndSuppTokens);
+ HashMap sigSuppTokMap = null;
+ HashMap endSuppTokMap = null;
+ HashMap sgndEndSuppTokMap = null;
+ Vector sigParts = RampartUtil.getSignedParts(rmd);
- SupportingToken endSuppTokens = rpd.getEndorsingSupportingTokens();
-
- HashMap endSuppTokMap = this.handleSupportingTokens(rmd, endSuppTokens);
-
- SupportingToken sgndEndSuppTokens = rpd.getSignedEndorsingSupportingTokens();
+ if(rmd.isClientSide()) {
- HashMap sgndEndSuppTokMap = this.handleSupportingTokens(rmd, sgndEndSuppTokens);
-
- //Setup signature parts
- Vector sigParts = addSignatureParts(sigSuppTokMap, rpd.getSignedParts());
- sigParts = addSignatureParts(sgndEndSuppTokMap, sigParts);
+ // Now add the supporting tokens
+ SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
+
+ sigSuppTokMap = this.handleSupportingTokens(rmd, sgndSuppTokens);
+
+ SupportingToken endSuppTokens = rpd.getEndorsingSupportingTokens();
+
+ endSuppTokMap = this.handleSupportingTokens(rmd, endSuppTokens);
+
+ SupportingToken sgndEndSuppTokens = rpd.getSignedEndorsingSupportingTokens();
+
+ sgndEndSuppTokMap = this.handleSupportingTokens(rmd, sgndEndSuppTokens);
+
+ //Setup signature parts
+ sigParts = addSignatureParts(sigSuppTokMap, sigParts);
+ sigParts = addSignatureParts(sgndEndSuppTokMap, sigParts);
+ } else {
+ //TODO: Add sig confirmation
+ }
//Sign the message
//We should use the same key in the case of EncryptBeforeSig
@@ -245,16 +255,18 @@
//TODO : Example SAMLTOken Signature
}
- //Do endorsed signatures
- Vector endSigVals = this.doEndorsedSignatures(rmd, endSuppTokMap);
- for (Iterator iter = endSigVals.iterator(); iter.hasNext();) {
- signatureValues.add(iter.next());
- }
-
- //Do signed endorsing signatures
- Vector sigEndSigVals = this.doEndorsedSignatures(rmd, sgndEndSuppTokMap);
- for (Iterator iter = sigEndSigVals.iterator(); iter.hasNext();) {
- signatureValues.add(iter.next());
+ if(rmd.isClientSide()) {
+ //Do endorsed signatures
+ Vector endSigVals = this.doEndorsedSignatures(rmd, endSuppTokMap);
+ for (Iterator iter = endSigVals.iterator(); iter.hasNext();) {
+ signatureValues.add(iter.next());
+ }
+
+ //Do signed endorsing signatures
+ Vector sigEndSigVals = this.doEndorsedSignatures(rmd, sgndEndSuppTokMap);
+ for (Iterator iter = sigEndSigVals.iterator(); iter.hasNext();) {
+ signatureValues.add(iter.next());
+ }
}
Vector secondEncrParts = new Vector();
@@ -332,25 +344,32 @@
this.setInsertionLocation(sigTokElem);
- Vector sigParts = null;
-
-// Now add the supporting tokens
- SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
-
- HashMap sigSuppTokMap = this.handleSupportingTokens(rmd, sgndSuppTokens);
-
- SupportingToken endSuppTokens = rpd.getEndorsingSupportingTokens();
-
- HashMap endSuppTokMap = this.handleSupportingTokens(rmd, endSuppTokens);
-
- SupportingToken sgndEndSuppTokens = rpd.getSignedEndorsingSupportingTokens();
-
- HashMap sgndEndSuppTokMap = this.handleSupportingTokens(rmd, sgndEndSuppTokens);
- //Setup signature parts
- sigParts = addSignatureParts(sigSuppTokMap, rpd.getSignedParts());
- sigParts = addSignatureParts(sgndEndSuppTokMap, sigParts);
+ HashMap sigSuppTokMap = null;
+ HashMap endSuppTokMap = null;
+ HashMap sgndEndSuppTokMap = null;
+ Vector sigParts = RampartUtil.getSignedParts(rmd);
+ if(rmd.isClientSide()) {
+ // Now add the supporting tokens
+ SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
+
+ sigSuppTokMap = this.handleSupportingTokens(rmd, sgndSuppTokens);
+
+ SupportingToken endSuppTokens = rpd.getEndorsingSupportingTokens();
+
+ endSuppTokMap = this.handleSupportingTokens(rmd, endSuppTokens);
+
+ SupportingToken sgndEndSuppTokens = rpd.getSignedEndorsingSupportingTokens();
+
+ sgndEndSuppTokMap = this.handleSupportingTokens(rmd, sgndEndSuppTokens);
+
+ //Setup signature parts
+ sigParts = addSignatureParts(sigSuppTokMap, rpd.getSignedParts());
+ sigParts = addSignatureParts(sgndEndSuppTokMap, sigParts);
+ } else {
+ //TODO: Add sig confirmation
+ }
//Sign the message
//We should use the same key in the case of EncryptBeforeSig
if(sigToken.isDerivedKeys()) {
@@ -414,18 +433,19 @@
//TODO : Example SAMLTOken Signature
}
- //Do endorsed signatures
- Vector endSigVals = this.doEndorsedSignatures(rmd, endSuppTokMap);
- for (Iterator iter = endSigVals.iterator(); iter.hasNext();) {
- signatureValues.add(iter.next());
- }
-
- //Do signed endorsing signatures
- Vector sigEndSigVals = this.doEndorsedSignatures(rmd, sgndEndSuppTokMap);
- for (Iterator iter = sigEndSigVals.iterator(); iter.hasNext();) {
- signatureValues.add(iter.next());
+ if(rmd.isClientSide()) {
+ //Do endorsed signatures
+ Vector endSigVals = this.doEndorsedSignatures(rmd, endSuppTokMap);
+ for (Iterator iter = endSigVals.iterator(); iter.hasNext();) {
+ signatureValues.add(iter.next());
+ }
+
+ //Do signed endorsing signatures
+ Vector sigEndSigVals = this.doEndorsedSignatures(rmd, sgndEndSuppTokMap);
+ for (Iterator iter = sigEndSigVals.iterator(); iter.hasNext();) {
+ signatureValues.add(iter.next());
+ }
}
-
//Encryption
Token encrToken = rpd.getEncryptionToken();
Element encrTokElem = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org