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 2016/01/14 12:31:53 UTC
svn commit: r1724589 [2/7] - in /webservices/wss4j/branches/2_1_x-fixes:
integration/src/test/java/org/apache/wss4j/integration/test/kerberos/
ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/
ws-security-policy-stax/s...
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java Thu Jan 14 11:31:52 2016
@@ -83,7 +83,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
@@ -162,7 +162,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
@@ -240,7 +240,7 @@ public class TokenProtectionTest extends
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
List<QName> path = new ArrayList<>();
path.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- path.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ path.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
securityToken.setElementPath(path);
securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
@@ -286,7 +286,7 @@ public class TokenProtectionTest extends
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
List<QName> path = new ArrayList<>();
path.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- path.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ path.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
securityToken.setElementPath(path);
securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
@@ -332,7 +332,7 @@ public class TokenProtectionTest extends
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
List<QName> path = new ArrayList<>();
path.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- path.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ path.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
securityToken.setElementPath(path);
securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
@@ -380,7 +380,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<SecurityToken> securityTokens = new LinkedList<>();
@@ -456,7 +456,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
@@ -518,7 +518,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<QName> ekPath = new ArrayList<>();
ekPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
@@ -585,7 +585,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<QName> ekPath = new ArrayList<>();
ekPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
@@ -658,7 +658,7 @@ public class TokenProtectionTest extends
List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
+ bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
List<QName> ekPath = new ArrayList<>();
ekPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java Thu Jan 14 11:31:52 2016
@@ -783,7 +783,7 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
@@ -914,8 +914,8 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
@@ -1034,8 +1034,8 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
@@ -1149,11 +1149,11 @@ public class TransportBindingIntegration
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
outSecurityProperties.setSignatureAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512");
- outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_wsu_Timestamp.getNamespaceURI(), WSSConstants.TAG_wsu_Timestamp.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_WSU_TIMESTAMP.getNamespaceURI(), WSSConstants.TAG_WSU_TIMESTAMP.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_CREATED.getNamespaceURI(), WSSConstants.TAG_WSU_CREATED.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_EXPIRES.getNamespaceURI(), WSSConstants.TAG_WSU_EXPIRES.getLocalPart()), SecurePart.Modifier.Content));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -1267,11 +1267,11 @@ public class TransportBindingIntegration
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
outSecurityProperties.setSignatureCanonicalizationAlgorithm("http://www.w3.org/2006/12/xml-c14n11");
- outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_wsu_Timestamp.getNamespaceURI(), WSSConstants.TAG_wsu_Timestamp.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body , SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_WSU_TIMESTAMP.getNamespaceURI(), WSSConstants.TAG_WSU_TIMESTAMP.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY , SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_CREATED.getNamespaceURI(), WSSConstants.TAG_WSU_CREATED.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_EXPIRES.getNamespaceURI(), WSSConstants.TAG_WSU_EXPIRES.getLocalPart()), SecurePart.Modifier.Content));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -1387,11 +1387,11 @@ public class TransportBindingIntegration
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
outSecurityProperties.setSignatureDigestAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-md5");
- outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_wsu_Timestamp.getNamespaceURI(), WSSConstants.TAG_wsu_Timestamp.getLocalPart()), SecurePart.Modifier.Element, new String[]{WSSConstants.NS_C14N_EXCL}, "http://www.w3.org/2001/04/xmldsig-more#md5"));
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element, new String[]{WSSConstants.NS_C14N_EXCL}, "http://www.w3.org/2001/04/xmldsig-more#md5"));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_WSU_TIMESTAMP.getNamespaceURI(), WSSConstants.TAG_WSU_TIMESTAMP.getLocalPart()), SecurePart.Modifier.Element, new String[]{WSSConstants.NS_C14N_EXCL}, "http://www.w3.org/2001/04/xmldsig-more#md5"));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Element, new String[]{WSSConstants.NS_C14N_EXCL}, "http://www.w3.org/2001/04/xmldsig-more#md5"));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_CREATED.getNamespaceURI(), WSSConstants.TAG_WSU_CREATED.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_EXPIRES.getNamespaceURI(), WSSConstants.TAG_WSU_EXPIRES.getLocalPart()), SecurePart.Modifier.Content));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -1509,11 +1509,11 @@ public class TransportBindingIntegration
outSecurityProperties.setSignatureUser("transmitter");
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_wsu_Timestamp.getNamespaceURI(), WSSConstants.TAG_wsu_Timestamp.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_WSU_TIMESTAMP.getNamespaceURI(), WSSConstants.TAG_WSU_TIMESTAMP.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_CREATED.getNamespaceURI(), WSSConstants.TAG_WSU_CREATED.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_EXPIRES.getNamespaceURI(), WSSConstants.TAG_WSU_EXPIRES.getLocalPart()), SecurePart.Modifier.Content));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -1626,11 +1626,11 @@ public class TransportBindingIntegration
outSecurityProperties.setSignatureUser("transmitter");
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_wsu_Timestamp.getNamespaceURI(), WSSConstants.TAG_wsu_Timestamp.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap12_Body, SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap12_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(new QName(WSSConstants.TAG_WSU_TIMESTAMP.getNamespaceURI(), WSSConstants.TAG_WSU_TIMESTAMP.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP12_ROLEBody, SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_CREATED.getNamespaceURI(), WSSConstants.TAG_WSU_CREATED.getLocalPart()), SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_EXPIRES.getNamespaceURI(), WSSConstants.TAG_WSU_EXPIRES.getLocalPart()), SecurePart.Modifier.Content));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP12_ROLEBody, SecurePart.Modifier.Content));
WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, WSSConstants.ENCRYPT};
outSecurityProperties.setActions(actions);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java Thu Jan 14 11:31:52 2016
@@ -58,7 +58,7 @@ public class TransportBindingTest extend
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- headerPath.add(WSSConstants.TAG_wsu_Timestamp);
+ headerPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
@@ -85,7 +85,7 @@ public class TransportBindingTest extend
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ headerPath.add(WSSConstants.TAG_WSSE11_SIG_CONF);
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
@@ -154,7 +154,7 @@ public class TransportBindingTest extend
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- headerPath.add(WSSConstants.TAG_wsu_Timestamp);
+ headerPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
@@ -201,7 +201,7 @@ public class TransportBindingTest extend
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- headerPath.add(WSSConstants.TAG_wsu_Timestamp);
+ headerPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
@@ -224,7 +224,7 @@ public class TransportBindingTest extend
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ headerPath.add(WSSConstants.TAG_WSSE11_SIG_CONF);
encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java Thu Jan 14 11:31:52 2016
@@ -63,9 +63,9 @@ public class VulnerabliltyVectorsTest ex
outSecurityProperties.setSignatureUser("transmitter");
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_wsu_Timestamp, SecurePart.Modifier.Element));
- outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
- outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_WSU_TIMESTAMP, SecurePart.Modifier.Element));
+ outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Element));
+ outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content));
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -114,7 +114,7 @@ public class VulnerabliltyVectorsTest ex
Element soapEnvElement = (Element) bodyElement.getParentNode();
soapEnvElement.removeChild(bodyElement);
- Element newBody = securedDocument.createElementNS(WSSConstants.NS_SOAP11, WSSConstants.TAG_soap_Body_LocalName);
+ Element newBody = securedDocument.createElementNS(WSSConstants.NS_SOAP11, WSSConstants.TAG_SOAP_BODY_LN);
Element operationElement = securedDocument.createElementNS("http://schemas.xmlsoap.org/wsdl/", "definitions");
newBody.appendChild(operationElement);
soapEnvElement.appendChild(newBody);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java Thu Jan 14 11:31:52 2016
@@ -58,83 +58,87 @@ public class WSSConstants extends XMLSec
public static final String NS_SAML2 = "urn:oasis:names:tc:SAML:2.0:assertion";
public static final String PREFIX_SOAPENV = "soap";
- public static final String TAG_soap_Envelope_LocalName = "Envelope";
- public static final String TAG_soap_Header_LocalName = "Header";
- public static final String TAG_soap_Body_LocalName = "Body";
-
- public static final QName TAG_soap11_Envelope = new QName(NS_SOAP11, TAG_soap_Envelope_LocalName, PREFIX_SOAPENV);
- public static final QName TAG_soap11_Header = new QName(NS_SOAP11, TAG_soap_Header_LocalName, PREFIX_SOAPENV);
- public static final QName TAG_soap11_Body = new QName(NS_SOAP11, TAG_soap_Body_LocalName, PREFIX_SOAPENV);
- public static final QName ATT_soap11_Actor = new QName(NS_SOAP11, "actor", PREFIX_SOAPENV);
- public static final QName ATT_soap11_MustUnderstand = new QName(NS_SOAP11, "mustUnderstand", PREFIX_SOAPENV);
-
- public static final QName TAG_soap12_Envelope = new QName(NS_SOAP12, TAG_soap_Envelope_LocalName, PREFIX_SOAPENV);
- public static final QName TAG_soap12_Header = new QName(NS_SOAP12, TAG_soap_Header_LocalName, PREFIX_SOAPENV);
- public static final QName TAG_soap12_Body = new QName(NS_SOAP12, TAG_soap_Body_LocalName, PREFIX_SOAPENV);
- public static final QName ATT_soap12_Role = new QName(NS_SOAP12, "role", PREFIX_SOAPENV);
- public static final QName ATT_soap12_MustUnderstand = new QName(NS_SOAP12, "mustUnderstand", PREFIX_SOAPENV);
+ public static final String TAG_SOAP_ENVELOPE_LN = "Envelope";
+ public static final String TAG_SOAP_HEADER_LN = "Header";
+ public static final String TAG_SOAP_BODY_LN = "Body";
+
+ public static final QName TAG_SOAP11_ENVELOPE = new QName(NS_SOAP11, TAG_SOAP_ENVELOPE_LN, PREFIX_SOAPENV);
+ public static final QName TAG_SOAP11_HEADER = new QName(NS_SOAP11, TAG_SOAP_HEADER_LN, PREFIX_SOAPENV);
+ public static final QName TAG_SOAP11_BODY = new QName(NS_SOAP11, TAG_SOAP_BODY_LN, PREFIX_SOAPENV);
+ public static final QName ATT_SOAP11_ACTOR = new QName(NS_SOAP11, "actor", PREFIX_SOAPENV);
+ public static final QName ATT_SOAP11_MUST_UNDERSTAND = new QName(NS_SOAP11, "mustUnderstand", PREFIX_SOAPENV);
+
+ public static final QName TAG_SOAP12_ENVELOPE = new QName(NS_SOAP12, TAG_SOAP_ENVELOPE_LN, PREFIX_SOAPENV);
+ public static final QName TAG_SOAP12_HEADER = new QName(NS_SOAP12, TAG_SOAP_HEADER_LN, PREFIX_SOAPENV);
+ public static final QName TAG_SOAP12_BODY = new QName(NS_SOAP12, TAG_SOAP_BODY_LN, PREFIX_SOAPENV);
+ public static final QName ATT_SOAP12_ROLE = new QName(NS_SOAP12, "role", PREFIX_SOAPENV);
+ public static final QName ATT_SOAP12_MUST_UNDERSTAND = new QName(NS_SOAP12, "mustUnderstand", PREFIX_SOAPENV);
public static final String PREFIX_WSSE = "wsse";
public static final String PREFIX_WSSE11 = "wsse11";
- public static final QName TAG_wsse_Security = new QName(NS_WSSE10, "Security", PREFIX_WSSE);
+ public static final QName TAG_WSSE_SECURITY = new QName(NS_WSSE10, "Security", PREFIX_WSSE);
- public static final QName TAG_wsse_SecurityTokenReference = new QName(NS_WSSE10, "SecurityTokenReference", PREFIX_WSSE);
- public static final QName TAG_wsse_Reference = new QName(NS_WSSE10, "Reference", PREFIX_WSSE);
- public static final QName ATT_wsse_Usage = new QName(NS_WSSE10, "Usage", PREFIX_WSSE);
- public static final QName ATT_wsse11_TokenType = new QName(NS_WSSE11, "TokenType", PREFIX_WSSE11);
-
- public static final QName TAG_wsse_KeyIdentifier = new QName(NS_WSSE10, "KeyIdentifier", PREFIX_WSSE);
- public static final QName ATT_NULL_EncodingType = new QName(null, "EncodingType");
- public static final QName ATT_NULL_ValueType = new QName(null, "ValueType");
+ public static final QName TAG_WSSE_SECURITY_TOKEN_REFERENCE = new QName(NS_WSSE10, "SecurityTokenReference", PREFIX_WSSE);
+ public static final QName TAG_WSSE_REFERENCE = new QName(NS_WSSE10, "Reference", PREFIX_WSSE);
+ public static final QName ATT_WSSE_USAGE = new QName(NS_WSSE10, "Usage", PREFIX_WSSE);
+ public static final QName ATT_WSSE11_TOKEN_TYPE = new QName(NS_WSSE11, "TokenType", PREFIX_WSSE11);
+
+ public static final QName TAG_WSSE_KEY_IDENTIFIER = new QName(NS_WSSE10, "KeyIdentifier", PREFIX_WSSE);
+ public static final QName ATT_NULL_ENCODING_TYPE = new QName(null, "EncodingType");
+ public static final QName ATT_NULL_VALUE_TYPE = new QName(null, "ValueType");
- public static final QName TAG_wsse_BinarySecurityToken = new QName(NS_WSSE10, "BinarySecurityToken", PREFIX_WSSE);
+ public static final QName TAG_WSSE_BINARY_SECURITY_TOKEN = new QName(NS_WSSE10, "BinarySecurityToken", PREFIX_WSSE);
public static final String PREFIX_WSU = "wsu";
- public static final QName ATT_wsu_Id = new QName(NS_WSU10, "Id", PREFIX_WSU);
+ public static final QName ATT_WSU_ID = new QName(NS_WSU10, "Id", PREFIX_WSU);
- public static final QName TAG_wsse11_EncryptedHeader = new QName(NS_WSSE11, "EncryptedHeader", PREFIX_WSSE11);
+ public static final QName TAG_WSSE11_ENCRYPTED_HEADER = new QName(NS_WSSE11, "EncryptedHeader", PREFIX_WSSE11);
- public static final QName TAG_wsse_TransformationParameters = new QName(NS_WSSE10, "TransformationParameters", PREFIX_WSSE);
+ public static final QName TAG_WSSE_TRANSFORMATION_PARAMETERS = new QName(NS_WSSE10, "TransformationParameters", PREFIX_WSSE);
- public static final QName TAG_wsu_Timestamp = new QName(NS_WSU10, "Timestamp", PREFIX_WSU);
- public static final QName TAG_wsu_Created = new QName(NS_WSU10, "Created", PREFIX_WSU);
- public static final QName TAG_wsu_Expires = new QName(NS_WSU10, "Expires", PREFIX_WSU);
+ public static final QName TAG_WSU_TIMESTAMP = new QName(NS_WSU10, "Timestamp", PREFIX_WSU);
+ public static final QName TAG_WSU_CREATED = new QName(NS_WSU10, "Created", PREFIX_WSU);
+ public static final QName TAG_WSU_EXPIRES = new QName(NS_WSU10, "Expires", PREFIX_WSU);
- public static final String NS10_SOAPMESSAGE_SECURITY = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0";
- public static final String NS11_SOAPMESSAGE_SECURITY = "http://docs.oasis-open.org/wss/oasis-wss-soap-message-security-1.1";
+ public static final String NS10_SOAPMESSAGE_SECURITY =
+ "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0";
+ public static final String NS11_SOAPMESSAGE_SECURITY =
+ "http://docs.oasis-open.org/wss/oasis-wss-soap-message-security-1.1";
- public static final String NS_X509TOKEN_PROFILE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0";
+ public static final String NS_X509TOKEN_PROFILE =
+ "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0";
public static final String NS_X509_V3_TYPE = NS_X509TOKEN_PROFILE + "#X509v3";
public static final String NS_X509PKIPathv1 = NS_X509TOKEN_PROFILE + "#X509PKIPathv1";
- public static final String NS_X509SubjectKeyIdentifier = NS_X509TOKEN_PROFILE + "#X509SubjectKeyIdentifier";
+ public static final String NS_X509_SKI = NS_X509TOKEN_PROFILE + "#X509SubjectKeyIdentifier";
public static final String NS_THUMBPRINT = NS11_SOAPMESSAGE_SECURITY + "#ThumbprintSHA1";
public static final String NS_ENCRYPTED_KEY_SHA1 = NS11_SOAPMESSAGE_SECURITY + "#EncryptedKeySHA1";
public static final String SOAPMESSAGE_NS10_BASE64_ENCODING = NS10_SOAPMESSAGE_SECURITY + "#Base64Binary";
- public static final QName TAG_wsse_UsernameToken = new QName(NS_WSSE10, "UsernameToken", PREFIX_WSSE);
- public static final QName TAG_wsse_Username = new QName(NS_WSSE10, "Username", PREFIX_WSSE);
- public static final QName TAG_wsse_Password = new QName(NS_WSSE10, "Password", PREFIX_WSSE);
- public static final QName TAG_wsse_Nonce = new QName(NS_WSSE10, "Nonce", PREFIX_WSSE);
- public static final QName TAG_wsse11_Salt = new QName(NS_WSSE11, "Salt", PREFIX_WSSE11);
- public static final QName TAG_wsse11_Iteration = new QName(NS_WSSE11, "Iteration", PREFIX_WSSE11);
+ public static final QName TAG_WSSE_USERNAME_TOKEN = new QName(NS_WSSE10, "UsernameToken", PREFIX_WSSE);
+ public static final QName TAG_WSSE_USERNAME = new QName(NS_WSSE10, "Username", PREFIX_WSSE);
+ public static final QName TAG_WSSE_PASSWORD = new QName(NS_WSSE10, "Password", PREFIX_WSSE);
+ public static final QName TAG_WSSE_NONCE = new QName(NS_WSSE10, "Nonce", PREFIX_WSSE);
+ public static final QName TAG_WSSE11_SALT = new QName(NS_WSSE11, "Salt", PREFIX_WSSE11);
+ public static final QName TAG_WSSE11_ITERATION = new QName(NS_WSSE11, "Iteration", PREFIX_WSSE11);
- public static final String NS_USERNAMETOKEN_PROFILE11 = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0";
+ public static final String NS_USERNAMETOKEN_PROFILE11 =
+ "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0";
public static final String NS_PASSWORD_DIGEST = NS_USERNAMETOKEN_PROFILE11 + "#PasswordDigest";
public static final String NS_PASSWORD_TEXT = NS_USERNAMETOKEN_PROFILE11 + "#PasswordText";
- public static final String NS_USERNAMETOKEN_PROFILE_UsernameToken = NS_USERNAMETOKEN_PROFILE11 + "#UsernameToken";
+ public static final String NS_USERNAMETOKEN_PROFILE_USERNAME_TOKEN = NS_USERNAMETOKEN_PROFILE11 + "#UsernameToken";
- public static final QName TAG_wsse11_SignatureConfirmation = new QName(NS_WSSE11, "SignatureConfirmation", PREFIX_WSSE11);
- public static final QName ATT_NULL_Value = new QName(null, "Value");
+ public static final QName TAG_WSSE11_SIG_CONF = new QName(NS_WSSE11, "SignatureConfirmation", PREFIX_WSSE11);
+ public static final QName ATT_NULL_VALUE = new QName(null, "Value");
public static final String NS_C14N_EXCL = "http://www.w3.org/2001/10/xml-exc-c14n#";
public static final String PREFIX_C14N_EXCL = "c14nEx";
- public static final QName TAG_wst_BinarySecret = new QName(NS_WST, "BinarySecret");
- public static final QName TAG_wst0512_BinarySecret = new QName(NS_WST_05_12, "BinarySecret");
+ public static final QName TAG_WST_BINARY_SECRET = new QName(NS_WST, "BinarySecret");
+ public static final QName TAG_WST0512_BINARY_SECRET = new QName(NS_WST_05_12, "BinarySecret");
- public static final String SOAPMESSAGE_NS10_STRTransform = NS10_SOAPMESSAGE_SECURITY + "#STR-Transform";
+ public static final String SOAPMESSAGE_NS10_STR_TRANSFORM = NS10_SOAPMESSAGE_SECURITY + "#STR-Transform";
public static final String SWA_ATTACHMENT_CONTENT_SIG_TRANS =
"http://docs.oasis-open.org/wss/oasis-wss-SwAProfile-1.1#Attachment-Content-Signature-Transform";
public static final String SWA_ATTACHMENT_COMPLETE_SIG_TRANS =
@@ -146,9 +150,9 @@ public class WSSConstants extends XMLSec
public static final String SWA_ATTACHMENT_ENCRYPTED_DATA_TYPE_COMPLETE =
"http://docs.oasis-open.org/wss/oasis-wss-SwAProfile-1.1#Attachment-Complete";
- public static final QName TAG_saml_Assertion = new QName(NS_SAML, "Assertion");
- public static final QName TAG_saml2_Assertion = new QName(NS_SAML2, "Assertion");
- public static final QName TAG_saml2_EncryptedAssertion = new QName(NS_SAML2, "EncryptedAssertion");
+ public static final QName TAG_SAML_ASSERTION = new QName(NS_SAML, "Assertion");
+ public static final QName TAG_SAML2_ASSERTION = new QName(NS_SAML2, "Assertion");
+ public static final QName TAG_SAML2_ENCRYPTED_ASSERTION = new QName(NS_SAML2, "EncryptedAssertion");
public static final String NS_SAML10_TOKEN_PROFILE = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.0";
public static final String NS_SAML11_TOKEN_PROFILE = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1";
@@ -158,16 +162,16 @@ public class WSSConstants extends XMLSec
public static final String NS_SAML20_TOKEN_PROFILE_TYPE = NS_SAML11_TOKEN_PROFILE + "#SAMLV2.0";
public static final String NS_KERBEROS11_TOKEN_PROFILE = "http://docs.oasis-open.org/wss/oasis-wss-kerberos-token-profile-1.1#";
- public static final String NS_GSS_Kerberos5_AP_REQ = NS_KERBEROS11_TOKEN_PROFILE + "GSS_Kerberosv5_AP_REQ";
- public static final String NS_GSS_Kerberos5_AP_REQ1510 = NS_KERBEROS11_TOKEN_PROFILE + "GSS_Kerberosv5_AP_REQ1510";
- public static final String NS_GSS_Kerberos5_AP_REQ4120 = NS_KERBEROS11_TOKEN_PROFILE + "GSS_Kerberosv5_AP_REQ4120";
- public static final String NS_Kerberos5_AP_REQ = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5_AP_REQ";
- public static final String NS_Kerberos5_AP_REQ_SHA1 = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5APREQSHA1";
- public static final String NS_Kerberos5_AP_REQ1510 = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5_AP_REQ1510";
- public static final String NS_Kerberos5_AP_REQ4120 = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5_AP_REQ4120";
+ public static final String NS_GSS_KERBEROS5_AP_REQ = NS_KERBEROS11_TOKEN_PROFILE + "GSS_Kerberosv5_AP_REQ";
+ public static final String NS_GSS_KERBEROS5_AP_REQ1510 = NS_KERBEROS11_TOKEN_PROFILE + "GSS_Kerberosv5_AP_REQ1510";
+ public static final String NS_GSS_KERBEROS5_AP_REQ4120 = NS_KERBEROS11_TOKEN_PROFILE + "GSS_Kerberosv5_AP_REQ4120";
+ public static final String NS_KERBEROS5_AP_REQ = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5_AP_REQ";
+ public static final String NS_KERBEROS5_AP_REQ_SHA1 = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5APREQSHA1";
+ public static final String NS_KERBEROS5_AP_REQ1510 = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5_AP_REQ1510";
+ public static final String NS_KERBEROS5_AP_REQ4120 = NS_KERBEROS11_TOKEN_PROFILE + "Kerberosv5_AP_REQ4120";
- public static final QName ATT_NULL_AssertionID = new QName(null, "AssertionID");
+ public static final QName ATT_NULL_ASSERTION_ID = new QName(null, "AssertionID");
public static final QName ATT_NULL_ID = new QName(null, "ID");
@@ -175,29 +179,29 @@ public class WSSConstants extends XMLSec
public static final String NS_WSC_05_12 = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512";
public static final String PREFIX_WSC = "wsc";
- public static final QName TAG_wsc0502_SecurityContextToken = new QName(NS_WSC_05_02, "SecurityContextToken", PREFIX_WSC);
- public static final QName TAG_wsc0512_SecurityContextToken = new QName(NS_WSC_05_12, "SecurityContextToken", PREFIX_WSC);
- public static final QName TAG_wsc0502_Identifier = new QName(NS_WSC_05_02, "Identifier", PREFIX_WSC);
- public static final QName TAG_wsc0512_Identifier = new QName(NS_WSC_05_12, "Identifier", PREFIX_WSC);
-
- public static final QName TAG_wsc0502_DerivedKeyToken = new QName(NS_WSC_05_02, "DerivedKeyToken", PREFIX_WSC);
- public static final QName TAG_wsc0512_DerivedKeyToken = new QName(NS_WSC_05_12, "DerivedKeyToken", PREFIX_WSC);
- public static final QName TAG_wsc0502_Properties = new QName(NS_WSC_05_02, "Properties", PREFIX_WSC);
- public static final QName TAG_wsc0512_Properties = new QName(NS_WSC_05_12, "Properties", PREFIX_WSC);
- public static final QName TAG_wsc0502_Length = new QName(NS_WSC_05_02, "Length", PREFIX_WSC);
- public static final QName TAG_wsc0512_Length = new QName(NS_WSC_05_12, "Length", PREFIX_WSC);
- public static final QName TAG_wsc0502_Generation = new QName(NS_WSC_05_02, "Generation", PREFIX_WSC);
- public static final QName TAG_wsc0512_Generation = new QName(NS_WSC_05_12, "Generation", PREFIX_WSC);
- public static final QName TAG_wsc0502_Offset = new QName(NS_WSC_05_02, "Offset", PREFIX_WSC);
- public static final QName TAG_wsc0512_Offset = new QName(NS_WSC_05_12, "Offset", PREFIX_WSC);
- public static final QName TAG_wsc0502_Label = new QName(NS_WSC_05_02, "Label", PREFIX_WSC);
- public static final QName TAG_wsc0512_Label = new QName(NS_WSC_05_12, "Label", PREFIX_WSC);
- public static final QName TAG_wsc0502_Nonce = new QName(NS_WSC_05_02, "Nonce", PREFIX_WSC);
- public static final QName TAG_wsc0512_Nonce = new QName(NS_WSC_05_12, "Nonce", PREFIX_WSC);
+ public static final QName TAG_WSC0502_SCT = new QName(NS_WSC_05_02, "SecurityContextToken", PREFIX_WSC);
+ public static final QName TAG_WSC0512_SCT = new QName(NS_WSC_05_12, "SecurityContextToken", PREFIX_WSC);
+ public static final QName TAG_WSC0502_IDENTIFIER = new QName(NS_WSC_05_02, "Identifier", PREFIX_WSC);
+ public static final QName TAG_WSC0512_IDENTIFIER = new QName(NS_WSC_05_12, "Identifier", PREFIX_WSC);
+
+ public static final QName TAG_WSC0502_DKT = new QName(NS_WSC_05_02, "DerivedKeyToken", PREFIX_WSC);
+ public static final QName TAG_WSC0512_DKT = new QName(NS_WSC_05_12, "DerivedKeyToken", PREFIX_WSC);
+ public static final QName TAG_WSC0502_PROPERTIES = new QName(NS_WSC_05_02, "Properties", PREFIX_WSC);
+ public static final QName TAG_WSC0512_PROPERTIES = new QName(NS_WSC_05_12, "Properties", PREFIX_WSC);
+ public static final QName TAG_WSC0502_LENGTH = new QName(NS_WSC_05_02, "Length", PREFIX_WSC);
+ public static final QName TAG_WSC0512_LENGTH = new QName(NS_WSC_05_12, "Length", PREFIX_WSC);
+ public static final QName TAG_WSC0502_GENERATION = new QName(NS_WSC_05_02, "Generation", PREFIX_WSC);
+ public static final QName TAG_WSC0512_GENERATION = new QName(NS_WSC_05_12, "Generation", PREFIX_WSC);
+ public static final QName TAG_WSC0502_OFFSET = new QName(NS_WSC_05_02, "Offset", PREFIX_WSC);
+ public static final QName TAG_WSC0512_OFFSET = new QName(NS_WSC_05_12, "Offset", PREFIX_WSC);
+ public static final QName TAG_WSC0502_LABEL = new QName(NS_WSC_05_02, "Label", PREFIX_WSC);
+ public static final QName TAG_WSC0512_LABEL = new QName(NS_WSC_05_12, "Label", PREFIX_WSC);
+ public static final QName TAG_WSC0502_NONCE = new QName(NS_WSC_05_02, "Nonce", PREFIX_WSC);
+ public static final QName TAG_WSC0512_NONCE = new QName(NS_WSC_05_12, "Nonce", PREFIX_WSC);
public static final String P_SHA_1 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
public static final String P_SHA_1_2005_12 = "http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512/dk/p_sha1";
- public static final String WS_SecureConversation_DEFAULT_LABEL = "WS-SecureConversation";
+ public static final String WS_SEC_CONV_DEFAULT_LABEL = "WS-SecureConversation";
public static final String NS_WSS_ENC_KEY_VALUE_TYPE = NS11_SOAPMESSAGE_SECURITY + "#EncryptedKey";
@@ -223,12 +227,12 @@ public class WSSConstants extends XMLSec
public static final Action KERBEROS_TOKEN = new Action("KerberosToken");
public static final Action CUSTOM_TOKEN = new Action("CustomToken");
- public static final AlgorithmUsage Comp_Key = new AlgorithmUsage("Comp_Key");
- public static final AlgorithmUsage Enc_KD = new AlgorithmUsage("Enc_KD");
- public static final AlgorithmUsage Sig_KD = new AlgorithmUsage("Sig_KD");
- public static final AlgorithmUsage Soap_Norm = new AlgorithmUsage("Soap_Norm");
- public static final AlgorithmUsage STR_Trans = new AlgorithmUsage("STR_Trans");
- public static final AlgorithmUsage XPath = new AlgorithmUsage("XPath");
+ public static final AlgorithmUsage COMP_KEY = new AlgorithmUsage("Comp_Key");
+ public static final AlgorithmUsage ENC_KD = new AlgorithmUsage("ENC_KD");
+ public static final AlgorithmUsage SIG_KD = new AlgorithmUsage("SIG_KD");
+ public static final AlgorithmUsage SOAP_NORM = new AlgorithmUsage("Soap_Norm");
+ public static final AlgorithmUsage STR_TRANS = new AlgorithmUsage("STR_Trans");
+ public static final AlgorithmUsage XPATH = new AlgorithmUsage("XPath");
public enum DerivedKeyTokenReference {
DirectReference,
@@ -242,11 +246,11 @@ public class WSSConstants extends XMLSec
PASSWORD_DIGEST(NS_PASSWORD_DIGEST);
private final String namespace;
- private static final Map<String, UsernameTokenPasswordType> lookup = new HashMap<>();
+ private static final Map<String, UsernameTokenPasswordType> LOOKUP = new HashMap<>();
static {
for (UsernameTokenPasswordType u : EnumSet.allOf(UsernameTokenPasswordType.class)) {
- lookup.put(u.getNamespace(), u);
+ LOOKUP.put(u.getNamespace(), u);
}
}
@@ -259,7 +263,7 @@ public class WSSConstants extends XMLSec
}
public static UsernameTokenPasswordType getUsernameTokenPasswordType(String namespace) {
- return lookup.get(namespace);
+ return LOOKUP.get(namespace);
}
}
@@ -268,14 +272,14 @@ public class WSSConstants extends XMLSec
public static final List<QName> WSSE_SECURITY_HEADER_PATH = new ArrayList<>(3);
static {
- SOAP_11_BODY_PATH.add(WSSConstants.TAG_soap11_Envelope);
- SOAP_11_BODY_PATH.add(WSSConstants.TAG_soap11_Body);
+ SOAP_11_BODY_PATH.add(WSSConstants.TAG_SOAP11_ENVELOPE);
+ SOAP_11_BODY_PATH.add(WSSConstants.TAG_SOAP11_BODY);
- SOAP_11_HEADER_PATH.add(WSSConstants.TAG_soap11_Envelope);
- SOAP_11_HEADER_PATH.add(WSSConstants.TAG_soap11_Header);
+ SOAP_11_HEADER_PATH.add(WSSConstants.TAG_SOAP11_ENVELOPE);
+ SOAP_11_HEADER_PATH.add(WSSConstants.TAG_SOAP11_HEADER);
WSSE_SECURITY_HEADER_PATH.addAll(SOAP_11_HEADER_PATH);
- WSSE_SECURITY_HEADER_PATH.add(WSSConstants.TAG_wsse_Security);
+ WSSE_SECURITY_HEADER_PATH.add(WSSConstants.TAG_WSSE_SECURITY);
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java Thu Jan 14 11:31:52 2016
@@ -210,7 +210,7 @@ public class InboundWSSecurityContextImp
List<QName> signatureConfirmationElementPath = new ArrayList<>(4);
signatureConfirmationElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- signatureConfirmationElementPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ signatureConfirmationElementPath.add(WSSConstants.TAG_WSSE11_SIG_CONF);
boolean signsSignatureConfirmation =
signsElement(tokenSecurityEvent, signatureConfirmationElementPath, securityEventDeque);
boolean encryptsSignatureConfirmation =
@@ -218,12 +218,12 @@ public class InboundWSSecurityContextImp
List<QName> timestampElementPath = new ArrayList<>(4);
timestampElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- timestampElementPath.add(WSSConstants.TAG_wsu_Timestamp);
+ timestampElementPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
boolean signsTimestamp = signsElement(tokenSecurityEvent, timestampElementPath, securityEventDeque);
List<QName> usernameTokenElementPath = new ArrayList<>(4);
usernameTokenElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- usernameTokenElementPath.add(WSSConstants.TAG_wsse_UsernameToken);
+ usernameTokenElementPath.add(WSSConstants.TAG_WSSE_USERNAME_TOKEN);
boolean encryptsUsernameToken = encryptsElement(tokenSecurityEvent, usernameTokenElementPath, securityEventDeque);
boolean transportSecurityActive = Boolean.TRUE == get(WSSConstants.TRANSPORT_SECURITY_ACTIVE);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java Thu Jan 14 11:31:52 2016
@@ -76,7 +76,7 @@ public class BinarySecurityTokenInputHan
new TokenContext(wssSecurityProperties, wsInboundSecurityContext, xmlSecEvents, elementPath);
BinarySecurityTokenValidator binarySecurityTokenValidator =
- wssSecurityProperties.getValidator(WSSConstants.TAG_wsse_BinarySecurityToken);
+ wssSecurityProperties.getValidator(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
if (binarySecurityTokenValidator == null) {
binarySecurityTokenValidator = new BinarySecurityTokenValidatorImpl();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java Thu Jan 14 11:31:52 2016
@@ -102,7 +102,7 @@ public class DecryptInputProcessor exten
securityContext.handleBSPRule(BSPRule.R5424);
}
SecurityTokenReferenceType securityTokenReferenceType = XMLSecurityUtils.getQNameType(keyInfoType.getContent(),
- WSSConstants.TAG_wsse_SecurityTokenReference);
+ WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
if (securityTokenReferenceType == null) {
securityContext.handleBSPRule(BSPRule.R5426);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DerivedKeyTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DerivedKeyTokenInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DerivedKeyTokenInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DerivedKeyTokenInputHandler.java Thu Jan 14 11:31:52 2016
@@ -140,9 +140,9 @@ public class DerivedKeyTokenInputHandler
);
XMLSecurityConstants.AlgorithmUsage derivedKeyAlgorithmUsage;
if (WSSConstants.Enc.equals(algorithmUsage)) {
- derivedKeyAlgorithmUsage = WSSConstants.Enc_KD;
+ derivedKeyAlgorithmUsage = WSSConstants.ENC_KD;
} else {
- derivedKeyAlgorithmUsage = WSSConstants.Sig_KD;
+ derivedKeyAlgorithmUsage = WSSConstants.SIG_KD;
}
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(derivedKeyAlgorithm);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java Thu Jan 14 11:31:52 2016
@@ -108,8 +108,8 @@ public class SAMLTokenInputHandler exten
static {
DOC_BUILDER_FACTORY.setNamespaceAware(true);
- SAML1_TOKEN_PATH.add(WSSConstants.TAG_saml_Assertion);
- SAML2_TOKEN_PATH.add(WSSConstants.TAG_saml2_Assertion);
+ SAML1_TOKEN_PATH.add(WSSConstants.TAG_SAML_ASSERTION);
+ SAML2_TOKEN_PATH.add(WSSConstants.TAG_SAML2_ASSERTION);
}
@Override
@@ -351,8 +351,8 @@ public class SAMLTokenInputHandler exten
final XMLSecStartElement xmlSecStartElement = xmlSecEvent.asStartElement();
final QName elementName = xmlSecStartElement.getName();
- if (WSSConstants.TAG_wst_BinarySecret.equals(elementName)
- || WSSConstants.TAG_wst0512_BinarySecret.equals(elementName)) {
+ if (WSSConstants.TAG_WST_BINARY_SECRET.equals(elementName)
+ || WSSConstants.TAG_WST0512_BINARY_SECRET.equals(elementName)) {
final StringBuilder stringBuilder = new StringBuilder();
loop:
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java Thu Jan 14 11:31:52 2016
@@ -56,7 +56,7 @@ public class SecurityContextTokenInputHa
}
final QName elementName = new QName(securityContextTokenTypeJAXBElement.getName().getNamespaceURI(),
- WSSConstants.TAG_wsc0502_Identifier.getLocalPart());
+ WSSConstants.TAG_WSC0502_IDENTIFIER.getLocalPart());
final String identifier = (String) XMLSecurityUtils.getQNameType(securityContextTokenType.getAny(),
elementName);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java Thu Jan 14 11:31:52 2016
@@ -95,7 +95,7 @@ public class SecurityHeaderInputProcesso
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY, "notASOAPMessage");
}
} else if (documentLevel == 3
- && xmlSecStartElement.getName().equals(WSSConstants.TAG_wsse_Security)
+ && xmlSecStartElement.getName().equals(WSSConstants.TAG_WSSE_SECURITY)
&& WSSUtils.isInSOAPHeader(xmlSecStartElement)) {
if (!WSSUtils.isResponsibleActorOrRole(xmlSecStartElement,
@@ -132,7 +132,7 @@ public class SecurityHeaderInputProcesso
XMLSecEndElement xmlSecEndElement = xmlSecEvent.asEndElement();
documentLevel = xmlSecEndElement.getDocumentLevel();
if (documentLevel == 3 && responsibleSecurityHeaderFound
- && xmlSecEndElement.getName().equals(WSSConstants.TAG_wsse_Security)) {
+ && xmlSecEndElement.getName().equals(WSSConstants.TAG_WSSE_SECURITY)) {
return finalizeHeaderProcessing(
inputProcessorChain, subInputProcessorChain,
@@ -150,7 +150,7 @@ public class SecurityHeaderInputProcesso
}
// Check for multiple timestamps
- if (xmlSecEndElement.getName().equals(WSSConstants.TAG_wsu_Timestamp)) {
+ if (xmlSecEndElement.getName().equals(WSSConstants.TAG_WSU_TIMESTAMP)) {
if (timestampFound) {
WSInboundSecurityContext context =
(WSInboundSecurityContext)subInputProcessorChain.getSecurityContext();
@@ -163,7 +163,7 @@ public class SecurityHeaderInputProcesso
}
} while (!(xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT
- && xmlSecEvent.asStartElement().getName().getLocalPart().equals(WSSConstants.TAG_soap_Body_LocalName)
+ && xmlSecEvent.asStartElement().getName().getLocalPart().equals(WSSConstants.TAG_SOAP_BODY_LN)
&& xmlSecEvent.asStartElement().getName().getNamespaceURI().equals(
WSSUtils.getSOAPMessageVersionNamespace(xmlSecEvent.asStartElement()))
));
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java Thu Jan 14 11:31:52 2016
@@ -67,21 +67,21 @@ public class SecurityTokenReferenceInput
String attributeValue = null;
final KeyIdentifierType keyIdentifierType = XMLSecurityUtils.getQNameType(
- securityTokenReferenceType.getAny(), WSSConstants.TAG_wsse_KeyIdentifier);
+ securityTokenReferenceType.getAny(), WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
if (keyIdentifierType != null) {
attributeValue = keyIdentifierType.getValue().trim();
if (WSSConstants.NS_SAML10_TYPE.equals(keyIdentifierType.getValueType())) {
- attributeName = WSSConstants.ATT_NULL_AssertionID;
+ attributeName = WSSConstants.ATT_NULL_ASSERTION_ID;
} else if (WSSConstants.NS_SAML20_TYPE.equals(keyIdentifierType.getValueType())) {
attributeName = WSSConstants.ATT_NULL_ID;
}
}
final ReferenceType referenceType = XMLSecurityUtils.getQNameType(
- securityTokenReferenceType.getAny(), WSSConstants.TAG_wsse_Reference);
+ securityTokenReferenceType.getAny(), WSSConstants.TAG_WSSE_REFERENCE);
if (referenceType != null) {
attributeValue = WSSUtils.dropReferenceMarker(referenceType.getURI());
if (WSSConstants.NS_SAML10_TYPE.equals(referenceType.getValueType())) {
- attributeName = WSSConstants.ATT_NULL_AssertionID;
+ attributeName = WSSConstants.ATT_NULL_ASSERTION_ID;
} else if (WSSConstants.NS_SAML20_TYPE.equals(referenceType.getValueType())) {
attributeName = WSSConstants.ATT_NULL_ID;
}
@@ -181,7 +181,7 @@ public class SecurityTokenReferenceInput
return xmlSecEvent;
} else if (xmlSecEndElement.getDocumentLevel() == 3
- && xmlSecEndElement.getName().equals(WSSConstants.TAG_wsse_Security)
+ && xmlSecEndElement.getName().equals(WSSConstants.TAG_WSSE_SECURITY)
&& WSSUtils.isInSecurityHeader(xmlSecEndElement,
((WSSSecurityProperties) getSecurityProperties()).getActor())) {
//we can now remove this processor from the chain
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java Thu Jan 14 11:31:52 2016
@@ -48,7 +48,7 @@ public class SignatureConfirmationInputP
XMLSecEvent xmlSecEvent = inputProcessorChain.processHeaderEvent();
if (xmlSecEvent.getEventType() == XMLStreamConstants.END_ELEMENT) {
XMLSecEndElement xmlSecEndElement = xmlSecEvent.asEndElement();
- if (xmlSecEndElement.getName().equals(WSSConstants.TAG_wsse_Security)) {
+ if (xmlSecEndElement.getName().equals(WSSConstants.TAG_WSSE_SECURITY)) {
inputProcessorChain.removeProcessor(this);
List<SignatureValueSecurityEvent> signatureValueSecurityEventList =
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java Thu Jan 14 11:31:52 2016
@@ -76,7 +76,7 @@ public class TimestampInputHandler exten
timestampType.setId(IDGenerator.generateID(null));
}
- TimestampValidator timestampValidator = wssSecurityProperties.getValidator(WSSConstants.TAG_wsu_Timestamp);
+ TimestampValidator timestampValidator = wssSecurityProperties.getValidator(WSSConstants.TAG_WSU_TIMESTAMP);
if (timestampValidator == null) {
timestampValidator = new TimestampValidatorImpl();
}
@@ -119,9 +119,9 @@ public class TimestampInputHandler exten
if (xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT) {
QName name = xmlSecEvent.asStartElement().getName();
- if (name.equals(WSSConstants.TAG_wsu_Timestamp)) {
+ if (name.equals(WSSConstants.TAG_WSU_TIMESTAMP)) {
continue;
- } else if (name.equals(WSSConstants.TAG_wsu_Created)) {
+ } else if (name.equals(WSSConstants.TAG_WSU_CREATED)) {
if (createdIndex != -1) {
securityContext.handleBSPRule(BSPRule.R3203);
}
@@ -129,7 +129,7 @@ public class TimestampInputHandler exten
securityContext.handleBSPRule(BSPRule.R3221);
}
createdIndex = i;
- } else if (name.equals(WSSConstants.TAG_wsu_Expires)) {
+ } else if (name.equals(WSSConstants.TAG_WSU_EXPIRES)) {
if (expiresIndex != -1) {
securityContext.handleBSPRule(BSPRule.R3224);
}
@@ -158,7 +158,7 @@ public class TimestampInputHandler exten
securityContext.handleBSPRule(BSPRule.R3213);
}
String valueType = XMLSecurityUtils.getQNameAttribute(timestampType.getCreated().getOtherAttributes(),
- WSSConstants.ATT_NULL_ValueType);
+ WSSConstants.ATT_NULL_VALUE_TYPE);
if (valueType != null) {
securityContext.handleBSPRule(BSPRule.R3225);
}
@@ -184,7 +184,7 @@ public class TimestampInputHandler exten
securityContext.handleBSPRule(BSPRule.R3215);
}
String valueType = XMLSecurityUtils.getQNameAttribute(timestampType.getExpires().getOtherAttributes(),
- WSSConstants.ATT_NULL_ValueType);
+ WSSConstants.ATT_NULL_VALUE_TYPE);
if (valueType != null) {
securityContext.handleBSPRule(BSPRule.R3226);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java Thu Jan 14 11:31:52 2016
@@ -78,7 +78,7 @@ public class UsernameTokenInputHandler e
ReplayCache replayCache = wssSecurityProperties.getNonceReplayCache();
final EncodedString encodedNonce =
- XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_wsse_Nonce);
+ XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_WSSE_NONCE);
if (encodedNonce != null && replayCache != null) {
// Check for replay attacks
String nonce = encodedNonce.getValue();
@@ -105,7 +105,7 @@ public class UsernameTokenInputHandler e
new TokenContext(wssSecurityProperties, wsInboundSecurityContext, xmlSecEvents, elementPath);
UsernameTokenValidator usernameTokenValidator =
- wssSecurityProperties.getValidator(WSSConstants.TAG_wsse_UsernameToken);
+ wssSecurityProperties.getValidator(WSSConstants.TAG_WSSE_USERNAME_TOKEN);
if (usernameTokenValidator == null) {
usernameTokenValidator = new UsernameTokenValidatorImpl();
}
@@ -156,19 +156,19 @@ public class UsernameTokenInputHandler e
for (int i = 0; i < xmlSecEvents.size(); i++) {
XMLSecEvent xmlSecEvent = xmlSecEvents.get(i);
if (xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT) {
- if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_wsse_UsernameToken)) {
+ if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_WSSE_USERNAME_TOKEN)) {
continue;
- } else if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_wsse_Password)) {
+ } else if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_WSSE_PASSWORD)) {
if (passwordIndex != -1) {
securityContext.handleBSPRule(BSPRule.R4222);
}
passwordIndex = i;
- } else if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_wsu_Created)) {
+ } else if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_WSU_CREATED)) {
if (createdIndex != -1) {
securityContext.handleBSPRule(BSPRule.R4223);
}
createdIndex = i;
- } else if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_wsse_Nonce)) {
+ } else if (xmlSecEvent.asStartElement().getName().equals(WSSConstants.TAG_WSSE_NONCE)) {
if (nonceIndex != -1) {
securityContext.handleBSPRule(BSPRule.R4225);
}
@@ -178,13 +178,13 @@ public class UsernameTokenInputHandler e
}
PasswordString passwordType =
- XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_wsse_Password);
+ XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_WSSE_PASSWORD);
if (passwordType != null && passwordType.getType() == null) {
securityContext.handleBSPRule(BSPRule.R4201);
}
EncodedString encodedNonce =
- XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_wsse_Nonce);
+ XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_WSSE_NONCE);
if (encodedNonce != null) {
if (encodedNonce.getEncodingType() == null) {
securityContext.handleBSPRule(BSPRule.R4220);
@@ -204,7 +204,7 @@ public class UsernameTokenInputHandler e
int futureTTL = wssSecurityProperties.getUtFutureTTL();
final AttributedDateTime attributedDateTimeCreated =
- XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_wsu_Created);
+ XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), WSSConstants.TAG_WSU_CREATED);
if (attributedDateTimeCreated != null) {
// Parse the Date
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java Thu Jan 14 11:31:52 2016
@@ -118,7 +118,7 @@ public class WSSSignatureInputHandler ex
}
SecurityTokenReferenceType securityTokenReferenceType = XMLSecurityUtils.getQNameType(keyInfoContent,
- WSSConstants.TAG_wsse_SecurityTokenReference);
+ WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
if (securityTokenReferenceType == null) {
securityContext.handleBSPRule(BSPRule.R5417);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java Thu Jan 14 11:31:52 2016
@@ -212,14 +212,14 @@ public class WSSSignatureReferenceVerify
final String algorithm = transformType.getAlgorithm();
if (!WSSConstants.NS_C14N_EXCL.equals(algorithm)
&& !WSSConstants.NS_XMLDSIG_FILTER2.equals(algorithm)
- && !WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithm)
+ && !WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM.equals(algorithm)
&& !WSSConstants.NS_XMLDSIG_ENVELOPED_SIGNATURE.equals(algorithm)
&& !WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithm)
&& !WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithm)) {
securityContext.handleBSPRule(BSPRule.R5423);
if (j == transformTypes.size() - 1
&& !WSSConstants.NS_C14N_EXCL.equals(algorithm)
- && !WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithm)
+ && !WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM.equals(algorithm)
&& !WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithm)
&& !WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithm)) {
securityContext.handleBSPRule(BSPRule.R5412);
@@ -232,14 +232,14 @@ public class WSSSignatureReferenceVerify
&& inclusiveNamespacesType.getPrefixList().size() == 0) {
securityContext.handleBSPRule(BSPRule.R5407);
}
- if (WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithm)) {
+ if (WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM.equals(algorithm)) {
if (inclusiveNamespacesType != null
&& inclusiveNamespacesType.getPrefixList().size() == 0) {
securityContext.handleBSPRule(BSPRule.R5413);
}
TransformationParametersType transformationParametersType =
XMLSecurityUtils.getQNameType(transformType.getContent(),
- WSSConstants.TAG_wsse_TransformationParameters);
+ WSSConstants.TAG_WSSE_TRANSFORMATION_PARAMETERS);
if (transformationParametersType == null) {
securityContext.handleBSPRule(BSPRule.R3065);
} else {
@@ -355,7 +355,7 @@ public class WSSSignatureReferenceVerify
for (int i = transformTypeList.size() - 1; i >= 0; i--) {
TransformType transformType = transformTypeList.get(i);
TransformationParametersType transformationParametersType =
- XMLSecurityUtils.getQNameType(transformType.getContent(), WSSConstants.TAG_wsse_TransformationParameters);
+ XMLSecurityUtils.getQNameType(transformType.getContent(), WSSConstants.TAG_WSSE_TRANSFORMATION_PARAMETERS);
if (transformationParametersType != null) {
CanonicalizationMethodType canonicalizationMethodType =
XMLSecurityUtils.getQNameType(transformationParametersType.getAny(),
@@ -407,7 +407,7 @@ public class WSSSignatureReferenceVerify
}
}
- if (WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithm)) {
+ if (WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM.equals(algorithm)) {
internalSignatureReferenceVerifier.setTransformer(parentTransformer);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java Thu Jan 14 11:31:52 2016
@@ -155,7 +155,7 @@ public class BinarySecurityTokenOutputPr
if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) {
- final QName headerElementName = WSSConstants.TAG_wsse_BinarySecurityToken;
+ final QName headerElementName = WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN;
if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(getAction())
@@ -165,9 +165,9 @@ public class BinarySecurityTokenOutputPr
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
List<XMLSecAttribute> attributes = new ArrayList<>(3);
- attributes.add(createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, securityToken.getId()));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_GSS_KERBEROS5_AP_REQ));
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, securityToken.getId()));
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, false, attributes);
createCharactersAndOutputAsEvent(subOutputProcessorChain,
new Base64(76, new byte[]{'\n'}).encodeToString(
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java?rev=1724589&r1=1724588&r2=1724589&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java Thu Jan 14 11:31:52 2016
@@ -96,7 +96,7 @@ public class DerivedKeyTokenOutputProces
}
String defaultLabel =
- WSSConstants.WS_SecureConversation_DEFAULT_LABEL + WSSConstants.WS_SecureConversation_DEFAULT_LABEL;
+ WSSConstants.WS_SEC_CONV_DEFAULT_LABEL + WSSConstants.WS_SEC_CONV_DEFAULT_LABEL;
byte[] label = defaultLabel.getBytes(StandardCharsets.UTF_8);
byte[] nonce = WSSConstants.generateBytes(16);
@@ -225,7 +225,7 @@ public class DerivedKeyTokenOutputProces
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
List<XMLSecAttribute> attributes = new ArrayList<>(1);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, securityToken.getId()));
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, securityToken.getId()));
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
createSecurityTokenReferenceStructureForDerivedKey(subOutputProcessorChain, securityToken,
@@ -257,16 +257,16 @@ public class DerivedKeyTokenOutputProces
SecurityToken wrappingToken = securityToken.getKeyWrappingToken();
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, IDGenerator.generateID(null)));
if (WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals(keyIdentifier) && !useSingleCertificate) {
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_X509PKIPathv1));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_X509PKIPathv1));
} else if (derivedKeyTokenReference == WSSConstants.DerivedKeyTokenReference.EncryptedKey
|| WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier.equals(keyIdentifier)) {
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
} else if (WSSecurityTokenConstants.KerberosToken.equals(wrappingToken.getTokenType())) {
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_GSS_KERBEROS5_AP_REQ));
}
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE, false, attributes);
X509Certificate[] x509Certificates = wrappingToken.getX509Certificates();
String tokenId = wrappingToken.getId();
@@ -288,7 +288,7 @@ public class DerivedKeyTokenOutputProces
} else if (WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals(keyIdentifier)) {
String valueType;
if (WSSecurityTokenConstants.KerberosToken.equals(wrappingToken.getTokenType())) {
- valueType = WSSConstants.NS_GSS_Kerberos5_AP_REQ;
+ valueType = WSSConstants.NS_GSS_KERBEROS5_AP_REQ;
} else if (WSSecurityTokenConstants.SpnegoContextToken.equals(wrappingToken.getTokenType())
|| WSSecurityTokenConstants.SecurityContextToken.equals(wrappingToken.getTokenType())
|| WSSecurityTokenConstants.SecureConversationToken.equals(wrappingToken.getTokenType())) {
@@ -310,35 +310,35 @@ public class DerivedKeyTokenOutputProces
} else {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "unsupportedSecurityToken");
}
- createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference);
+ createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
}
private QName getHeaderElementName() {
if (use200512Namespace) {
- return WSSConstants.TAG_wsc0512_DerivedKeyToken;
+ return WSSConstants.TAG_WSC0512_DKT;
}
- return WSSConstants.TAG_wsc0502_DerivedKeyToken;
+ return WSSConstants.TAG_WSC0502_DKT;
}
private QName getOffsetName() {
if (use200512Namespace) {
- return WSSConstants.TAG_wsc0512_Offset;
+ return WSSConstants.TAG_WSC0512_OFFSET;
}
- return WSSConstants.TAG_wsc0502_Offset;
+ return WSSConstants.TAG_WSC0502_OFFSET;
}
private QName getLengthName() {
if (use200512Namespace) {
- return WSSConstants.TAG_wsc0512_Length;
+ return WSSConstants.TAG_WSC0512_LENGTH;
}
- return WSSConstants.TAG_wsc0502_Length;
+ return WSSConstants.TAG_WSC0502_LENGTH;
}
private QName getNonceName() {
if (use200512Namespace) {
- return WSSConstants.TAG_wsc0512_Nonce;
+ return WSSConstants.TAG_WSC0512_NONCE;
}
- return WSSConstants.TAG_wsc0502_Nonce;
+ return WSSConstants.TAG_WSC0502_NONCE;
}
}
}