Author: mageshbk(a)jboss.com
Date: 2008-09-25 21:14:04 -0400 (Thu, 25 Sep 2008)
New Revision: 8235
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java
Log:
[JBWS-1188]-Relax requirement for wsu:id for UsernameToken
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java 2008-09-25
15:29:21 UTC (rev 8234)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java 2008-09-26
01:14:04 UTC (rev 8235)
@@ -61,11 +61,9 @@
{
this.doc = element.getOwnerDocument();
String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID);
- if (id == null || id.length() == 0)
- throw new WSSecurityException("Invalid message, Timestamp is missing an
id");
+ if (id != null && id.length() > 0)
+ this.id = id;
- this.id = id;
-
Element child = Util.getFirstChildElement(element);
if (child == null || !Constants.WSU_NS.equals(child.getNamespaceURI()) ||
!"Created".equals(child.getLocalName()))
throw new WSSecurityException("Created child expected in Timestamp
element");
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-09-25
15:29:21 UTC (rev 8234)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-09-26
01:14:04 UTC (rev 8235)
@@ -69,11 +69,9 @@
{
this.doc = element.getOwnerDocument();
String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID);
- if (id == null || id.length() == 0)
- throw new WSSecurityException("Invalid message, UsernameToken is missing an
id");
+ if (id != null && id.length() > 0)
+ setId(id);
- setId(id);
-
Element child = Util.getFirstChildElement(element);
if (child == null || ! Constants.WSSE_NS.equals(child.getNamespaceURI()) || !
"Username".equals(child.getLocalName()))
throw new WSSecurityException("Username child expected in UsernameToken
element");
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java 2008-09-25
15:29:21 UTC (rev 8234)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java 2008-09-26
01:14:04 UTC (rev 8235)
@@ -50,11 +50,9 @@
super(element.getOwnerDocument());
String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID);
- if (id == null || id.length() == 0)
- throw new WSSecurityException("Invalid message, BinarySecurityToken is
missing an id");
+ if (id != null && id.length() > 0)
+ setId(id);
- setId(id);
-
if (!
Constants.BASE64_ENCODING_TYPE.equals(element.getAttribute("EncodingType")))
throw new WSSecurityException("Invalid encoding type (only base64 is
supported) for token:" + id);
Show replies by date