You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/06/19 12:47:08 UTC
svn commit: r1686380 [1/3] - in /webservices/wss4j/trunk:
integration/src/test/java/org/apache/wss4j/integration/test/kerberos/
ws-security-common/src/main/java/org/apache/wss4j/common/saml/
ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/ w...
Author: coheigea
Date: Fri Jun 19 10:47:06 2015
New Revision: 1686380
URL: http://svn.apache.org/r1686380
Log:
Some more refactoring based on static code analysis
Modified:
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java
Modified: webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java (original)
+++ webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java Fri Jun 19 10:47:06 2015
@@ -224,8 +224,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -282,8 +282,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
SpnegoTokenContext spnegoToken = new SpnegoTokenContext();
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -363,8 +363,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -437,8 +437,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -515,8 +515,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -587,8 +587,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -660,8 +660,8 @@ public class KerberosTest extends Abstra
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -816,8 +816,8 @@ public class KerberosTest extends Abstra
{
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -909,8 +909,8 @@ public class KerberosTest extends Abstra
{
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -1082,8 +1082,8 @@ public class KerberosTest extends Abstra
{
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
@@ -1173,8 +1173,8 @@ public class KerberosTest extends Abstra
{
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
KerberosSecurity bst = new KerberosSecurity(doc);
CallbackHandler callbackHandler = new CallbackHandler() {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Fri Jun 19 10:47:06 2015
@@ -40,6 +40,7 @@ import org.apache.xml.security.utils.Bas
import org.apache.xml.security.utils.XMLUtils;
import org.joda.time.DateTime;
import org.opensaml.core.xml.XMLObject;
+import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.SAMLObjectContentReference;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.common.SignableSAMLObject;
@@ -79,19 +80,9 @@ public class SamlAssertionWrapper {
org.slf4j.LoggerFactory.getLogger(SamlAssertionWrapper.class);
/**
- * Raw SAML assertion data
+ * Raw SAML Object
*/
- private XMLObject xmlObject = null;
-
- /**
- * Typed SAML v1.1 assertion
- */
- private org.opensaml.saml.saml1.core.Assertion saml1 = null;
-
- /**
- * Typed SAML v2.0 assertion
- */
- private org.opensaml.saml.saml2.core.Assertion saml2 = null;
+ private SAMLObject samlObject = null;
/**
* Which SAML specification to use (currently, only v1.1 and v2.0 are supported)
@@ -153,45 +144,28 @@ public class SamlAssertionWrapper {
/**
* Constructor SamlAssertionWrapper creates a new SamlAssertionWrapper instance.
- *
- * @param saml2 of type Assertion
- */
- public SamlAssertionWrapper(org.opensaml.saml.saml2.core.Assertion saml2) {
- this((XMLObject)saml2);
- }
-
- /**
- * Constructor SamlAssertionWrapper creates a new SamlAssertionWrapper instance.
- *
- * @param saml1 of type Assertion
- */
- public SamlAssertionWrapper(org.opensaml.saml.saml1.core.Assertion saml1) {
- this((XMLObject)saml1);
- }
-
- /**
- * Constructor SamlAssertionWrapper creates a new SamlAssertionWrapper instance.
* This is the primary constructor. All other constructor calls should
* be routed to this method to ensure that the wrapper is initialized
* correctly.
*
- * @param xmlObject of type XMLObject
+ * @param samlObject of type SAMLObject
*/
- public SamlAssertionWrapper(XMLObject xmlObject) {
+ public SamlAssertionWrapper(SAMLObject samlObject) throws WSSecurityException {
OpenSAMLUtil.initSamlEngine();
- this.xmlObject = xmlObject;
- if (xmlObject instanceof org.opensaml.saml.saml1.core.Assertion) {
- this.saml1 = (org.opensaml.saml.saml1.core.Assertion) xmlObject;
+ this.samlObject = samlObject;
+ if (samlObject instanceof org.opensaml.saml.saml1.core.Assertion) {
samlVersion = SAMLVersion.VERSION_11;
- } else if (xmlObject instanceof org.opensaml.saml.saml2.core.Assertion) {
- this.saml2 = (org.opensaml.saml.saml2.core.Assertion) xmlObject;
+ } else if (samlObject instanceof org.opensaml.saml.saml2.core.Assertion) {
samlVersion = SAMLVersion.VERSION_20;
} else {
LOG.error(
"SamlAssertionWrapper: found unexpected type "
- + (xmlObject != null ? xmlObject.getClass().getName() : null)
+ + (samlObject != null ? samlObject.getClass().getName() : null)
);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
+ new Object[] {"A SAML 2.0 or 1.1 Assertion can only be used with "
+ + "SamlAssertionWrapper"});
}
fromDOM = false;
}
@@ -222,7 +196,10 @@ public class SamlAssertionWrapper {
* @return the saml1 (type Assertion) of this SamlAssertionWrapper object.
*/
public org.opensaml.saml.saml1.core.Assertion getSaml1() {
- return saml1;
+ if (samlVersion == SAMLVersion.VERSION_11) {
+ return (org.opensaml.saml.saml1.core.Assertion)samlObject;
+ }
+ return null;
}
/**
@@ -231,16 +208,10 @@ public class SamlAssertionWrapper {
* @return the saml2 (type Assertion) of this SamlAssertionWrapper object.
*/
public org.opensaml.saml.saml2.core.Assertion getSaml2() {
- return saml2;
- }
-
- /**
- * Method getXmlObject returns the xmlObject of this SamlAssertionWrapper object.
- *
- * @return the xmlObject (type XMLObject) of this SamlAssertionWrapper object.
- */
- public XMLObject getXmlObject() {
- return xmlObject;
+ if (samlVersion == SAMLVersion.VERSION_20) {
+ return (org.opensaml.saml.saml2.core.Assertion)samlObject;
+ }
+ return null;
}
/**
@@ -249,7 +220,7 @@ public class SamlAssertionWrapper {
* @return the created (type boolean) of this SamlAssertionWrapper object.
*/
public boolean isCreated() {
- return saml1 != null || saml2 != null;
+ return samlObject != null;
}
@@ -268,7 +239,7 @@ public class SamlAssertionWrapper {
}
return assertionElement;
}
- assertionElement = OpenSAMLUtil.toDom(xmlObject, doc);
+ assertionElement = OpenSAMLUtil.toDom(samlObject, doc);
return assertionElement;
}
@@ -292,22 +263,23 @@ public class SamlAssertionWrapper {
*/
public String getId() {
String id = null;
- if (saml2 != null) {
- id = saml2.getID();
- } else if (saml1 != null) {
- id = saml1.getID();
+ if (samlVersion == SAMLVersion.VERSION_20) {
+ id = ((org.opensaml.saml.saml2.core.Assertion)samlObject).getID();
+ if (id == null || id.length() == 0) {
+ LOG.error("SamlAssertionWrapper: ID was null, seeting a new ID value");
+ id = IDGenerator.generateID("_");
+ ((org.opensaml.saml.saml2.core.Assertion)samlObject).setID(id);
+ }
+ } else if (samlVersion == SAMLVersion.VERSION_11) {
+ id = ((org.opensaml.saml.saml1.core.Assertion)samlObject).getID();
+ if (id == null || id.length() == 0) {
+ LOG.error("SamlAssertionWrapper: ID was null, seeting a new ID value");
+ id = IDGenerator.generateID("_");
+ ((org.opensaml.saml.saml1.core.Assertion)samlObject).setID(id);
+ }
} else {
LOG.error("SamlAssertionWrapper: unable to return ID - no saml assertion object");
}
- if (id == null || id.length() == 0) {
- LOG.error("SamlAssertionWrapper: ID was null, seeting a new ID value");
- id = IDGenerator.generateID("_");
- if (saml2 != null) {
- saml2.setID(id);
- } else if (saml1 != null) {
- saml1.setID(id);
- }
- }
return id;
}
@@ -317,11 +289,13 @@ public class SamlAssertionWrapper {
* @return the issuerString (type String) of this SamlAssertionWrapper object.
*/
public String getIssuerString() {
- if (saml2 != null && saml2.getIssuer() != null) {
- return saml2.getIssuer().getValue();
- } else if (saml1 != null) {
- return saml1.getIssuer();
- }
+ if (samlVersion == SAMLVersion.VERSION_20
+ && ((org.opensaml.saml.saml2.core.Assertion)samlObject).getIssuer() != null) {
+ return ((org.opensaml.saml.saml2.core.Assertion)samlObject).getIssuer().getValue();
+ } else if (samlVersion == SAMLVersion.VERSION_11
+ && ((org.opensaml.saml.saml1.core.Assertion)samlObject).getIssuer() != null) {
+ return ((org.opensaml.saml.saml1.core.Assertion)samlObject).getIssuer();
+ }
LOG.error(
"SamlAssertionWrapper: unable to return Issuer string - no saml assertion "
+ "object or issuer is null"
@@ -334,14 +308,15 @@ public class SamlAssertionWrapper {
* @return the subjectName of this SamlAssertionWrapper object
*/
public String getSubjectName() {
- if (saml2 != null) {
- org.opensaml.saml.saml2.core.Subject subject = saml2.getSubject();
+ if (samlVersion == SAMLVersion.VERSION_20) {
+ org.opensaml.saml.saml2.core.Subject subject =
+ ((org.opensaml.saml.saml2.core.Assertion)samlObject).getSubject();
if (subject != null && subject.getNameID() != null) {
return subject.getNameID().getValue();
}
- } else if (saml1 != null) {
+ } else if (samlVersion == SAMLVersion.VERSION_11) {
Subject samlSubject = null;
- for (Statement stmt : saml1.getStatements()) {
+ for (Statement stmt : ((org.opensaml.saml.saml1.core.Assertion)samlObject).getStatements()) {
if (stmt instanceof AttributeStatement) {
AttributeStatement attrStmt = (AttributeStatement) stmt;
samlSubject = attrStmt.getSubject();
@@ -376,15 +351,18 @@ public class SamlAssertionWrapper {
*/
public List<String> getConfirmationMethods() {
List<String> methods = new ArrayList<>();
- if (saml2 != null) {
- org.opensaml.saml.saml2.core.Subject subject = saml2.getSubject();
+ if (samlVersion == SAMLVersion.VERSION_20) {
+ org.opensaml.saml.saml2.core.Subject subject =
+ ((org.opensaml.saml.saml2.core.Assertion)samlObject).getSubject();
List<org.opensaml.saml.saml2.core.SubjectConfirmation> confirmations =
subject.getSubjectConfirmations();
for (org.opensaml.saml.saml2.core.SubjectConfirmation confirmation : confirmations) {
methods.add(confirmation.getMethod());
}
- } else if (saml1 != null) {
+ } else if (samlVersion == SAMLVersion.VERSION_11) {
List<SubjectStatement> subjectStatements = new ArrayList<>();
+ org.opensaml.saml.saml1.core.Assertion saml1 =
+ ((org.opensaml.saml.saml1.core.Assertion)samlObject);
subjectStatements.addAll(saml1.getSubjectStatements());
subjectStatements.addAll(saml1.getAuthenticationStatements());
subjectStatements.addAll(saml1.getAttributeStatements());
@@ -417,10 +395,10 @@ public class SamlAssertionWrapper {
* @return the signed (type boolean) of this SamlAssertionWrapper object.
*/
public boolean isSigned() {
- if (saml2 != null) {
- return saml2.isSigned() || saml2.getSignature() != null;
- } else if (saml1 != null) {
- return saml1.isSigned() || saml1.getSignature() != null;
+ if (samlObject instanceof SignableSAMLObject
+ && (((SignableSAMLObject)samlObject).isSigned()
+ || ((SignableSAMLObject)samlObject).getSignature() != null)) {
+ return true;
}
return false;
}
@@ -441,8 +419,8 @@ public class SamlAssertionWrapper {
* @param signatureDigestAlgorithm the signature digest algorithm to use
*/
public void setSignature(Signature signature, String signatureDigestAlgorithm) {
- if (xmlObject instanceof SignableSAMLObject) {
- SignableSAMLObject signableObject = (SignableSAMLObject) xmlObject;
+ if (samlObject instanceof SignableSAMLObject) {
+ SignableSAMLObject signableObject = (SignableSAMLObject) samlObject;
signableObject.setSignature(signature);
String digestAlg = signatureDigestAlgorithm;
if (digestAlg == null) {
@@ -454,7 +432,7 @@ public class SamlAssertionWrapper {
signableObject.releaseDOM();
signableObject.releaseChildrenDOM(true);
} else {
- LOG.error("Attempt to sign an unsignable object " + xmlObject.getClass().getName());
+ LOG.error("Attempt to sign an unsignable object " + samlObject.getClass().getName());
}
}
@@ -676,15 +654,17 @@ public class SamlAssertionWrapper {
Crypto sigCrypto,
CallbackHandler callbackHandler
) throws WSSecurityException {
- if (saml1 != null) {
+ if (samlVersion == SAMLVersion.VERSION_11) {
subjectKeyInfo =
SAMLUtil.getCredentialFromSubject(
- saml1, keyInfoProcessor, sigCrypto, callbackHandler
+ (org.opensaml.saml.saml1.core.Assertion)samlObject, keyInfoProcessor,
+ sigCrypto, callbackHandler
);
- } else if (saml2 != null) {
+ } else if (samlVersion == SAMLVersion.VERSION_20) {
subjectKeyInfo =
SAMLUtil.getCredentialFromSubject(
- saml2, keyInfoProcessor, sigCrypto, callbackHandler
+ (org.opensaml.saml.saml2.core.Assertion)samlObject, keyInfoProcessor,
+ sigCrypto, callbackHandler
);
}
}
@@ -703,9 +683,9 @@ public class SamlAssertionWrapper {
"The SAML version was null in getSamlVersion(). Recomputing SAML version..."
);
}
- if (saml1 != null && saml2 == null) {
+ if (samlObject != null && samlObject instanceof org.opensaml.saml.saml1.core.Assertion) {
samlVersion = SAMLVersion.VERSION_11;
- } else if (saml1 == null && saml2 != null) {
+ } else if (samlObject != null && samlObject instanceof org.opensaml.saml.saml2.core.Assertion) {
samlVersion = SAMLVersion.VERSION_20;
} else {
// We are only supporting SAML v1.1 or SAML v2.0 at this time.
@@ -749,10 +729,8 @@ public class SamlAssertionWrapper {
*/
public byte[] getSignatureValue() throws WSSecurityException {
Signature sig = null;
- if (saml2 != null && saml2.getSignature() != null) {
- sig = saml2.getSignature();
- } else if (saml1 != null && saml1.getSignature() != null) {
- sig = saml1.getSignature();
+ if (samlObject instanceof SignableSAMLObject) {
+ sig = ((SignableSAMLObject)samlObject).getSignature();
}
if (sig != null) {
return getSignatureValue(sig);
@@ -784,13 +762,10 @@ public class SamlAssertionWrapper {
}
public Signature getSignature() throws WSSecurityException {
- Signature sig = null;
- if (saml2 != null && saml2.getSignature() != null) {
- sig = saml2.getSignature();
- } else if (saml1 != null && saml1.getSignature() != null) {
- sig = saml1.getSignature();
+ if (samlObject instanceof SignableSAMLObject) {
+ return ((SignableSAMLObject)samlObject).getSignature();
}
- return sig;
+ return null;
}
/**
@@ -997,12 +972,12 @@ public class SamlAssertionWrapper {
* Parse the DOM Element into Opensaml objects.
*/
private void parseElement(Element element) throws WSSecurityException {
- this.xmlObject = OpenSAMLUtil.fromDom(element);
+ XMLObject xmlObject = OpenSAMLUtil.fromDom(element);
if (xmlObject instanceof org.opensaml.saml.saml1.core.Assertion) {
- this.saml1 = (org.opensaml.saml.saml1.core.Assertion) xmlObject;
+ this.samlObject = (SAMLObject)xmlObject;
samlVersion = SAMLVersion.VERSION_11;
} else if (xmlObject instanceof org.opensaml.saml.saml2.core.Assertion) {
- this.saml2 = (org.opensaml.saml.saml2.core.Assertion) xmlObject;
+ this.samlObject = (SAMLObject)xmlObject;
samlVersion = SAMLVersion.VERSION_20;
} else {
LOG.error(
@@ -1028,7 +1003,8 @@ public class SamlAssertionWrapper {
if (samlVersion.equals(SAMLVersion.VERSION_11)) {
// Build a SAML v1.1 assertion
- saml1 = SAML1ComponentBuilder.createSamlv1Assertion(issuer);
+ org.opensaml.saml.saml1.core.Assertion saml1 =
+ SAML1ComponentBuilder.createSamlv1Assertion(issuer);
try {
// Process the SAML authentication statement(s)
@@ -1069,11 +1045,11 @@ public class SamlAssertionWrapper {
}
// Set the OpenSaml2 XMLObject instance
- xmlObject = saml1;
+ samlObject = saml1;
} else if (samlVersion.equals(SAMLVersion.VERSION_20)) {
// Build a SAML v2.0 assertion
- saml2 = SAML2ComponentBuilder.createAssertion();
+ org.opensaml.saml.saml2.core.Assertion saml2 = SAML2ComponentBuilder.createAssertion();
Issuer samlIssuer = SAML2ComponentBuilder.createIssuer(issuer);
// Authn Statement(s)
@@ -1121,7 +1097,7 @@ public class SamlAssertionWrapper {
}
// Set the OpenSaml2 XMLObject instance
- xmlObject = saml2;
+ samlObject = saml2;
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Fri Jun 19 10:47:06 2015
@@ -109,8 +109,8 @@ public abstract class WSHandler {
reqData.setActor(actor);
boolean mu = decodeBooleanConfigValue(mc, WSHandlerConstants.MUST_UNDERSTAND, true);
- WSSecHeader secHeader = new WSSecHeader(actor, mu);
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(actor, mu, doc);
+ secHeader.insertSecurityHeader();
reqData.setSecHeader(secHeader);
reqData.setSoapConstants(WSSecurityUtil.getSOAPConstants(doc.getDocumentElement()));
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java Fri Jun 19 10:47:06 2015
@@ -40,20 +40,25 @@ public class WSSecHeader {
private boolean mustunderstand = true;
private Element securityHeader;
+
+ private final Document doc;
/**
* Constructor.
+ * @param doc The Document to use when creating the security header
*/
- public WSSecHeader() {
+ public WSSecHeader(Document doc) {
+ this(null, doc);
}
/**
* Constructor.
*
* @param actor The actor name of the <code>wsse:Security</code> header
+ * @param doc The Document to use when creating the security header
*/
- public WSSecHeader(String actor) {
- this(actor, true);
+ public WSSecHeader(String actor, Document doc) {
+ this(actor, true, doc);
}
/**
@@ -61,10 +66,12 @@ public class WSSecHeader {
*
* @param act The actor name of the <code>wsse:Security</code> header
* @param mu Set <code>mustUnderstand</code> to true or false
+ * @param doc The Document to use when creating the security header
*/
- public WSSecHeader(String act, boolean mu) {
+ public WSSecHeader(String act, boolean mu, Document doc) {
actor = act;
mustunderstand = mu;
+ this.doc = doc;
}
/**
@@ -101,7 +108,11 @@ public class WSSecHeader {
* @return true if empty or if there is no security header
* false if non empty security header
*/
- public boolean isEmpty(Document doc) throws WSSecurityException {
+ public boolean isEmpty() throws WSSecurityException {
+ if (doc == null) {
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
+ new Object[] {"The Document of WSSecHeader is null"});
+ }
if (securityHeader == null) {
securityHeader =
WSSecurityUtil.findWsseSecurityHeaderBlock(
@@ -122,16 +133,21 @@ public class WSSecHeader {
* the document. If a header block is found return it, otherwise a new
* wsse:Security header block is created and the attributes set
*
- * @param doc A SOAP envelope as <code>Document</code>
* @return A <code>wsse:Security</code> element
*/
- public Element insertSecurityHeader(Document doc) throws WSSecurityException {
+ public Element insertSecurityHeader() throws WSSecurityException {
//
// If there is already a security header in this instance just return it
//
if (securityHeader != null) {
return securityHeader;
}
+
+ if (doc == null) {
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
+ new Object[] {"The Document of WSSecHeader is null"});
+ }
+
securityHeader =
WSSecurityUtil.findWsseSecurityHeaderBlock(
doc, doc.getDocumentElement(), actor, true
@@ -170,8 +186,13 @@ public class WSSecHeader {
return securityHeader;
}
- public void removeSecurityHeader(Document doc) throws WSSecurityException {
- if (securityHeader == null) {
+ public void removeSecurityHeader() throws WSSecurityException {
+ if (securityHeader == null) {
+ if (doc == null) {
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
+ new Object[] {"The Document of WSSecHeader is null"});
+ }
+
securityHeader =
WSSecurityUtil.findWsseSecurityHeaderBlock(
doc, doc.getDocumentElement(), actor, false
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java Fri Jun 19 10:47:06 2015
@@ -81,8 +81,8 @@ public class CertificateStoreTest extend
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, senderCrypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -113,8 +113,8 @@ public class CertificateStoreTest extend
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, senderCrypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -151,8 +151,8 @@ public class CertificateStoreTest extend
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, senderCrypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -185,8 +185,8 @@ public class CertificateStoreTest extend
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, senderCrypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -219,8 +219,8 @@ public class CertificateStoreTest extend
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, senderCrypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -254,8 +254,8 @@ public class CertificateStoreTest extend
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, CryptoFactory.getInstance(), secHeader);
if (LOG.isDebugEnabled()) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java Fri Jun 19 10:47:06 2015
@@ -81,8 +81,8 @@ public class CryptoProviderTest extends
sign.setUserInfo("wss86", "security");
sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -104,8 +104,8 @@ public class CryptoProviderTest extends
sign.setUserInfo("wss86", "security");
sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, crypto, secHeader);
String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
@@ -131,8 +131,8 @@ public class CryptoProviderTest extends
sign.setUserInfo("wss86", "security");
sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, crypto, secHeader);
String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
@@ -183,8 +183,8 @@ public class CryptoProviderTest extends
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUseThisCert(cert);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -232,8 +232,8 @@ public class CryptoProviderTest extends
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUseThisCert(cert);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java Fri Jun 19 10:47:06 2015
@@ -100,8 +100,8 @@ public class CryptoTest extends org.juni
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
// Load the keystore
Crypto crypto = new Merlin();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java Fri Jun 19 10:47:06 2015
@@ -71,8 +71,8 @@ public class CustomActionProcessorTest e
builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
LOG.info("Before Signing IS....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -119,8 +119,8 @@ public class CustomActionProcessorTest e
builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
LOG.info("Before Signing IS....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java Fri Jun 19 10:47:06 2015
@@ -279,8 +279,8 @@ public class SignatureConfirmationTest e
@org.junit.Test
public void testWsuId() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
byte[] randomBytes = WSSecurityUtil.generateNonce(20);
SignatureConfirmation sigConf = new SignatureConfirmation(doc, randomBytes);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java Fri Jun 19 10:47:06 2015
@@ -112,8 +112,8 @@ public class AttachmentTest extends org.
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -157,8 +157,8 @@ public class AttachmentTest extends org.
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -213,8 +213,8 @@ public class AttachmentTest extends org.
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -258,8 +258,8 @@ public class AttachmentTest extends org.
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -321,8 +321,8 @@ public class AttachmentTest extends org.
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
@@ -356,8 +356,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -415,8 +415,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -470,8 +470,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -535,8 +535,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -599,8 +599,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Element"));
@@ -647,8 +647,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Element"));
@@ -699,8 +699,8 @@ public class AttachmentTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Element"));
@@ -757,8 +757,8 @@ public class AttachmentTest extends org.
public void testXMLAttachmentCmplSignCmplEnc() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecSignature signature = new WSSecSignature();
signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -822,8 +822,8 @@ public class AttachmentTest extends org.
public void testInvalidXMLAttachmentCmplSignCmplEnc() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecSignature signature = new WSSecSignature();
signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -921,8 +921,8 @@ public class AttachmentTest extends org.
public void testXMLAttachmentCmplEncCmplSign() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -986,8 +986,8 @@ public class AttachmentTest extends org.
public void testInvalidXMLAttachmentCmplEncCmplSign() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java Fri Jun 19 10:47:06 2015
@@ -50,8 +50,8 @@ public class CertErrorTest extends org.j
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("bob", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
try {
builder.build(doc, CryptoFactory.getInstance(), secHeader);
fail("Expected failure on a bad username");
@@ -69,8 +69,8 @@ public class CertErrorTest extends org.j
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("alice");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
try {
builder.build(doc, CryptoFactory.getInstance(), secHeader);
fail("Expected failure on a bad username");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java Fri Jun 19 10:47:06 2015
@@ -66,8 +66,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testEncryptionDecryptionTRIPLEDES() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
@@ -104,8 +104,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testEncryptionDecryptionAES128() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
@@ -138,8 +138,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testSignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
@@ -185,8 +185,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testSignatureThumbprintSHA1() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
SecurityTokenReference secToken = new SecurityTokenReference(doc);
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
@@ -226,8 +226,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testSignatureSKI() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
SecurityTokenReference secToken = new SecurityTokenReference(doc);
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
@@ -261,8 +261,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testSignatureEncrypt() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
@@ -302,8 +302,8 @@ public class DerivedKeyTest extends org.
@org.junit.Test
public void testEncryptSignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java Fri Jun 19 10:47:06 2015
@@ -64,8 +64,8 @@ public class EncryptedDataInHeaderTest e
@org.junit.Test
public void testEncryptedDataInHeader() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecTimestamp timestamp = new WSSecTimestamp();
timestamp.setTimeToLive(300);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java Fri Jun 19 10:47:06 2015
@@ -70,8 +70,8 @@ public class EncryptionAlgorithmSuiteTes
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
@@ -108,8 +108,8 @@ public class EncryptionAlgorithmSuiteTes
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSA15);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
@@ -145,8 +145,8 @@ public class EncryptionAlgorithmSuiteTes
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSA15);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
@@ -187,8 +187,8 @@ public class EncryptionAlgorithmSuiteTes
builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
@@ -226,8 +226,8 @@ public class EncryptionAlgorithmSuiteTes
builder.setEncryptSymmKey(false);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java Fri Jun 19 10:47:06 2015
@@ -92,8 +92,8 @@ public class EncryptionGCMTest extends o
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.AES_128_GCM);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
String outputString =
@@ -121,8 +121,8 @@ public class EncryptionGCMTest extends o
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.AES_256_GCM);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
String outputString =
@@ -154,8 +154,8 @@ public class EncryptionGCMTest extends o
builder.setDigestAlgorithm(WSConstants.SHA256);
builder.setMGFAlgorithm(WSConstants.MGF_SHA256);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
String outputString =
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java Fri Jun 19 10:47:06 2015
@@ -97,8 +97,8 @@ public class EncryptionPartsTest extends
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -146,8 +146,8 @@ public class EncryptionPartsTest extends
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -183,8 +183,8 @@ public class EncryptionPartsTest extends
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -220,8 +220,8 @@ public class EncryptionPartsTest extends
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -258,8 +258,8 @@ public class EncryptionPartsTest extends
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -306,8 +306,8 @@ public class EncryptionPartsTest extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -336,8 +336,8 @@ public class EncryptionPartsTest extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -367,8 +367,8 @@ public class EncryptionPartsTest extends
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -436,8 +436,8 @@ public class EncryptionPartsTest extends
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
// Give wrong names to make sure it's picking up the element
WSEncryptionPart encP =
@@ -483,8 +483,8 @@ public class EncryptionPartsTest extends
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java Fri Jun 19 10:47:06 2015
@@ -112,8 +112,8 @@ public class EncryptionTest extends org.
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
LOG.info("Before Encryption Triple DES....");
Document encryptedDoc = builder.build(doc, crypto, secHeader);
LOG.info("After Encryption Triple DES....");
@@ -145,8 +145,8 @@ public class EncryptionTest extends org.
builder.getParts().add(encP);
doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
LOG.info("Before Encryption AES 128/RSA-15....");
encryptedDoc = builder.build(doc, crypto, secHeader);
LOG.info("After Encryption AES 128/RSA-15....");
@@ -190,8 +190,8 @@ public class EncryptionTest extends org.
builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
LOG.info("Before Encryption Triple DES/RSA-OAEP....");
Document encryptedDoc = builder.build(doc, crypto, secHeader);
LOG.info("After Encryption Triple DES/RSA-OAEP....");
@@ -232,8 +232,8 @@ public class EncryptionTest extends org.
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
LOG.info("Before Encryption....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = encrypt.build(doc, encCrypto, secHeader);
@@ -273,8 +273,8 @@ public class EncryptionTest extends org.
LOG.info("Before Encrypting ThumbprintSHA1....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, encCrypto, secHeader);
String outputString =
@@ -313,8 +313,8 @@ public class EncryptionTest extends org.
LOG.info("Before Encrypting EncryptedKeySHA1....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, encCrypto, secHeader);
String outputString =
@@ -344,8 +344,8 @@ public class EncryptionTest extends org.
LOG.info("Before Encrypting EncryptedKeySHA1....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
byte[] encodedBytes = KeyUtils.generateDigest(keyData);
@@ -379,8 +379,8 @@ public class EncryptionTest extends org.
LOG.info("Before Encrypting EncryptedKeySHA1....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document encryptedDoc = builder.build(doc, crypto, secHeader);
byte[] encodedBytes = KeyUtils.generateDigest(keyData);
@@ -457,8 +457,8 @@ public class EncryptionTest extends org.
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
LOG.info("Before Encryption Triple DES....");
/*
@@ -526,8 +526,8 @@ public class EncryptionTest extends org.
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
/*
* Prepare the Encrypt object with the token, setup data structure
@@ -636,8 +636,8 @@ public class EncryptionTest extends org.
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
builder.setDigestAlgorithm(WSConstants.SHA256);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
LOG.info("Before Encryption Triple DES/RSA-OAEP....");
Document encryptedDoc = builder.build(doc, crypto, secHeader);
LOG.info("After Encryption Triple DES/RSA-OAEP....");
@@ -667,8 +667,8 @@ public class EncryptionTest extends org.
builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
LOG.info("Before Encryption Triple DES/RSA-OAEP....");
Crypto regexpCrypto = CryptoFactory.getInstance("regexp.properties");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java?rev=1686380&r1=1686379&r2=1686380&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java Fri Jun 19 10:47:06 2015
@@ -97,8 +97,8 @@ public class ModifiedRequestTest extends
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -152,8 +152,8 @@ public class ModifiedRequestTest extends
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
LOG.info("Before Signing....");
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -232,8 +232,8 @@ public class ModifiedRequestTest extends
wsSign.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc =
wsSign.build(
@@ -267,8 +267,8 @@ public class ModifiedRequestTest extends
@org.junit.Test
public void testDuplicatedSignedUsernameToken() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecUsernameToken usernameToken = new WSSecUsernameToken();
usernameToken.setUserInfo("wss86", "security");
@@ -322,8 +322,8 @@ public class ModifiedRequestTest extends
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
@@ -357,8 +357,8 @@ public class ModifiedRequestTest extends
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
@@ -405,8 +405,8 @@ public class ModifiedRequestTest extends
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
WSSecTimestamp timestamp = new WSSecTimestamp();
@@ -466,8 +466,8 @@ public class ModifiedRequestTest extends
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
@@ -513,8 +513,8 @@ public class ModifiedRequestTest extends
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
WSSecTimestamp timestamp = new WSSecTimestamp();
timestamp.setTimeToLive(300);
@@ -565,8 +565,8 @@ public class ModifiedRequestTest extends
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss40", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Crypto wss40Crypto = CryptoFactory.getInstance("wss40.properties");
Document signedDoc = builder.build(doc, wss40Crypto, secHeader);
@@ -593,8 +593,8 @@ public class ModifiedRequestTest extends
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader();
- secHeader.insertSecurityHeader(doc);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
Document signedDoc = builder.build(doc, crypto, secHeader);