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 2013/10/18 13:26:25 UTC
svn commit: r1533393 - in /webservices/wss4j/trunk:
ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/
ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/
ws-security-stax/src/main/java/org/apache/w...
Author: coheigea
Date: Fri Oct 18 11:26:24 2013
New Revision: 1533393
URL: http://svn.apache.org/r1533393
Log:
Some fixes for SPNEGO policy validation
Removed:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SpnegoContextTokenSecurityEvent.java
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/LayoutAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/WSSecurityEventConstants.java
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/LayoutAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/LayoutAssertionState.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/LayoutAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/LayoutAssertionState.java Fri Oct 18 11:26:24 2013
@@ -45,7 +45,6 @@ public class LayoutAssertionState extend
WSSecurityEventConstants.IssuedToken,
SecurityEventConstants.X509Token,
WSSecurityEventConstants.KerberosToken,
- WSSecurityEventConstants.SpnegoContextToken,
WSSecurityEventConstants.SecurityContextToken,
WSSecurityEventConstants.SamlToken,
WSSecurityEventConstants.RelToken,
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java Fri Oct 18 11:26:24 2013
@@ -25,7 +25,7 @@ import org.apache.wss4j.policy.model.Spn
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.securityToken.SecurityToken;
-import org.apache.wss4j.stax.securityEvent.SpnegoContextTokenSecurityEvent;
+import org.apache.wss4j.stax.securityEvent.SecurityContextTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
/**
@@ -41,19 +41,19 @@ public class SpnegoContextTokenAssertion
@Override
public SecurityEventConstants.Event[] getSecurityEventType() {
return new SecurityEventConstants.Event[]{
- WSSecurityEventConstants.SpnegoContextToken
+ WSSecurityEventConstants.SecurityContextToken
};
}
@Override
public boolean assertToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent,
AbstractToken abstractToken) throws WSSPolicyException {
- if (!(tokenSecurityEvent instanceof SpnegoContextTokenSecurityEvent)) {
- throw new WSSPolicyException("Expected a SpnegoContextTokenSecurityEvent but got " + tokenSecurityEvent.getClass().getName());
+ if (!(tokenSecurityEvent instanceof SecurityContextTokenSecurityEvent)) {
+ throw new WSSPolicyException("Expected a SecurityContextTokenSecurityEvent but got " + tokenSecurityEvent.getClass().getName());
}
SpnegoContextToken spnegoContextToken = (SpnegoContextToken) abstractToken;
- SpnegoContextTokenSecurityEvent spnegoContextTokenSecurityEvent = (SpnegoContextTokenSecurityEvent) tokenSecurityEvent;
+ SecurityContextTokenSecurityEvent spnegoContextTokenSecurityEvent = (SecurityContextTokenSecurityEvent) tokenSecurityEvent;
if (spnegoContextToken.getIssuerName() != null
&& !spnegoContextToken.getIssuerName().equals(spnegoContextTokenSecurityEvent.getIssuerName())) {
setErrorMessage("IssuerName in Policy (" + spnegoContextToken.getIssuerName() + ") didn't match with the one in the IssuedToken (" + spnegoContextTokenSecurityEvent.getIssuerName() + ")");
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java Fri Oct 18 11:26:24 2013
@@ -65,7 +65,6 @@ public class TokenProtectionAssertionSta
WSSecurityEventConstants.RelToken,
WSSecurityEventConstants.SamlToken,
WSSecurityEventConstants.SecurityContextToken,
- WSSecurityEventConstants.SpnegoContextToken,
WSSecurityEventConstants.UsernameToken,
SecurityEventConstants.X509Token,
WSSecurityEventConstants.Operation,
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java Fri Oct 18 11:26:24 2013
@@ -24,7 +24,7 @@ import org.apache.wss4j.stax.securityTok
import org.apache.wss4j.stax.impl.securityToken.X509SecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.wss4j.stax.securityEvent.SpnegoContextTokenSecurityEvent;
+import org.apache.wss4j.stax.securityEvent.SecurityContextTokenSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
@@ -70,14 +70,14 @@ public class SpnegoContextTokenTest exte
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- SpnegoContextTokenSecurityEvent initiatorTokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ SecurityContextTokenSecurityEvent initiatorTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
- SpnegoContextTokenSecurityEvent recipientTokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ SecurityContextTokenSecurityEvent recipientTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java Fri Oct 18 11:26:24 2013
@@ -727,14 +727,14 @@ public class SupportingTokensTest extend
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- SpnegoContextTokenSecurityEvent tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ SecurityContextTokenSecurityEvent tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("CN=transmitter,OU=swssf,C=CH");
X509SecurityTokenImpl x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
tokenSecurityEvent.setSecurityToken(x509SecurityToken);
policyEnforcer.registerSecurityEvent(tokenSecurityEvent);
- tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("CN=transmitter,OU=swssf,C=CH");
x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
@@ -762,14 +762,14 @@ public class SupportingTokensTest extend
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- SpnegoContextTokenSecurityEvent tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ SecurityContextTokenSecurityEvent tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("test");
X509SecurityTokenImpl x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
tokenSecurityEvent.setSecurityToken(x509SecurityToken);
policyEnforcer.registerSecurityEvent(tokenSecurityEvent);
- tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("test");
x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
@@ -801,14 +801,14 @@ public class SupportingTokensTest extend
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- SpnegoContextTokenSecurityEvent tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ SecurityContextTokenSecurityEvent tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("CN=transmitter,OU=swssf,C=CH");
X509SecurityTokenImpl x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
tokenSecurityEvent.setSecurityToken(x509SecurityToken);
policyEnforcer.registerSecurityEvent(tokenSecurityEvent);
- tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("test");
x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
@@ -836,14 +836,14 @@ public class SupportingTokensTest extend
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- SpnegoContextTokenSecurityEvent tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ SecurityContextTokenSecurityEvent tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("test");
X509SecurityTokenImpl x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
tokenSecurityEvent.setSecurityToken(x509SecurityToken);
policyEnforcer.registerSecurityEvent(tokenSecurityEvent);
- tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
+ tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
tokenSecurityEvent.setIssuerName("CN=transmitter,OU=swssf,C=CH");
x509SecurityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
x509SecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_SupportingTokens);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java Fri Oct 18 11:26:24 2013
@@ -481,8 +481,6 @@ public class WSSUtils extends XMLSecurit
tokenSecurityEvent = new UsernameTokenSecurityEvent();
} else if (WSSecurityTokenConstants.KerberosToken.equals(tokenType)) {
tokenSecurityEvent = new KerberosTokenSecurityEvent();
- } else if (WSSecurityTokenConstants.SpnegoContextToken.equals(tokenType)) {
- tokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
} else if (WSSecurityTokenConstants.SecurityContextToken.equals(tokenType)) {
tokenSecurityEvent = new SecurityContextTokenSecurityEvent();
} else if (WSSecurityTokenConstants.Saml10Token.equals(tokenType) ||
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/WSSecurityEventConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/WSSecurityEventConstants.java?rev=1533393&r1=1533392&r2=1533393&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/WSSecurityEventConstants.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/WSSecurityEventConstants.java Fri Oct 18 11:26:24 2013
@@ -31,7 +31,6 @@ public abstract class WSSecurityEventCon
public static final Event RequiredPart = new Event("RequiredPart");
public static final Event IssuedToken = new Event("IssuedToken");
public static final Event KerberosToken = new Event("KerberosToken");
- public static final Event SpnegoContextToken = new Event("SpnegoContextToken");
public static final Event SamlToken = new Event("SamlToken");
public static final Event SecurityContextToken = new Event("SecurityContextToken");
public static final Event RelToken = new Event("RelToken");