You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/07/10 17:17:30 UTC
svn commit: r1690274 -
/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
Author: coheigea
Date: Fri Jul 10 15:17:29 2015
New Revision: 1690274
URL: http://svn.apache.org/r1690274
Log:
[WSS-546] - Support sp11:WssX509V1Token10 in the policy model
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java?rev=1690274&r1=1690273&r2=1690274&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java Fri Jul 10 15:17:29 2015
@@ -21,14 +21,17 @@ package org.apache.wss4j.policy.model;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.wss4j.policy.SPConstants;
+import org.apache.wss4j.policy.SPConstants.SPVersion;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
+
import java.util.*;
public class X509Token extends AbstractToken {
public enum TokenType {
+ WssX509V1Token10,
WssX509V3Token10,
WssX509Pkcs7Token10,
WssX509PkiPathV1Token10,
@@ -36,7 +39,7 @@ public class X509Token extends AbstractT
WssX509V3Token11,
WssX509Pkcs7Token11,
WssX509PkiPathV1Token11;
-
+
private static final Map<String, TokenType> lookup = new HashMap<String, TokenType>();
static {
@@ -97,6 +100,9 @@ public class X509Token extends AbstractT
if (x509Token.getTokenType() != null) {
throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
}
+ if (TokenType.WssX509V1Token10 == tokenType && SPVersion.SP11 != getVersion()) {
+ throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
+ }
x509Token.setTokenType(tokenType);
continue;
}