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:24:40 UTC
svn commit: r1724585 [3/7] - in /webservices/wss4j/trunk:
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/src/main/java/or...
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -134,7 +134,7 @@ public class EncryptOutputProcessor exte
//we can remove this processor when the whole body will be encrypted since there is
//nothing more which can be encrypted.
- if (WSSConstants.TAG_soap_Body_LocalName.equals(xmlSecStartElement.getName().getLocalPart())
+ if (WSSConstants.TAG_SOAP_BODY_LN.equals(xmlSecStartElement.getName().getLocalPart())
&& WSSUtils.isInSOAPBody(xmlSecStartElement)) {
doFinalInternal(outputProcessorChain);
outputProcessorChain.removeProcessor(this);
@@ -150,7 +150,7 @@ public class EncryptOutputProcessor exte
protected SecurePart securePartMatches(XMLSecStartElement xmlSecStartElement, Map<Object, SecurePart> secureParts) {
if (!xmlSecStartElement.getOnElementDeclaredAttributes().isEmpty()) {
- Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_wsu_Id);
+ Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_WSU_ID);
if (attribute != null) {
SecurePart securePart = secureParts.get(attribute.getValue());
if (securePart != null) {
@@ -171,7 +171,7 @@ public class EncryptOutputProcessor exte
return securePart;
}
}
- attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_NULL_AssertionID);
+ attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_NULL_ASSERTION_ID);
if (attribute != null) {
SecurePart securePart = secureParts.get(attribute.getValue());
if (securePart != null) {
@@ -382,8 +382,8 @@ public class EncryptOutputProcessor exte
KeyIdentifier keyIdentifier = ((WSSSecurityProperties) getSecurityProperties()).getEncryptionKeyIdentifier();
if (WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier.equals(keyIdentifier)) {
List<XMLSecAttribute> attributes = new ArrayList<>(1);
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
false, attributes);
if (securityToken.getSha1Identifier() != null) {
@@ -395,8 +395,8 @@ public class EncryptOutputProcessor exte
}
} else if (WSSecurityTokenConstants.KeyIdentifier_KerberosSha1Identifier.equals(keyIdentifier)) {
List<XMLSecAttribute> attributes = new ArrayList<>(1);
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_Kerberos5_AP_REQ));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_KERBEROS5_AP_REQ));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
false, attributes);
WSSUtils.createKerberosSha1IdentifierStructure(this, outputProcessorChain,
@@ -405,33 +405,33 @@ public class EncryptOutputProcessor exte
boolean isSAMLToken = false;
if (WSSecurityTokenConstants.KerberosToken.equals(securityToken.getTokenType())) {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, IDGenerator.generateID(null)));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_GSS_KERBEROS5_AP_REQ));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
false, attributes);
} else if (WSSecurityTokenConstants.Saml10Token.equals(securityToken.getTokenType())
|| WSSecurityTokenConstants.Saml11Token.equals(securityToken.getTokenType())) {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, IDGenerator.generateID(null)));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
false, attributes);
isSAMLToken = true;
} else if (WSSecurityTokenConstants.Saml20Token.equals(securityToken.getTokenType())) {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, IDGenerator.generateID(null)));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
false, attributes);
isSAMLToken = true;
} else if (WSSecurityTokenConstants.EncryptedKeyToken.equals(securityToken.getTokenType())) {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, IDGenerator.generateID(null)));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
false, attributes);
} else {
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference,
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE,
true, null);
}
@@ -443,31 +443,31 @@ public class EncryptOutputProcessor exte
List<XMLSecAttribute> attributes = new ArrayList<>(1);
attributes.add(createAttribute(WSSConstants.ATT_NULL_URI, "#" + getEncryptionPartDef().getKeyId()));
if (WSSecurityTokenConstants.KerberosToken.equals(securityToken.getTokenType())) {
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_GSS_KERBEROS5_AP_REQ));
} else if (WSSecurityTokenConstants.DerivedKeyToken.equals(securityToken.getTokenType())) {
boolean use200512Namespace = ((WSSSecurityProperties)getSecurityProperties()).isUse200512Namespace();
if (use200512Namespace) {
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_12 + "/dk"));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_WSC_05_12 + "/dk"));
} else {
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_02 + "/dk"));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_WSC_05_02 + "/dk"));
}
} else if (WSSecurityTokenConstants.SpnegoContextToken.equals(securityToken.getTokenType())
|| WSSecurityTokenConstants.SecurityContextToken.equals(securityToken.getTokenType())
|| WSSecurityTokenConstants.SecureConversationToken.equals(securityToken.getTokenType())) {
boolean use200512Namespace = ((WSSSecurityProperties)getSecurityProperties()).isUse200512Namespace();
if (use200512Namespace) {
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_12 + "/sct"));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_WSC_05_12 + "/sct"));
} else {
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_02 + "/sct"));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_WSC_05_02 + "/sct"));
}
} else if (WSSecurityTokenConstants.EncryptedKeyToken.equals(securityToken.getTokenType())) {
- attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
}
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference, false, attributes);
- createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference);
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_REFERENCE, false, attributes);
+ createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_REFERENCE);
}
}
- createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference);
+ createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -371,11 +371,11 @@ public class EncryptedKeyOutputProcessor
}
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));
}
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE, false, attributes);
String tokenId = securityToken.getKeyWrappingToken().getId();
@@ -401,7 +401,7 @@ public class EncryptedKeyOutputProcessor
} else {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "unsupportedSecurityToken");
}
- createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference);
+ createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -351,7 +351,7 @@ public class SAMLTokenOutputProcessor ex
if (includeSTR) {
SecurePart securePart =
new SecurePart(
- new QName(WSSConstants.SOAPMESSAGE_NS10_STRTransform),
+ new QName(WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM),
tokenId, securityTokenReferenceId, SecurePart.Modifier.Element);
outputProcessorChain.getSecurityContext().putAsMap(WSSConstants.SIGNATURE_PARTS, tokenId, securePart);
}
@@ -395,7 +395,7 @@ public class SAMLTokenOutputProcessor ex
if (includeBST()) {
OutputProcessorUtils.updateSecurityHeaderOrder(
- outputProcessorChain, WSSConstants.TAG_wsse_BinarySecurityToken, getAction(), false);
+ outputProcessorChain, WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN, getAction(), false);
WSSUtils.createBinarySecurityTokenStructure(this, outputProcessorChain, securityToken.getId(),
securityToken.getX509Certificates(), getSecurityProperties().isUseSingleCert());
@@ -403,9 +403,9 @@ public class SAMLTokenOutputProcessor ex
final QName headerElementName;
if (samlAssertionWrapper.getSamlVersion() == SAMLVersion.VERSION_11) {
- headerElementName = WSSConstants.TAG_saml_Assertion;
+ headerElementName = WSSConstants.TAG_SAML_ASSERTION;
} else {
- headerElementName = WSSConstants.TAG_saml2_Assertion;
+ headerElementName = WSSConstants.TAG_SAML2_ASSERTION;
}
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
@@ -418,7 +418,7 @@ public class SAMLTokenOutputProcessor ex
}
if (includeSTR) {
OutputProcessorUtils.updateSecurityHeaderOrder(
- outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, getAction(), false);
+ outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE, getAction(), false);
outputSecurityTokenReference(subOutputProcessorChain, samlAssertionWrapper,
securityTokenReferenceId, samlAssertionWrapper.getId());
}
@@ -446,15 +446,15 @@ public class SAMLTokenOutputProcessor ex
List<XMLSecAttribute> attributes = new ArrayList<>(2);
WSSecurityTokenConstants.TokenType tokenType = WSSecurityTokenConstants.Saml11Token;
if (samlAssertionWrapper.getSamlVersion() == SAMLVersion.VERSION_11) {
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
} else {
tokenType = WSSecurityTokenConstants.Saml20Token;
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
}
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, referenceId));
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, referenceId));
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE, false, attributes);
WSSUtils.createSAMLKeyIdentifierStructure(this, outputProcessorChain, tokenType, tokenId);
- createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference);
+ createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -165,7 +165,7 @@ public class SecurityContextTokenOutputP
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()));
QName identifierName = getIdentifierName();
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
createStartElementAndOutputAsEvent(subOutputProcessorChain, identifierName, false, null);
@@ -179,16 +179,16 @@ public class SecurityContextTokenOutputP
private QName getHeaderElementName() {
if (use200512Namespace) {
- return WSSConstants.TAG_wsc0512_SecurityContextToken;
+ return WSSConstants.TAG_WSC0512_SCT;
}
- return WSSConstants.TAG_wsc0502_SecurityContextToken;
+ return WSSConstants.TAG_WSC0502_SCT;
}
private QName getIdentifierName() {
if (use200512Namespace) {
- return WSSConstants.TAG_wsc0512_Identifier;
+ return WSSConstants.TAG_WSC0512_IDENTIFIER;
}
- return WSSConstants.TAG_wsc0502_Identifier;
+ return WSSConstants.TAG_WSC0502_IDENTIFIER;
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -120,7 +120,7 @@ public class SecurityHeaderOutputProcess
//remove this processor. its no longer needed.
outputProcessorChain.removeProcessor(this);
} else if (level == 2
- && WSSConstants.TAG_soap_Body_LocalName.equals(xmlSecStartElement.getName().getLocalPart())
+ && WSSConstants.TAG_SOAP_BODY_LN.equals(xmlSecStartElement.getName().getLocalPart())
&& xmlSecStartElement.getName().getNamespaceURI().equals(soapMessageVersion)) {
//hmm it seems we don't have a soap header in the current document
//so output one and add securityHeader
@@ -129,11 +129,11 @@ public class SecurityHeaderOutputProcess
OutputProcessorChain subOutputProcessorChain =
outputProcessorChain.createSubChain(this, xmlSecStartElement.getParentXMLSecStartElement());
createStartElementAndOutputAsEvent(subOutputProcessorChain,
- new QName(soapMessageVersion, WSSConstants.TAG_soap_Header_LocalName, WSSConstants.PREFIX_SOAPENV), true, null);
+ new QName(soapMessageVersion, WSSConstants.TAG_SOAP_HEADER_LN, WSSConstants.PREFIX_SOAPENV), true, null);
boolean mustUnderstand = ((WSSSecurityProperties) getSecurityProperties()).isMustUnderstand();
buildSecurityHeader(soapMessageVersion, subOutputProcessorChain, mustUnderstand);
createEndElementAndOutputAsEvent(subOutputProcessorChain,
- new QName(soapMessageVersion, WSSConstants.TAG_soap_Header_LocalName, WSSConstants.PREFIX_SOAPENV));
+ new QName(soapMessageVersion, WSSConstants.TAG_SOAP_HEADER_LN, WSSConstants.PREFIX_SOAPENV));
//output current soap-header event
outputProcessorChain.processEvent(xmlSecEvent);
@@ -148,7 +148,7 @@ public class SecurityHeaderOutputProcess
int documentLevel = xmlSecEndElement.getDocumentLevel();
String soapMessageVersionNS =
WSSUtils.getSOAPMessageVersionNamespace(xmlSecEndElement.getParentXMLSecStartElement());
- if (documentLevel == 2 && WSSConstants.TAG_soap_Header_LocalName.equals(xmlSecEndElement.getName().getLocalPart())
+ if (documentLevel == 2 && WSSConstants.TAG_SOAP_HEADER_LN.equals(xmlSecEndElement.getName().getLocalPart())
&& xmlSecEndElement.getName().getNamespaceURI().equals(soapMessageVersionNS)) {
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
boolean mustUnderstand = ((WSSSecurityProperties) getSecurityProperties()).isMustUnderstand();
@@ -206,19 +206,19 @@ public class SecurityHeaderOutputProcess
final String actor = ((WSSSecurityProperties) getSecurityProperties()).getActor();
if (actor != null && !actor.isEmpty()) {
if (WSSConstants.NS_SOAP11.equals(soapMessageVersion)) {
- attributes.add(createAttribute(WSSConstants.ATT_soap11_Actor, actor));
+ attributes.add(createAttribute(WSSConstants.ATT_SOAP11_ACTOR, actor));
} else {
- attributes.add(createAttribute(WSSConstants.ATT_soap12_Role, actor));
+ attributes.add(createAttribute(WSSConstants.ATT_SOAP12_ROLE, actor));
}
}
if (mustUnderstand) {
if (WSSConstants.NS_SOAP11.equals(soapMessageVersion)) {
- attributes.add(createAttribute(WSSConstants.ATT_soap11_MustUnderstand, "1"));
+ attributes.add(createAttribute(WSSConstants.ATT_SOAP11_MUST_UNDERSTAND, "1"));
} else {
- attributes.add(createAttribute(WSSConstants.ATT_soap12_MustUnderstand, "true"));
+ attributes.add(createAttribute(WSSConstants.ATT_SOAP12_MUST_UNDERSTAND, "true"));
}
}
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Security, true, attributes);
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Security);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_SECURITY, true, attributes);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_SECURITY);
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java Thu Jan 14 11:24:39 2016
@@ -100,7 +100,7 @@ public class SecurityHeaderReorderProces
//now we are in our security header
if (documentLevel == 3) {
- if (xmlSecEvent.isEndElement() && xmlSecEvent.asEndElement().getName().equals(WSSConstants.TAG_wsse_Security)) {
+ if (xmlSecEvent.isEndElement() && xmlSecEvent.asEndElement().getName().equals(WSSConstants.TAG_WSSE_SECURITY)) {
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
Iterator<Map.Entry<XMLSecurityConstants.Action, Map<SecurityHeaderOrder, Deque<XMLSecEvent>>>> iterator =
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -54,7 +54,7 @@ public class SignatureConfirmationOutput
if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) {
- final QName headerElementName = WSSConstants.TAG_wsse11_SignatureConfirmation;
+ final QName headerElementName = WSSConstants.TAG_WSSE11_SIG_CONF;
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
@@ -70,10 +70,10 @@ public class SignatureConfirmationOutput
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
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)));
String base64SigValue =
new Base64(76, new byte[]{'\n'}).encodeToString(signatureValueSecurityEvent.getSignatureValue());
- attributes.add(createAttribute(WSSConstants.ATT_NULL_Value, base64SigValue));
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_VALUE, base64SigValue));
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName);
}
@@ -82,7 +82,7 @@ public class SignatureConfirmationOutput
if (!aSignatureFound) {
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
List<XMLSecAttribute> attributes = new ArrayList<>(1);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, IDGenerator.generateID(null)));
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -63,7 +63,7 @@ public class TimestampOutputProcessor ex
if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) {
- final QName headerElementName = WSSConstants.TAG_wsu_Timestamp;
+ final QName headerElementName = WSSConstants.TAG_WSU_TIMESTAMP;
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
XMLGregorianCalendar created =
@@ -76,12 +76,12 @@ public class TimestampOutputProcessor ex
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
//wsu:id is optional and will be added when signing...
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, null);
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsu_Created, false, null);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSU_CREATED, false, null);
createCharactersAndOutputAsEvent(subOutputProcessorChain, created.toXMLFormat());
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsu_Created);
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsu_Expires, false, null);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSU_CREATED);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSU_EXPIRES, false, null);
createCharactersAndOutputAsEvent(subOutputProcessorChain, expires.toXMLFormat());
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsu_Expires);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSU_EXPIRES);
createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName);
outputProcessorChain.removeProcessor(this);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -181,18 +181,18 @@ public class UsernameTokenOutputProcesso
if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) {
- final QName headerElementName = WSSConstants.TAG_wsse_UsernameToken;
+ final QName headerElementName = WSSConstants.TAG_WSSE_USERNAME_TOKEN;
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
List<XMLSecAttribute> attributes = new ArrayList<>(1);
- attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, this.wsuId));
+ attributes.add(createAttribute(WSSConstants.ATT_WSU_ID, this.wsuId));
createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, false, attributes);
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Username, false, null);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_USERNAME, false, null);
createCharactersAndOutputAsEvent(subOutputProcessorChain,
((WSSSecurityProperties) getSecurityProperties()).getTokenUser());
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Username);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_USERNAME);
if (((WSSSecurityProperties) getSecurityProperties()).getUsernameTokenPasswordType()
!= WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE && !WSSConstants.USERNAMETOKEN_SIGNED.equals(action)) {
attributes = new ArrayList<>(1);
@@ -201,40 +201,40 @@ public class UsernameTokenOutputProcesso
== WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST
? WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST.getNamespace()
: WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT.getNamespace()));
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Password, false, attributes);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_PASSWORD, false, attributes);
createCharactersAndOutputAsEvent(subOutputProcessorChain,
((WSSSecurityProperties) getSecurityProperties()).getUsernameTokenPasswordType()
== WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST
? WSSUtils.doPasswordDigest(this.nonceValue, this.created.toXMLFormat(), this.password)
: this.password);
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Password);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_PASSWORD);
}
if (salt != null) {
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse11_Salt, true, null);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE11_SALT, true, null);
createCharactersAndOutputAsEvent(subOutputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(this.salt));
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse11_Salt);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE11_SALT);
if (iterations > 0) {
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse11_Iteration, true, null);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE11_ITERATION, true, null);
createCharactersAndOutputAsEvent(subOutputProcessorChain, "" + iterations);
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse11_Iteration);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE11_ITERATION);
}
}
if (nonceValue != null && !WSSConstants.USERNAMETOKEN_SIGNED.equals(action)) {
attributes = new ArrayList<>(1);
- attributes.add(createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Nonce, false, attributes);
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_NONCE, false, attributes);
createCharactersAndOutputAsEvent(subOutputProcessorChain,
new Base64(76, new byte[]{'\n'}).encodeToString(this.nonceValue));
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Nonce);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_NONCE);
}
if (created != null && !WSSConstants.USERNAMETOKEN_SIGNED.equals(action)) {
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsu_Created, false, null);
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSU_CREATED, false, null);
createCharactersAndOutputAsEvent(subOutputProcessorChain, this.created.toXMLFormat());
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsu_Created);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSU_CREATED);
}
createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -60,7 +60,7 @@ public class WSSSignatureEndingOutputPro
OutputProcessorChain outputProcessorChain) throws XMLSecurityException {
//we have to search for the SecurityHeaderElement for InclusiveNamespaces (same behavior as in wss-dom):
- while (!WSSConstants.TAG_wsse_Security.equals(xmlSecStartElement.getName())) {
+ while (!WSSConstants.TAG_WSSE_SECURITY.equals(xmlSecStartElement.getName())) {
xmlSecStartElement = xmlSecStartElement.getParentXMLSecStartElement();
}
@@ -102,25 +102,25 @@ public class WSSSignatureEndingOutputPro
} else {
boolean isSAMLToken = false;
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.Saml10Token.equals(securityToken.getTokenType())
|| WSSecurityTokenConstants.Saml11Token.equals(securityToken.getTokenType())) {
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
isSAMLToken = true;
} else if (WSSecurityTokenConstants.Saml20Token.equals(securityToken.getTokenType())) {
- attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
+ attributes.add(createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
isSAMLToken = true;
} else if (WSSecurityTokenConstants.KerberosToken.equals(securityToken.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));
} else if (WSSecurityTokenConstants.EncryptedKeyToken.equals(securityToken.getTokenType())
|| WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier.equals(keyIdentifier)
|| WSSecurityTokenConstants.KeyIdentifier_EncryptedKey.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.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));
}
- createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
+ createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE, false, attributes);
String tokenId = securityToken.getId();
@@ -156,7 +156,7 @@ public class WSSSignatureEndingOutputPro
if (WSSecurityTokenConstants.Saml20Token.equals(securityToken.getTokenType())) {
valueType = null;
} else if (WSSecurityTokenConstants.KerberosToken.equals(securityToken.getTokenType())) {
- valueType = WSSConstants.NS_GSS_Kerberos5_AP_REQ;
+ valueType = WSSConstants.NS_GSS_KERBEROS5_AP_REQ;
} else if (WSSecurityTokenConstants.DerivedKeyToken.equals(securityToken.getTokenType())) {
boolean use200512Namespace = ((WSSSecurityProperties)getSecurityProperties()).isUse200512Namespace();
if (use200512Namespace) {
@@ -190,7 +190,7 @@ public class WSSSignatureEndingOutputPro
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_SIGNATURE, "unsupportedSecurityToken",
new Object[] {keyIdentifier});
}
- createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference);
+ createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
}
}
@@ -201,19 +201,19 @@ public class WSSSignatureEndingOutputPro
if (transforms != null && transforms.length > 0) {
createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_Transforms, false, null);
- if (WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(transforms[0])) {
+ if (WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM.equals(transforms[0])) {
List<XMLSecAttribute> attributes = new ArrayList<>(1);
attributes.add(createAttribute(WSSConstants.ATT_NULL_Algorithm, transforms[0]));
createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_Transform, false, attributes);
if (transforms.length >= 2) {
- createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_TransformationParameters,
+ createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_TRANSFORMATION_PARAMETERS,
false, null);
attributes = new ArrayList<>(1);
attributes.add(createAttribute(WSSConstants.ATT_NULL_Algorithm, transforms[1]));
createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_CanonicalizationMethod,
false, attributes);
createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_CanonicalizationMethod);
- createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_TransformationParameters);
+ createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_WSSE_TRANSFORMATION_PARAMETERS);
}
createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_Transform);
} else {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java Thu Jan 14 11:24:39 2016
@@ -100,19 +100,19 @@ public class WSSSignatureOutputProcessor
signaturePartDef.setGenerateXPointer(securePart.isGenerateXPointer());
signaturePartDef.setSigRefId(IDGenerator.generateID(null));
- Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_wsu_Id);
+ Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_WSU_ID);
if (attribute != null) {
signaturePartDef.setSigRefId(attribute.getValue());
} else {
List<XMLSecAttribute> attributeList = new ArrayList<>(1);
- attributeList.add(createAttribute(WSSConstants.ATT_wsu_Id, signaturePartDef.getSigRefId()));
+ attributeList.add(createAttribute(WSSConstants.ATT_WSU_ID, signaturePartDef.getSigRefId()));
xmlSecEvent = addAttributes(xmlSecStartElement, attributeList);
}
} else {
- if (WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(securePart.getName().getLocalPart())) {
+ if (WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM.equals(securePart.getName().getLocalPart())) {
signaturePartDef.setSigRefId(securePart.getIdToReference());
String[] transforms = new String[]{
- WSSConstants.SOAPMESSAGE_NS10_STRTransform,
+ WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM,
WSSConstants.NS_C14N_EXCL
};
signaturePartDef.setTransforms(transforms);
@@ -133,7 +133,7 @@ public class WSSSignatureOutputProcessor
setActiveInternalSignatureOutputProcessor(internalSignatureOutputProcessor);
//we can remove this processor when the whole body will be signed since there is
//nothing more which can be signed.
- if (WSSConstants.TAG_soap_Body_LocalName.equals(xmlSecStartElement.getName().getLocalPart())
+ if (WSSConstants.TAG_SOAP_BODY_LN.equals(xmlSecStartElement.getName().getLocalPart())
&& WSSUtils.isInSOAPBody(xmlSecStartElement)) {
doFinalInternal(outputProcessorChain);
outputProcessorChain.removeProcessor(this);
@@ -254,7 +254,7 @@ public class WSSSignatureOutputProcessor
protected SecurePart securePartMatches(XMLSecStartElement xmlSecStartElement, Map<Object, SecurePart> secureParts) {
if (!xmlSecStartElement.getOnElementDeclaredAttributes().isEmpty()) {
- Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_wsu_Id);
+ Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_WSU_ID);
if (attribute != null) {
SecurePart securePart = secureParts.get(attribute.getValue());
if (securePart != null) {
@@ -275,7 +275,7 @@ public class WSSSignatureOutputProcessor
return securePart;
}
}
- attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_NULL_AssertionID);
+ attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_NULL_ASSERTION_ID);
if (attribute != null) {
SecurePart securePart = secureParts.get(attribute.getValue());
if (securePart != null) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverSameDocument.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverSameDocument.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverSameDocument.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverSameDocument.java Thu Jan 14 11:24:39 2016
@@ -41,12 +41,12 @@ public class ResolverSameDocument extend
@Override
public boolean matches(XMLSecStartElement xmlSecStartElement) {
- Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_wsu_Id);
+ Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_WSU_ID);
if (attribute != null && attribute.getValue().equals(getId())) {
return true;
}
- attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_NULL_AssertionID);
+ attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_NULL_ASSERTION_ID);
if (attribute != null && attribute.getValue().equals(getId())) {
return true;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverXPointer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverXPointer.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverXPointer.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverXPointer.java Thu Jan 14 11:24:39 2016
@@ -50,7 +50,7 @@ public class ResolverXPointer extends or
return false;
}
//case #xpointer(id('ID')):
- Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_wsu_Id);
+ Attribute attribute = xmlSecStartElement.getAttributeByName(WSSConstants.ATT_WSU_ID);
if (attribute != null && attribute.getValue().equals(getId())) {
return true;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java Thu Jan 14 11:24:39 2016
@@ -90,7 +90,7 @@ public class SecurityTokenFactoryImpl ex
if (keyInfoType != null) {
final SecurityTokenReferenceType securityTokenReferenceType
- = XMLSecurityUtils.getQNameType(keyInfoType.getContent(), WSSConstants.TAG_wsse_SecurityTokenReference);
+ = XMLSecurityUtils.getQNameType(keyInfoType.getContent(), WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
if (securityTokenReferenceType != null) {
return getSecurityToken(securityTokenReferenceType, crypto,
((WSSSecurityProperties)securityProperties).getCallbackHandler(), inboundSecurityContext,
@@ -196,10 +196,10 @@ public class SecurityTokenFactoryImpl ex
String tokenType =
XMLSecurityUtils.getQNameAttribute(
securityTokenReferenceType.getOtherAttributes(),
- WSSConstants.ATT_wsse11_TokenType);
+ WSSConstants.ATT_WSSE11_TOKEN_TYPE);
final KeyIdentifierType keyIdentifierType
- = XMLSecurityUtils.getQNameType(securityTokenReferenceType.getAny(), WSSConstants.TAG_wsse_KeyIdentifier);
+ = XMLSecurityUtils.getQNameType(securityTokenReferenceType.getAny(), WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
if (keyIdentifierType != null) {
String valueType = keyIdentifierType.getValueType();
if (valueType == null) {
@@ -225,7 +225,7 @@ public class SecurityTokenFactoryImpl ex
return new X509V3SecurityTokenImpl(
(WSInboundSecurityContext) inboundSecurityContext, crypto, callbackHandler,
binaryContent, securityTokenReferenceType.getId(), securityProperties);
- } else if (WSSConstants.NS_X509SubjectKeyIdentifier.equals(valueType)) {
+ } else if (WSSConstants.NS_X509_SKI.equals(valueType)) {
return new X509SKISecurityTokenImpl(
(WSInboundSecurityContext) inboundSecurityContext, crypto, callbackHandler, binaryContent,
securityTokenReferenceType.getId(), securityProperties);
@@ -281,7 +281,7 @@ public class SecurityTokenFactoryImpl ex
keyIdentifierType.getValue(),
WSSecurityTokenConstants.KeyIdentifier_ExternalReference,
securityProperties);
- } else if (WSSConstants.NS_Kerberos5_AP_REQ_SHA1.equals(valueType)) {
+ } else if (WSSConstants.NS_KERBEROS5_AP_REQ_SHA1.equals(valueType)) {
SecurityTokenProvider<? extends InboundSecurityToken> securityTokenProvider =
inboundSecurityContext.getSecurityTokenProvider(keyIdentifierType.getValue());
if (securityTokenProvider != null) {
@@ -322,7 +322,7 @@ public class SecurityTokenFactoryImpl ex
}
final org.apache.wss4j.binding.wss10.ReferenceType referenceType
- = XMLSecurityUtils.getQNameType(securityTokenReferenceType.getAny(), WSSConstants.TAG_wsse_Reference);
+ = XMLSecurityUtils.getQNameType(securityTokenReferenceType.getAny(), WSSConstants.TAG_WSSE_REFERENCE);
if (referenceType != null) {
//We do not check for BSP.R3023, BSP.R3022, BSP.R3066, BSP.R3067, BSP.R3024, BSP.R3064, BSP.R3211, BSP.R3059
@@ -388,7 +388,7 @@ public class SecurityTokenFactoryImpl ex
}
} else if (securityTokenProvider.getSecurityToken() instanceof UsernameSecurityToken) {
String valueType = referenceType.getValueType();
- if (!WSSConstants.NS_USERNAMETOKEN_PROFILE_UsernameToken.equals(valueType)) {
+ if (!WSSConstants.NS_USERNAMETOKEN_PROFILE_USERNAME_TOKEN.equals(valueType)) {
((WSInboundSecurityContext) inboundSecurityContext).handleBSPRule(BSPRule.R4214);
}
} else if (securityTokenProvider.getSecurityToken() instanceof SamlSecurityToken) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/KerberosTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/KerberosTokenSecurityEvent.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/KerberosTokenSecurityEvent.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/KerberosTokenSecurityEvent.java Thu Jan 14 11:24:39 2016
@@ -39,9 +39,9 @@ public class KerberosTokenSecurityEvent
public boolean isKerberosV5ApReqToken11() {
String type = getSecurityToken().getKerberosTokenValueType();
- if (WSSConstants.NS_Kerberos5_AP_REQ.equals(type)
- || WSSConstants.NS_Kerberos5_AP_REQ1510.equals(type)
- || WSSConstants.NS_Kerberos5_AP_REQ4120.equals(type)) {
+ if (WSSConstants.NS_KERBEROS5_AP_REQ.equals(type)
+ || WSSConstants.NS_KERBEROS5_AP_REQ1510.equals(type)
+ || WSSConstants.NS_KERBEROS5_AP_REQ4120.equals(type)) {
return true;
}
return false;
@@ -49,9 +49,9 @@ public class KerberosTokenSecurityEvent
public boolean isGssKerberosV5ApReqToken11() {
String type = getSecurityToken().getKerberosTokenValueType();
- if (WSSConstants.NS_GSS_Kerberos5_AP_REQ.equals(type)
- || WSSConstants.NS_GSS_Kerberos5_AP_REQ1510.equals(type)
- || WSSConstants.NS_GSS_Kerberos5_AP_REQ4120.equals(type)) {
+ if (WSSConstants.NS_GSS_KERBEROS5_AP_REQ.equals(type)
+ || WSSConstants.NS_GSS_KERBEROS5_AP_REQ1510.equals(type)
+ || WSSConstants.NS_GSS_KERBEROS5_AP_REQ4120.equals(type)) {
return true;
}
return false;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java Thu Jan 14 11:24:39 2016
@@ -411,7 +411,7 @@ public class WSSec {
List<SecurePart> signatureParts = securityProperties.getSignatureSecureParts();
if (signatureParts.isEmpty()) {
SecurePart securePart = new SecurePart(
- new QName(WSSConstants.NS_SOAP12, WSSConstants.TAG_soap_Body_LocalName),
+ new QName(WSSConstants.NS_SOAP12, WSSConstants.TAG_SOAP_BODY_LN),
SecurePart.Modifier.Element);
signatureParts.add(securePart);
}
@@ -419,7 +419,7 @@ public class WSSec {
List<SecurePart> encryptionParts = securityProperties.getEncryptionSecureParts();
if (encryptionParts.isEmpty()) {
SecurePart securePart = new SecurePart(
- new QName(WSSConstants.NS_SOAP12, WSSConstants.TAG_soap_Body_LocalName),
+ new QName(WSSConstants.NS_SOAP12, WSSConstants.TAG_SOAP_BODY_LN),
SecurePart.Modifier.Content);
encryptionParts.add(securePart);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java?rev=1724585&r1=1724584&r2=1724585&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java Thu Jan 14 11:24:39 2016
@@ -140,9 +140,9 @@ public class WSSUtils extends XMLSecurit
public static String getSOAPMessageVersionNamespace(XMLSecEvent xmlSecEvent) {
XMLSecStartElement xmlSecStartElement = xmlSecEvent.getStartElementAtLevel(1);
if (xmlSecStartElement != null) {
- if (WSSConstants.TAG_soap11_Envelope.equals(xmlSecStartElement.getName())) {
+ if (WSSConstants.TAG_SOAP11_ENVELOPE.equals(xmlSecStartElement.getName())) {
return WSSConstants.NS_SOAP11;
- } else if (WSSConstants.TAG_soap12_Envelope.equals(xmlSecStartElement.getName())) {
+ } else if (WSSConstants.TAG_SOAP12_ENVELOPE.equals(xmlSecStartElement.getName())) {
return WSSConstants.NS_SOAP12;
}
}
@@ -157,7 +157,7 @@ public class WSSUtils extends XMLSecurit
public static boolean isInSOAPHeader(List<QName> elementPath) {
if (elementPath.size() > 1) {
final QName secondLevelElementName = elementPath.get(1);
- return WSSConstants.TAG_soap_Header_LocalName.equals(secondLevelElementName.getLocalPart())
+ return WSSConstants.TAG_SOAP_HEADER_LN.equals(secondLevelElementName.getLocalPart())
&& elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI());
}
return false;
@@ -171,7 +171,7 @@ public class WSSUtils extends XMLSecurit
public static boolean isInSOAPBody(List<QName> elementPath) {
if (elementPath.size() > 1) {
final QName secondLevelElementName = elementPath.get(1);
- return WSSConstants.TAG_soap_Body_LocalName.equals(secondLevelElementName.getLocalPart())
+ return WSSConstants.TAG_SOAP_BODY_LN.equals(secondLevelElementName.getLocalPart())
&& elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI());
}
return false;
@@ -185,9 +185,9 @@ public class WSSUtils extends XMLSecurit
public static boolean isInSecurityHeader(XMLSecEvent xmlSecEvent, List<QName> elementPath, String actorOrRole) {
if (elementPath.size() > 2) {
final QName secondLevelElementName = elementPath.get(1);
- return WSSConstants.TAG_wsse_Security.equals(elementPath.get(2))
+ return WSSConstants.TAG_WSSE_SECURITY.equals(elementPath.get(2))
&& isResponsibleActorOrRole(xmlSecEvent.getStartElementAtLevel(3), actorOrRole)
- && WSSConstants.TAG_soap_Header_LocalName.equals(secondLevelElementName.getLocalPart())
+ && WSSConstants.TAG_SOAP_HEADER_LN.equals(secondLevelElementName.getLocalPart())
&& elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI());
}
return false;
@@ -201,9 +201,9 @@ public class WSSUtils extends XMLSecurit
final List<QName> elementPath = xmlSecEvent.getElementPath();
if (elementPath.size() == 3) {
final QName secondLevelElementName = elementPath.get(1);
- return WSSConstants.TAG_wsse_Security.equals(elementPath.get(2))
+ return WSSConstants.TAG_WSSE_SECURITY.equals(elementPath.get(2))
&& isResponsibleActorOrRole(xmlSecEvent.getStartElementAtLevel(3), actorOrRole)
- && WSSConstants.TAG_soap_Header_LocalName.equals(secondLevelElementName.getLocalPart())
+ && WSSConstants.TAG_SOAP_HEADER_LN.equals(secondLevelElementName.getLocalPart())
&& elementPath.get(0).getNamespaceURI().equals(secondLevelElementName.getNamespaceURI());
}
return false;
@@ -213,9 +213,9 @@ public class WSSUtils extends XMLSecurit
final QName actorRole;
final String soapVersionNamespace = getSOAPMessageVersionNamespace(xmlSecStartElement);
if (WSSConstants.NS_SOAP11.equals(soapVersionNamespace)) {
- actorRole = WSSConstants.ATT_soap11_Actor;
+ actorRole = WSSConstants.ATT_SOAP11_ACTOR;
} else {
- actorRole = WSSConstants.ATT_soap12_Role;
+ actorRole = WSSConstants.ATT_SOAP12_ROLE;
}
String actor = null;
@@ -243,10 +243,10 @@ public class WSSUtils extends XMLSecurit
valueType = WSSConstants.NS_X509PKIPathv1;
}
List<XMLSecAttribute> attributes = new ArrayList<>(3);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, valueType));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_wsu_Id, referenceId));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_BinarySecurityToken, false, attributes);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, valueType));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_WSU_ID, referenceId));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN, false, attributes);
try {
if (useSingleCertificate) {
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(x509Certificates[0].getEncoded()));
@@ -262,7 +262,7 @@ public class WSSUtils extends XMLSecurit
} catch (CertificateEncodingException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e);
}
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_BinarySecurityToken);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
}
public static void createX509SubjectKeyIdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -275,12 +275,12 @@ public class WSSUtils extends XMLSecurit
}
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_X509SubjectKeyIdentifier));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_X509_SKI));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
byte data[] = new Merlin().getSKIBytesFromCert(x509Certificates[0]);
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(data));
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createX509KeyIdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -288,15 +288,15 @@ public class WSSUtils extends XMLSecurit
X509Certificate[] x509Certificates)
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_X509_V3_TYPE));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_X509_V3_TYPE));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
try {
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(x509Certificates[0].getEncoded()));
} catch (CertificateEncodingException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e);
}
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createThumbprintKeyIdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -304,9 +304,9 @@ public class WSSUtils extends XMLSecurit
X509Certificate[] x509Certificates)
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_THUMBPRINT));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_THUMBPRINT));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
try {
MessageDigest sha = MessageDigest.getInstance("SHA-1");
byte[] data = sha.digest(x509Certificates[0].getEncoded());
@@ -314,7 +314,7 @@ public class WSSUtils extends XMLSecurit
} catch (CertificateEncodingException | NoSuchAlgorithmException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e);
}
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createEncryptedKeySha1IdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -335,11 +335,11 @@ public class WSSUtils extends XMLSecurit
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_ENCRYPTED_KEY_SHA1));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_ENCRYPTED_KEY_SHA1));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, identifier);
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createKerberosSha1IdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -347,11 +347,11 @@ public class WSSUtils extends XMLSecurit
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_Kerberos5_AP_REQ_SHA1));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ENCODING_TYPE, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_KERBEROS5_AP_REQ_SHA1));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, identifier);
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createBSTReferenceStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -362,10 +362,10 @@ public class WSSUtils extends XMLSecurit
String uri = includedInMessage ? "#" + referenceId : referenceId;
attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_URI, uri));
if (valueType != null) {
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, valueType));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, valueType));
}
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference, false, attributes);
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference);
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_REFERENCE, false, attributes);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_REFERENCE);
}
public static void createEmbeddedKeyIdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -374,13 +374,13 @@ public class WSSUtils extends XMLSecurit
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(1);
if (WSSecurityTokenConstants.Saml10Token.equals(tokenType) || WSSecurityTokenConstants.Saml11Token.equals(tokenType)) {
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_SAML10_TYPE));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_SAML10_TYPE));
} else if (WSSecurityTokenConstants.Saml20Token.equals(tokenType)) {
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_SAML20_TYPE));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_SAML20_TYPE));
}
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, referenceId);
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createSAMLKeyIdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -389,13 +389,13 @@ public class WSSUtils extends XMLSecurit
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(1);
if (WSSecurityTokenConstants.Saml10Token.equals(tokenType) || WSSecurityTokenConstants.Saml11Token.equals(tokenType)) {
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_SAML10_TYPE));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_SAML10_TYPE));
} else if (WSSecurityTokenConstants.Saml20Token.equals(tokenType)) {
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_SAML20_TYPE));
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_SAML20_TYPE));
}
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER, false, attributes);
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, referenceId);
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_KEY_IDENTIFIER);
}
public static void createUsernameTokenReferenceStructure(AbstractOutputProcessor abstractOutputProcessor,
@@ -403,9 +403,9 @@ public class WSSUtils extends XMLSecurit
throws XMLStreamException, XMLSecurityException {
List<XMLSecAttribute> attributes = new ArrayList<>(2);
attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_URI, "#" + tokenId));
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_USERNAMETOKEN_PROFILE_UsernameToken));
- abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference, false, attributes);
- abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference);
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_VALUE_TYPE, WSSConstants.NS_USERNAMETOKEN_PROFILE_USERNAME_TOKEN));
+ abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_REFERENCE, false, attributes);
+ abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_WSSE_REFERENCE);
}
public static void createReferenceListStructureForEncryption(AbstractOutputProcessor abstractOutputProcessor,
@@ -500,20 +500,20 @@ public class WSSUtils extends XMLSecurit
XMLSecurityConstants.TAG_dsig_KeyInfo, true, null);
attributes = new ArrayList<>(1);
- attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_wsse11_TokenType,
+ attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_WSSE11_TOKEN_TYPE,
WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
- WSSConstants.TAG_wsse_SecurityTokenReference, true, attributes);
+ WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE, true, attributes);
attributes = new ArrayList<XMLSecAttribute>(1);
attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_URI,
"#" + encryptionPartDef.getKeyId()));
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
- WSSConstants.TAG_wsse_Reference, false, attributes);
+ WSSConstants.TAG_WSSE_REFERENCE, false, attributes);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain,
- WSSConstants.TAG_wsse_Reference);
+ WSSConstants.TAG_WSSE_REFERENCE);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain,
- WSSConstants.TAG_wsse_SecurityTokenReference);
+ WSSConstants.TAG_WSSE_SECURITY_TOKEN_REFERENCE);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain,
XMLSecurityConstants.TAG_dsig_KeyInfo);