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/06 12:07:27 UTC
svn commit: r1723283 - in
/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom:
./ action/ callback/ handler/ message/ message/token/ saml/ transform/
Author: coheigea
Date: Wed Jan 6 11:07:27 2016
New Revision: 1723283
URL: http://svn.apache.org/viewvc?rev=1723283&view=rev
Log:
More checkstyle work
Modified:
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/SOAP11Constants.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/callback/DOMCallbackLookup.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/SOAP11Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/SOAP11Constants.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/SOAP11Constants.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/SOAP11Constants.java Wed Jan 6 11:07:27 2016
@@ -29,30 +29,27 @@ public class SOAP11Constants implements
*
*/
private static final long serialVersionUID = 3809268485386395322L;
- private static final QName headerQName = new QName(WSConstants.URI_SOAP11_ENV,
- WSConstants.ELEM_HEADER);
- private static final QName bodyQName = new QName(WSConstants.URI_SOAP11_ENV,
- WSConstants.ELEM_BODY);
- private static final QName roleQName = new QName(WSConstants.URI_SOAP11_ENV,
- WSConstants.ATTR_ACTOR);
+ private static final QName HEADER_QNAME = new QName(WSConstants.URI_SOAP11_ENV, WSConstants.ELEM_HEADER);
+ private static final QName BODY_QNAME = new QName(WSConstants.URI_SOAP11_ENV, WSConstants.ELEM_BODY);
+ private static final QName ROLE_QNAME = new QName(WSConstants.URI_SOAP11_ENV, WSConstants.ATTR_ACTOR);
public String getEnvelopeURI() {
return WSConstants.URI_SOAP11_ENV;
}
public QName getHeaderQName() {
- return headerQName;
+ return HEADER_QNAME;
}
public QName getBodyQName() {
- return bodyQName;
+ return BODY_QNAME;
}
/**
* Obtain the QName for the role attribute (actor/role)
*/
public QName getRoleAttributeQName() {
- return roleQName;
+ return ROLE_QNAME;
}
/**
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java Wed Jan 6 11:07:27 2016
@@ -55,8 +55,8 @@ public abstract class AbstractDerivedAct
}
Node firstChild = secHeader.getFirstChild();
while (firstChild != null) {
- if (firstChild instanceof Element &&
- namespace.equals(((Element)firstChild).getNamespaceURI())
+ if (firstChild instanceof Element
+ && namespace.equals(((Element)firstChild).getNamespaceURI())
&& localName.equals(((Element)firstChild).getLocalName())
&& firstChild.getNextSibling() != null) {
return firstChild.getNextSibling();
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java Wed Jan 6 11:07:27 2016
@@ -147,8 +147,8 @@ public class SignatureAction implements
List<javax.xml.crypto.dsig.Reference> referenceList =
wsSign.addReferencesToSign(parts, reqData.getSecHeader());
- if (signBST ||
- reqData.isAppendSignatureAfterTimestamp() && siblingElementToPrepend == null) {
+ if (signBST
+ || reqData.isAppendSignatureAfterTimestamp() && siblingElementToPrepend == null) {
wsSign.computeSignature(referenceList, false, null);
} else {
wsSign.computeSignature(referenceList, true, siblingElementToPrepend);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/callback/DOMCallbackLookup.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/callback/DOMCallbackLookup.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/callback/DOMCallbackLookup.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/callback/DOMCallbackLookup.java Wed Jan 6 11:07:27 2016
@@ -153,8 +153,7 @@ public class DOMCallbackLookup implement
// Try the SOAP Body first
//
Element bodyElement = getSOAPBody();
- if (WSConstants.ELEM_BODY.equals(localname) &&
- bodyElement.getNamespaceURI().equals(namespace)) {
+ if (WSConstants.ELEM_BODY.equals(localname) && bodyElement.getNamespaceURI().equals(namespace)) {
return Collections.singletonList(bodyElement);
}
return XMLUtils.findElements(doc.getDocumentElement(), localname, namespace);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Wed Jan 6 11:07:27 2016
@@ -419,7 +419,7 @@ public abstract class WSHandler {
protected void checkSignatureConfirmation(
RequestData reqData,
WSHandlerResult handlerResults
- ) throws WSSecurityException{
+ ) throws WSSecurityException {
if (doDebug) {
LOG.debug("Check Signature confirmation");
}
@@ -1392,7 +1392,7 @@ public abstract class WSHandler {
*/
public String getStringOption(String key) {
Object o = getOption(key);
- if (o instanceof String){
+ if (o instanceof String) {
return (String) o;
} else {
return null;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java Wed Jan 6 11:07:27 2016
@@ -197,9 +197,8 @@ public class WSSecDKEncrypt extends WSSe
symEncAlgo = algo;
}
- protected int getDerivedKeyLength() throws WSSecurityException{
- return derivedKeyLength > 0 ? derivedKeyLength :
- KeyUtils.getKeyLength(symEncAlgo);
+ protected int getDerivedKeyLength() throws WSSecurityException {
+ return derivedKeyLength > 0 ? derivedKeyLength : KeyUtils.getKeyLength(symEncAlgo);
}
public void setDerivedKeyLength(int keyLength) {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java Wed Jan 6 11:07:27 2016
@@ -283,8 +283,7 @@ public class WSSecDKSign extends WSSecDe
}
protected int getDerivedKeyLength() throws WSSecurityException {
- return derivedKeyLength > 0 ? derivedKeyLength :
- KeyUtils.getKeyLength(sigAlgo);
+ return derivedKeyLength > 0 ? derivedKeyLength : KeyUtils.getKeyLength(sigAlgo);
}
public void setDerivedKeyLength(int keyLength) {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Wed Jan 6 11:07:27 2016
@@ -487,7 +487,8 @@ public class WSSecEncrypt extends WSSecE
if (null != children) {
serializedOctets = serializer.serializeToByteArray(children);
} else {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_ENCRYPTION, "Element has no content.");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_ENCRYPTION,
+ "Element has no content.");
}
} else {
serializedOctets = serializer.serializeToByteArray(elementToEncrypt);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java Wed Jan 6 11:07:27 2016
@@ -259,7 +259,7 @@ public class WSSecEncryptedKey extends W
if (WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(keyEncAlgo)) {
if (WSConstants.MGF_SHA224.equals(mgfAlgo)) {
mgf1ParameterSpec = new MGF1ParameterSpec("SHA-224");
- } if (WSConstants.MGF_SHA256.equals(mgfAlgo)) {
+ } else if (WSConstants.MGF_SHA256.equals(mgfAlgo)) {
mgf1ParameterSpec = new MGF1ParameterSpec("SHA-256");
} else if (WSConstants.MGF_SHA384.equals(mgfAlgo)) {
mgf1ParameterSpec = new MGF1ParameterSpec("SHA-384");
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java Wed Jan 6 11:07:27 2016
@@ -289,8 +289,8 @@ public class WSSecSignatureBase extends
public List<String> getInclusivePrefixes(Element target, boolean excludeVisible) {
List<String> result = new ArrayList<>();
Node parent = target;
- while (parent.getParentNode() != null &&
- !(Node.DOCUMENT_NODE == parent.getParentNode().getNodeType())) {
+ while (parent.getParentNode() != null
+ && !(Node.DOCUMENT_NODE == parent.getParentNode().getNodeType())) {
parent = parent.getParentNode();
NamedNodeMap attributes = parent.getAttributes();
for (int i = 0; i < attributes.getLength(); i++) {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java Wed Jan 6 11:07:27 2016
@@ -113,8 +113,8 @@ public class DerivedKeyToken {
this.bspEnforcer = bspEnforcer;
QName el = new QName(element.getNamespaceURI(), element.getLocalName());
- if (!(el.equals(ConversationConstants.DERIVED_KEY_TOKEN_QNAME_05_02) ||
- el.equals(ConversationConstants.DERIVED_KEY_TOKEN_QNAME_05_12))) {
+ if (!(el.equals(ConversationConstants.DERIVED_KEY_TOKEN_QNAME_05_02)
+ || el.equals(ConversationConstants.DERIVED_KEY_TOKEN_QNAME_05_12))) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN
);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java Wed Jan 6 11:07:27 2016
@@ -118,7 +118,8 @@ public class KerberosSecurity extends Bi
public void retrieveServiceTicket(
CallbackHandler callbackHandler
) throws WSSecurityException {
- KerberosContextAndServiceNameCallback contextAndServiceNameCallback = new KerberosContextAndServiceNameCallback();
+ KerberosContextAndServiceNameCallback contextAndServiceNameCallback =
+ new KerberosContextAndServiceNameCallback();
try {
callbackHandler.handle(new Callback[]{contextAndServiceNameCallback});
} catch (IOException | UnsupportedCallbackException e) {
@@ -127,11 +128,13 @@ public class KerberosSecurity extends Bi
String jaasLoginModuleName = contextAndServiceNameCallback.getContextName();
if (jaasLoginModuleName == null) {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "kerberosCallbackContextNameNotSupplied");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
+ "kerberosCallbackContextNameNotSupplied");
}
String serviceName = contextAndServiceNameCallback.getServiceName();
if (serviceName == null) {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "kerberosCallbackServiceNameNotSupplied");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
+ "kerberosCallbackServiceNameNotSupplied");
}
retrieveServiceTicket(jaasLoginModuleName, callbackHandler, serviceName);
@@ -237,7 +240,7 @@ public class KerberosSecurity extends Bi
}
if (LOG.isDebugEnabled()) {
- if (secretKey == null ) {
+ if (secretKey == null) {
LOG.debug("No secret key for kerberos was found");
} else {
LOG.debug("Successfully retrieved a secret key for kerberos");
@@ -245,8 +248,7 @@ public class KerberosSecurity extends Bi
}
setToken(krbCtx.getKerberosToken());
- }
- catch (PrivilegedActionException e) {
+ } catch (PrivilegedActionException e) {
Throwable cause = e.getCause();
if (cause instanceof WSSecurityException) {
throw (WSSecurityException) cause;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java Wed Jan 6 11:07:27 2016
@@ -75,8 +75,8 @@ public class Timestamp {
) {
if (Node.ELEMENT_NODE == currentChild.getNodeType()) {
Element currentChildElement = (Element) currentChild;
- if (WSConstants.CREATED_LN.equals(currentChild.getLocalName()) &&
- WSConstants.WSU_NS.equals(currentChild.getNamespaceURI())) {
+ if (WSConstants.CREATED_LN.equals(currentChild.getLocalName())
+ && WSConstants.WSU_NS.equals(currentChild.getNamespaceURI())) {
if (strCreated == null) {
String valueType = currentChildElement.getAttributeNS(null, "ValueType");
if (valueType != null && !"".equals(valueType)) {
@@ -88,13 +88,13 @@ public class Timestamp {
// Test for multiple Created elements
bspEnforcer.handleBSPRule(BSPRule.R3203);
}
- } else if (WSConstants.EXPIRES_LN.equals(currentChild.getLocalName()) &&
- WSConstants.WSU_NS.equals(currentChild.getNamespaceURI())) {
+ } else if (WSConstants.EXPIRES_LN.equals(currentChild.getLocalName())
+ && WSConstants.WSU_NS.equals(currentChild.getNamespaceURI())) {
if (strCreated == null) {
// Created must appear before Expires
bspEnforcer.handleBSPRule(BSPRule.R3221);
}
- if (strExpires != null ) {
+ if (strExpires != null) {
// We can't have multiple Expires elements
bspEnforcer.handleBSPRule(BSPRule.R3224);
} else {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java Wed Jan 6 11:07:27 2016
@@ -374,13 +374,24 @@ public class WSSecSignatureSAML extends
);
}
+ X509Certificate cert = certs != null ? certs[0] : null;
+ configureKeyInfo(doc, secRef, cert, iCrypto != null ? iCrypto : uCrypto,
+ samlAssertion);
+
+ wsDocInfo.addTokenElement(samlToken, false);
+ }
+
+ private void configureKeyInfo(
+ Document doc, SecurityTokenReference secRef, X509Certificate cert,
+ Crypto crypto, SamlAssertionWrapper samlAssertion
+ ) throws WSSecurityException {
if (senderVouches) {
switch (keyIdentifierType) {
case WSConstants.BST_DIRECT_REFERENCE:
Reference ref = new Reference(doc);
ref.setURI("#" + certUri);
BinarySecurity binarySecurity = new X509Security(doc);
- ((X509Security) binarySecurity).setX509Certificate(certs[0]);
+ ((X509Security) binarySecurity).setX509Certificate(cert);
binarySecurity.setID(certUri);
bstToken = binarySecurity.getElement();
wsDocInfo.addTokenElement(bstToken, false);
@@ -389,20 +400,20 @@ public class WSSecSignatureSAML extends
break;
case WSConstants.X509_KEY_IDENTIFIER :
- secRef.setKeyIdentifier(certs[0]);
+ secRef.setKeyIdentifier(cert);
break;
case WSConstants.SKI_KEY_IDENTIFIER:
- secRef.setKeyIdentifierSKI(certs[0], iCrypto != null ? iCrypto : uCrypto);
+ secRef.setKeyIdentifierSKI(cert, crypto);
break;
case WSConstants.THUMBPRINT_IDENTIFIER:
- secRef.setKeyIdentifierThumb(certs[0]);
+ secRef.setKeyIdentifierThumb(cert);
break;
case WSConstants.ISSUER_SERIAL:
- final String issuer = certs[0].getIssuerDN().getName();
- final java.math.BigInteger serialNumber = certs[0].getSerialNumber();
+ final String issuer = cert.getIssuerDN().getName();
+ final java.math.BigInteger serialNumber = cert.getSerialNumber();
final DOMX509IssuerSerial domIssuerSerial =
new DOMX509IssuerSerial(document, issuer, serialNumber);
final DOMX509Data domX509Data = new DOMX509Data(document, domIssuerSerial);
@@ -449,8 +460,6 @@ public class WSSecSignatureSAML extends
keyInfoFactory.newKeyInfo(
java.util.Collections.singletonList(structure), keyInfoUri
);
-
- wsDocInfo.addTokenElement(samlToken, false);
}
/**
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java Wed Jan 6 11:07:27 2016
@@ -61,7 +61,8 @@ public class AttachmentCompleteSignature
Attachment attachment;
if (attachmentTransformParameterSpec != null) {
attachment = attachmentTransformParameterSpec.getAttachment();
- context.setProperty(ATTACHMENT_CALLBACKHANDLER, attachmentTransformParameterSpec.getAttachmentCallbackHandler());
+ context.setProperty(ATTACHMENT_CALLBACKHANDLER,
+ attachmentTransformParameterSpec.getAttachmentCallbackHandler());
} else {
attachment = attachmentRequestCallback(context, attachmentId);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java Wed Jan 6 11:07:27 2016
@@ -107,15 +107,18 @@ public class AttachmentContentSignatureT
Attachment attachment;
if (attachmentTransformParameterSpec != null) {
attachment = attachmentTransformParameterSpec.getAttachment();
- context.setProperty(ATTACHMENT_CALLBACKHANDLER, attachmentTransformParameterSpec.getAttachmentCallbackHandler());
+ context.setProperty(ATTACHMENT_CALLBACKHANDLER,
+ attachmentTransformParameterSpec.getAttachmentCallbackHandler());
} else {
attachment = attachmentRequestCallback(context, attachmentId);
}
return processAttachment(context, os, attachmentUri, attachment);
}
- protected Attachment attachmentRequestCallback(XMLCryptoContext context, String attachmentId) throws TransformException {
- CallbackHandler attachmentCallbackHandler = (CallbackHandler) context.getProperty(ATTACHMENT_CALLBACKHANDLER);
+ protected Attachment attachmentRequestCallback(XMLCryptoContext context, String attachmentId)
+ throws TransformException {
+ CallbackHandler attachmentCallbackHandler =
+ (CallbackHandler) context.getProperty(ATTACHMENT_CALLBACKHANDLER);
if (attachmentCallbackHandler == null) {
throw new TransformException("No attachment callbackhandler supplied");
}
@@ -133,8 +136,10 @@ public class AttachmentContentSignatureT
return attachments.get(0);
}
- protected void attachmentResultCallback(XMLCryptoContext context, Attachment attachment) throws TransformException {
- CallbackHandler attachmentCallbackHandler = (CallbackHandler) context.getProperty(ATTACHMENT_CALLBACKHANDLER);
+ protected void attachmentResultCallback(XMLCryptoContext context, Attachment attachment)
+ throws TransformException {
+ CallbackHandler attachmentCallbackHandler =
+ (CallbackHandler) context.getProperty(ATTACHMENT_CALLBACKHANDLER);
if (attachmentCallbackHandler == null) {
throw new TransformException("No attachment callbackhandler supplied");
}
@@ -149,7 +154,8 @@ public class AttachmentContentSignatureT
}
@SuppressWarnings("resource")
- protected Data processAttachment(XMLCryptoContext context, OutputStream os, String attachmentUri, Attachment attachment) throws TransformException {
+ protected Data processAttachment(XMLCryptoContext context, OutputStream os, String attachmentUri,
+ Attachment attachment) throws TransformException {
try {
//try to reuse the inputStream in the hope that the provided inputStream is backed by a disk storage
InputStream inputStream = attachment.getSourceStream();
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java Wed Jan 6 11:07:27 2016
@@ -80,8 +80,7 @@ public class STRTransform extends Transf
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException {
if (context != null && !(context instanceof DOMCryptoContext)) {
- throw new ClassCastException
- ("context must be of type DOMCryptoContext");
+ throw new ClassCastException("context must be of type DOMCryptoContext");
}
if (!(parent instanceof javax.xml.crypto.dom.DOMStructure)) {
throw new ClassCastException("parent must be of type DOMStructure");
@@ -93,8 +92,7 @@ public class STRTransform extends Transf
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException {
if (context != null && !(context instanceof DOMCryptoContext)) {
- throw new ClassCastException
- ("context must be of type DOMCryptoContext");
+ throw new ClassCastException("context must be of type DOMCryptoContext");
}
if (!(parent instanceof javax.xml.crypto.dom.DOMStructure)) {
throw new ClassCastException("parent must be of type DOMStructure");
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java?rev=1723283&r1=1723282&r2=1723283&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java Wed Jan 6 11:07:27 2016
@@ -71,12 +71,11 @@ public final class STRTransformUtil {
Reference reference = secRef.getReference();
return STRParserUtil.getTokenElement(doc, wsDocInfo, null, reference.getURI(), reference.getValueType());
- }
- //
- // second case: IssuerSerial, lookup in keystore, wrap in BST according
- // to specification
- //
- else if (secRef.containsX509Data() || secRef.containsX509IssuerSerial()) {
+ } else if (secRef.containsX509Data() || secRef.containsX509IssuerSerial()) {
+ //
+ // second case: IssuerSerial, lookup in keystore, wrap in BST according
+ // to specification
+ //
if (LOG.isDebugEnabled()) {
LOG.debug("STR: IssuerSerial");
}
@@ -86,13 +85,12 @@ public final class STRTransformUtil {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK);
}
return createBSTX509(doc, certs[0], secRef.getElement(), secRef.getKeyIdentifierEncodingType());
- }
- //
- // third case: KeyIdentifier. For SKI, lookup in keystore, wrap in
- // BST according to specification. Otherwise if it's a wsse:KeyIdentifier it could
- // be a SAML assertion, so try and find the referenced element.
- //
- else if (secRef.containsKeyIdentifier()) {
+ } else if (secRef.containsKeyIdentifier()) {
+ //
+ // third case: KeyIdentifier. For SKI, lookup in keystore, wrap in
+ // BST according to specification. Otherwise if it's a wsse:KeyIdentifier it could
+ // be a SAML assertion, so try and find the referenced element.
+ //
if (LOG.isDebugEnabled()) {
LOG.debug("STR: KeyIdentifier");
}
@@ -119,7 +117,7 @@ public final class STRTransformUtil {
public static Element createBSTX509(Document doc, X509Certificate cert, Element secRefE,
String secRefEncType)
throws WSSecurityException {
- byte data[];
+ byte[] data;
try {
data = cert.getEncoded();
} catch (CertificateEncodingException e) {