Author: ruchithf
Date: Sun Oct 1 01:53:29 2006
New Revision: 451726
URL: http://svn.apache.org/viewvc?view=rev&rev=451726
Log:
The WSDerivedKeyTokenPrincipal should hold the id of the base token
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java?view=diff&rev=451726&r1=451725&r2=451726
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/WSDerivedKeyTokenPrincipal.java
Sun Oct 1 01:53:29 2006
@@ -33,6 +33,7 @@
private String label;
private int length;
private int offset;
+ private String basetokenId;
public String getLabel() {
return label;
@@ -72,6 +73,14 @@
public void setNonce(String nonce) {
this.nonce = nonce;
+ }
+
+ public String getBasetokenId() {
+ return basetokenId;
+ }
+
+ public void setBasetokenId(String basetokenId) {
+ this.basetokenId = basetokenId;
}
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java?view=diff&rev=451726&r1=451725&r2=451726
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Sun Oct 1 01:53:29 2006
@@ -320,6 +320,8 @@
principal.setLabel(dkt.getLabel());
principal.setLength(dkt.getLength());
principal.setOffset(dkt.getOffset());
+ String basetokenId =
dkt.getSecuityTokenReference().getReference().getURI().substring(1);
+ principal.setBasetokenId(basetokenId);
return principal;
} else {
throw new WSSecurityException("Cannot determine
principal");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
