You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2015/12/15 18:13:22 UTC
svn commit: r1720201 [16/24] - in /santuario/xml-security-java/trunk:
samples/javax/xml/crypto/dsig/samples/
samples/org/apache/xml/security/samples/
samples/org/apache/xml/security/samples/algorithms/
samples/org/apache/xml/security/samples/canonicali...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java Tue Dec 15 17:13:17 2015
@@ -39,7 +39,7 @@ public class XMLX509IssuerSerialTest ext
public void testGetIssuerName() throws Exception {
// Make sure hex encoded value is not escaped (see ...)
String issuer = "9.99.999=#abc123";
- XMLX509IssuerSerial is =
+ XMLX509IssuerSerial is =
new XMLX509IssuerSerial(doc, issuer, 0);
assertEquals(issuer, is.getIssuerName());
// System.out.println(is.getIssuerName());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java Tue Dec 15 17:13:17 2015
@@ -71,9 +71,9 @@ public class XMLX509SKITest extends org.
xcs.setSubjectKeyIdentifier(encodedSkid);
CertStore cs = CertStore.getInstance(
- "Collection",
+ "Collection",
new CollectionCertStoreParameters(Collections.singleton(cert)));
-
+
Collection<?> certs = cs.getCertificates(xcs);
assertTrue(!certs.isEmpty());
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java Tue Dec 15 17:13:17 2015
@@ -52,8 +52,8 @@ public class DEREncodedKeyValueResolverT
documentBuilder = XMLUtils.createDocumentBuilder(false);
//
- // If the BouncyCastle provider is not installed, then try to load it
- // via reflection.
+ // If the BouncyCastle provider is not installed, then try to load it
+ // via reflection.
//
if (Security.getProvider("BC") == null) {
Constructor<?> cons = null;
@@ -117,8 +117,8 @@ public class DEREncodedKeyValueResolverT
// Utility methods
private String getControlFilePath(String fileName) {
- return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
- SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
+ return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
+ SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
SEP + "keys" + SEP + "content" +
SEP + fileName;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java Tue Dec 15 17:13:17 2015
@@ -131,8 +131,8 @@ public class KeyInfoReferenceResolverTes
// Utility methods
private String getControlFilePath(String fileName) {
- return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
- SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
+ return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
+ SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
SEP + "keyresolver" +
SEP + fileName;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java Tue Dec 15 17:13:17 2015
@@ -78,14 +78,14 @@ public class KeyResolverTest extends org
*/
@org.junit.Test
public void testKeyResolvers() throws Exception {
-
+
//
// This test fails with the IBM JDK
//
if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
return;
}
-
+
char[] pwd = "secret".toCharArray();
KeyStore ks = KeyStore.getInstance("JCEKS");
FileInputStream fis = null;
@@ -184,7 +184,7 @@ public class KeyResolverTest extends org
ki.registerInternalKeyResolver(new SingleKeyResolver(des3KeyName, secretKey));
assertEquals(secretKey, ki.getSecretKey());
}
-
+
/**
* Encrypt some data, embedded the data encryption key
* in the message using the key transport algorithm rsa-1_5.
@@ -194,7 +194,7 @@ public class KeyResolverTest extends org
@org.junit.Test
public void testResolvePrivateKey() throws Exception {
// See if AES-128 is available...
- String algorithmId =
+ String algorithmId =
JCEMapper.translateURItoJCEID(
org.apache.xml.security.utils.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128
);
@@ -210,11 +210,11 @@ public class KeyResolverTest extends org
//
}
}
-
+
if (!haveAES) {
return;
}
-
+
// Create a sample XML document
Document document = XMLUtils.createDocumentBuilder(false).newDocument();
@@ -238,7 +238,7 @@ public class KeyResolverTest extends org
"bddfbde83ca9bfa180fe6a5f5eee60661936d728314e809201ef52cd71d9fa3c8ce83f9d30ab5e08" +
"1539219e7e45dd6a60be65ac95d2049b8f21", 16),
new BigInteger("10001", 16));
-
+
RSAPrivateKeySpec privKeySpec = new RSAPrivateKeySpec(
new BigInteger(
"8710a2bcb2f3fdac177f0ae0461c2dd0ebf72e0d88a5400583a7d8bdabd" +
@@ -250,7 +250,7 @@ public class KeyResolverTest extends org
"5187cb9a50fa828e5efe51d52f5d112c20bc700b836facadca6e0051afcdfe866841e37d207c0295" +
"36ff8674b301e2198b2c56abb0a0313f8ff84c1fcd6fa541aa6e5d9c018fab4784d2940def5dc709" +
"ddc714d73b6c23b5d178eaa5933577b8e8ae9", 16));
-
+
RSAPublicKey pubKey = (RSAPublicKey) keyFactory.generatePublic(pubKeySpec);
RSAPrivateKey privKey = (RSAPrivateKey) keyFactory.generatePrivate(privKeySpec);
@@ -258,7 +258,7 @@ public class KeyResolverTest extends org
XMLCipher keyCipher = XMLCipher.getInstance(XMLCipher.RSA_v1dot5);
keyCipher.init(XMLCipher.WRAP_MODE, pubKey);
EncryptedKey encryptedKey = keyCipher.encryptKey(document, dataEncryptKey);
-
+
String keyName = "testResolvePrivateKey";
KeyInfo kekInfo = new KeyInfo(document);
kekInfo.addKeyName(keyName);
@@ -282,7 +282,7 @@ public class KeyResolverTest extends org
// First test with an internal KeyResolver
MyPrivateKeyResolver.pk = privKey;
MyPrivateKeyResolver.pkName = keyName;
-
+
decryptDocument(document, new MyPrivateKeyResolver());
// Now test with a static KeyResolver
@@ -292,7 +292,7 @@ public class KeyResolverTest extends org
decryptDocument(document, null);
}
-
+
private void decryptDocument(Document docSource, KeyResolverSpi internalResolver) throws Exception
{
Document document = (Document)docSource.cloneNode(true);
@@ -312,12 +312,12 @@ public class KeyResolverTest extends org
// A KeyResolver that returns a PrivateKey for a specific KeyName.
public static class MyPrivateKeyResolver extends KeyResolverSpi {
-
+
// We use static variables because KeyResolver.register() demands
// the use of the default constructor.
private static PrivateKey pk;
private static String pkName;
-
+
public boolean engineCanResolve(Element element, String BaseURI, StorageResolver storage) {
return false;
}
@@ -325,14 +325,14 @@ public class KeyResolverTest extends org
public PrivateKey engineLookupAndResolvePrivateKey(
Element element, String BaseURI, StorageResolver storage
) throws KeyResolverException {
- if (Constants.SignatureSpecNS.equals(element.getNamespaceURI()) &&
+ if (Constants.SignatureSpecNS.equals(element.getNamespaceURI()) &&
Constants._TAG_KEYNAME.equals(element.getLocalName())) {
String keyName = element.getFirstChild().getNodeValue();
if (pkName.equals(keyName)) {
return pk;
}
}
-
+
return null;
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java Tue Dec 15 17:13:17 2015
@@ -30,10 +30,10 @@ import org.w3c.dom.Document;
/**
- * Some tests on attacks against the RetrievalMethodResolver.
+ * Some tests on attacks against the RetrievalMethodResolver.
*/
public class RetrievalMethodResolverTest extends org.junit.Assert {
-
+
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
@@ -51,17 +51,17 @@ public class RetrievalMethodResolverTest
} else {
fis = new FileInputStream(filename);
}
-
+
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.parse(fis);
-
+
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
-
+
// Check neither of these give a StackOverflowError.
keyInfo.getPublicKey();
keyInfo.getX509Certificate();
}
-
+
@org.junit.Test
public void testLoopBetweenRetrievalMethods() throws Exception {
FileInputStream fis = null;
@@ -71,15 +71,15 @@ public class RetrievalMethodResolverTest
} else {
fis = new FileInputStream(filename);
}
-
+
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.parse(fis);
-
+
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
-
+
// Check neither of these give a StackOverflowError.
keyInfo.getPublicKey();
keyInfo.getX509Certificate();
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java Tue Dec 15 17:13:17 2015
@@ -76,8 +76,8 @@ public class X509DigestResolverTest exte
// Utility methods
private String getControlFilePath(String fileName) {
- return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
- SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
+ return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
+ SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
SEP + "keys" + SEP + "content" + SEP + "x509" +
SEP + fileName;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java Tue Dec 15 17:13:17 2015
@@ -37,17 +37,17 @@ public class KeyStoreResolverTest extend
@org.junit.Test
public void testKeyStoreResolver() throws Exception {
-
+
//
// This test fails with the IBM JDK
//
if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
return;
}
-
- FileInputStream f =
- new FileInputStream(BASEDIR + SEP + "src/test/resources" + SEP + "org" + SEP + "apache"
- + SEP + "xml" + SEP + "security" + SEP + "samples"
+
+ FileInputStream f =
+ new FileInputStream(BASEDIR + SEP + "src/test/resources" + SEP + "org" + SEP + "apache"
+ + SEP + "xml" + SEP + "security" + SEP + "samples"
+ SEP + "input" + SEP + "keystore2.jks");
KeyStore ks = KeyStore.getInstance("JCEKS");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java Tue Dec 15 17:13:17 2015
@@ -31,13 +31,13 @@ import org.apache.xml.security.keys.stor
*/
public class StorageResolverTest extends org.junit.Assert {
- private static final String BASEDIR =
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
@org.junit.Test
public void testStorageResolver() throws Exception {
-
+
//
// This test fails with the IBM JDK
//
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java Tue Dec 15 17:13:17 2015
@@ -30,14 +30,14 @@ import org.xml.sax.InputSource;
* This package is responsible for retrieving test vectors for our unit tests.
*
* @author Christian Geuer-Pollmann
- * $todo$ Currently, the test vectors are in the file system under the data/ directory.
+ * $todo$ Currently, the test vectors are in the file system under the data/ directory.
* It is planned to put them all into a single jar/zip which is deployed with the library.
*/
public class TestVectorResolver implements EntityResolver {
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(TestVectorResolver.class);
-
+
/** Field alreadyInitialized */
static boolean alreadyInitialized = false;
@@ -46,7 +46,7 @@ public class TestVectorResolver implemen
/** Field vectors */
static java.util.Map<String, byte[]> vectors = null;
-
+
static {
org.apache.xml.security.Init.init();
TestVectorResolver.init();
@@ -57,7 +57,7 @@ public class TestVectorResolver implemen
/** Field _firstEntitySystemId */
String _firstEntitySystemIdDirectory = null;
-
+
/**
* Method init
*
@@ -72,7 +72,7 @@ public class TestVectorResolver implemen
TestVectorResolver.vectors = new java.util.HashMap<String, byte[]>(30);
try {
- zis =
+ zis =
new java.util.zip.ZipInputStream(
Class.forName(thisClass).getResourceAsStream(testVectorFile)
);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Tue Dec 15 17:13:17 2015
@@ -39,18 +39,18 @@ public class ForbiddenAlgorithmTest exte
static {
org.apache.xml.security.Init.init();
}
-
+
public ForbiddenAlgorithmTest() {
super();
}
@org.junit.Test
public void testMD5Digest() throws Exception {
- boolean success =
+ boolean success =
readAndVerifySignature("src/test/resources/interop/c14n/Y2", "signature-joseph-exc.xml", false);
assertTrue(success);
-
+
try {
readAndVerifySignature("src/test/resources/interop/c14n/Y2", "signature-joseph-exc.xml", true);
fail("Failure expected when secure validation is enabled");
@@ -78,5 +78,5 @@ public class ForbiddenAlgorithmTest exte
XMLSignature signature = new XMLSignature(sigElement, f.toURI().toURL().toString(), secValidation);
return signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java Tue Dec 15 17:13:17 2015
@@ -39,18 +39,18 @@ public class ForbiddenRefCountTest exten
static {
org.apache.xml.security.Init.init();
}
-
+
public ForbiddenRefCountTest() {
super();
}
@org.junit.Test
public void testReferenceCount() throws Exception {
- boolean success =
+ boolean success =
readAndVerifyManifest("src/test/resources/interop/c14n/Y4", "signature-manifest.xml", false);
assertTrue(success);
-
+
try {
readAndVerifyManifest("src/test/resources/interop/c14n/Y4", "signature-manifest.xml", true);
fail("Failure expected when secure validation is enabled");
@@ -78,5 +78,5 @@ public class ForbiddenRefCountTest exten
Manifest manifest = new Manifest(manifestElement, f.toURI().toURL().toString(), secValidation);
return manifest.verifyReferences();
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java Tue Dec 15 17:13:17 2015
@@ -39,18 +39,18 @@ public class ForbiddenReferenceTest exte
static {
org.apache.xml.security.Init.init();
}
-
+
public ForbiddenReferenceTest() {
super();
}
@org.junit.Test
public void testLocalFilesystem() throws Exception {
- boolean success =
+ boolean success =
readAndVerifyManifest("src/test/resources/interop/c14n/Y3", "signature.xml", false);
assertTrue(success);
-
+
try {
readAndVerifyManifest("src/test/resources/interop/c14n/Y3", "signature.xml", true);
fail("Failure expected when secure validation is enabled");
@@ -58,7 +58,7 @@ public class ForbiddenReferenceTest exte
assertTrue(ex.getMessage().contains("The Reference for URI"));
}
}
-
+
private boolean readAndVerifyManifest(
String directory, String file, boolean secValidation
) throws Exception {
@@ -78,5 +78,5 @@ public class ForbiddenReferenceTest exte
Manifest manifest = new Manifest(manifestElement, f.toURI().toURL().toString(), secValidation);
return manifest.verifyReferences();
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java Tue Dec 15 17:13:17 2015
@@ -28,11 +28,11 @@ import org.w3c.dom.Document;
/**
- * This is a test for a Retrieval Method pointing to another Retrieval Method (forbidden under
+ * This is a test for a Retrieval Method pointing to another Retrieval Method (forbidden under
* secure validation).
*/
public class ForbiddenRetrievalMethodTest extends org.junit.Assert {
-
+
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
@@ -49,16 +49,16 @@ public class ForbiddenRetrievalMethodTes
} else {
fis = new FileInputStream(filename);
}
-
+
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.parse(fis);
-
+
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
keyInfo.setSecureValidation(true);
-
+
// Check neither of these give a StackOverflowError.
assertNull(keyInfo.getPublicKey());
assertNull(keyInfo.getX509Certificate());
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java Tue Dec 15 17:13:17 2015
@@ -39,23 +39,23 @@ public class WrappingAttackTest extends
static {
org.apache.xml.security.Init.init();
}
-
+
public WrappingAttackTest() {
super();
}
@org.junit.Test
public void testWrappingAttack() throws Exception {
- boolean success =
+ boolean success =
readAndVerifySignature(
- "src/test/resources/at/iaik/ixsil/coreFeatures/signatures",
+ "src/test/resources/at/iaik/ixsil/coreFeatures/signatures",
"manifestSignatureWrapping.xml"
);
assertTrue(success);
try {
readAndVerifySignatureAndSetManifest(
- "src/test/resources/at/iaik/ixsil/coreFeatures/signatures",
+ "src/test/resources/at/iaik/ixsil/coreFeatures/signatures",
"manifestSignatureWrapping.xml"
);
fail("Failure expected when secure validation is enabled");
@@ -83,7 +83,7 @@ public class WrappingAttackTest extends
XMLSignature signature = new XMLSignature(sigElement, f.toURI().toURL().toString());
return signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
}
-
+
private boolean readAndVerifySignatureAndSetManifest(
String directory, String file
) throws Exception {
@@ -100,11 +100,11 @@ public class WrappingAttackTest extends
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Constants._TAG_SIGNATURE).item(0);
-
+
Element manifestElement =
(Element) doc.getElementsByTagName("Manifest").item(0);
manifestElement.setIdAttribute("Id", true);
-
+
XMLSignature signature = new XMLSignature(sigElement, f.toURI().toURL().toString(), true);
return signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Tue Dec 15 17:13:17 2015
@@ -61,17 +61,17 @@ public class CreateSignatureTest extends
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private KeyPair kp = null;
+ private KeyPair kp = null;
private javax.xml.parsers.DocumentBuilder db;
-
+
public CreateSignatureTest() throws Exception {
db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
kp = KeyPairGenerator.getInstance("RSA").genKeyPair();
}
-
+
/**
- * Test for bug 36044 - Canonicalizing an empty node-set throws an
+ * Test for bug 36044 - Canonicalizing an empty node-set throws an
* ArrayIndexOutOfBoundsException.
*/
@org.junit.Test
@@ -81,7 +81,7 @@ public class CreateSignatureTest extends
envelope.appendChild(doc.createTextNode("\n"));
doc.appendChild(envelope);
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature(doc, null, XMLSignature.ALGO_ID_SIGNATURE_DSA);
envelope.appendChild(sig.getElement());
@@ -111,12 +111,12 @@ public class CreateSignatureTest extends
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = null;
if (BASEDIR != null && !"".equals(BASEDIR)) {
- fis =
- new FileInputStream(BASEDIR + SEP
+ fis =
+ new FileInputStream(BASEDIR + SEP
+ "src/test/resources/org/apache/xml/security/samples/input/keystore.jks"
);
} else {
- fis =
+ fis =
new FileInputStream("src/test/resources/org/apache/xml/security/samples/input/keystore.jks");
}
ks.load(fis, "xmlsecurity".toCharArray());
@@ -126,8 +126,8 @@ public class CreateSignatureTest extends
}
@org.junit.Test
- public void testOne() throws Exception {
- doVerify(doSign());
+ public void testOne() throws Exception {
+ doVerify(doSign());
doVerify(doSign());
}
@@ -148,7 +148,7 @@ public class CreateSignatureTest extends
throw e;
}
}
-
+
@org.junit.Test
public void testXFilter2Signature() throws Exception {
Document doc = db.newDocument();
@@ -159,7 +159,7 @@ public class CreateSignatureTest extends
root.appendChild(doc.createTextNode("Some simple text\n"));
// Sign
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature(doc, null, XMLSignature.ALGO_ID_SIGNATURE_DSA);
root.appendChild(sig.getElement());
@@ -167,7 +167,7 @@ public class CreateSignatureTest extends
String filter = "here()/ancestor::ds.Signature/parent::node()/descendant-or-self::*";
XPath2FilterContainer xpathC = XPath2FilterContainer.newInstanceIntersect(doc, filter);
xpathC.setXPathNamespaceContext("dsig-xpath", Transforms.TRANSFORM_XPATH2FILTER);
-
+
Element node = xpathC.getElement();
transforms.addTransform(Transforms.TRANSFORM_XPATH2FILTER, node);
sig.addDocument("", transforms, Constants.ALGO_ID_DIGEST_SHA1);
@@ -175,23 +175,23 @@ public class CreateSignatureTest extends
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = null;
if (BASEDIR != null && !"".equals(BASEDIR)) {
- fis =
- new FileInputStream(BASEDIR + SEP
+ fis =
+ new FileInputStream(BASEDIR + SEP
+ "src/test/resources/org/apache/xml/security/samples/input/keystore.jks"
);
} else {
- fis =
+ fis =
new FileInputStream("src/test/resources/org/apache/xml/security/samples/input/keystore.jks");
}
ks.load(fis, "xmlsecurity".toCharArray());
PrivateKey privateKey = (PrivateKey) ks.getKey("test", "xmlsecurity".toCharArray());
sig.sign(privateKey);
-
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
XMLUtils.outputDOMc14nWithComments(doc, bos);
String signedDoc = new String(bos.toByteArray());
-
+
// Now Verify
doc = db.parse(new ByteArrayInputStream(signedDoc.getBytes()));
@@ -200,17 +200,17 @@ public class CreateSignatureTest extends
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
-
+
XMLSignature signature = new XMLSignature(sigElement, "");
assertTrue(signature.checkSignatureValue(ks.getCertificate("test").getPublicKey()));
}
-
+
@org.junit.Test
- public void testCanonicalizedOctetStream() throws Exception {
+ public void testCanonicalizedOctetStream() throws Exception {
String signedXML = doSign();
-
+
org.w3c.dom.Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
XPathFactory xpf = XPathFactory.newInstance();
@@ -218,9 +218,9 @@ public class CreateSignatureTest extends
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
-
+
XMLSignature signature = new XMLSignature(sigElement, "");
KeyInfo ki = signature.getKeyInfo();
@@ -232,16 +232,16 @@ public class CreateSignatureTest extends
if (pk == null) {
throw new RuntimeException("No public key");
}
-
+
SignedInfo si = signature.getSignedInfo();
SignatureAlgorithm sa = si.getSignatureAlgorithm();
sa.initVerify(pk);
byte[] sigBytes = signature.getSignatureValue();
-
+
byte[] canonicalizedBytes = si.getCanonicalizedOctetStream();
sa.update(canonicalizedBytes, 0, canonicalizedBytes.length);
-
+
assertTrue(sa.verify(sigBytes));
assertTrue(si.verify(false));
}
@@ -256,15 +256,15 @@ public class CreateSignatureTest extends
doc.appendChild(root);
root.appendChild(doc.createTextNode("Some simple text\n"));
- Element canonElem =
+ Element canonElem =
XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_CANONICALIZATIONMETHOD);
canonElem.setAttributeNS(
null, Constants._ATT_ALGORITHM, Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS
);
- SignatureAlgorithm signatureAlgorithm =
+ SignatureAlgorithm signatureAlgorithm =
new SignatureAlgorithm(doc, XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1);
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature(doc, null, signatureAlgorithm.getElement(), canonElem);
root.appendChild(sig.getElement());
@@ -287,7 +287,7 @@ public class CreateSignatureTest extends
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = null;
if (BASEDIR != null && !"".equals(BASEDIR)) {
- fis = new FileInputStream(BASEDIR + SEP +
+ fis = new FileInputStream(BASEDIR + SEP +
"src/test/resources/test.jks");
} else {
fis = new FileInputStream("src/test/resources/test.jks");
@@ -302,15 +302,15 @@ public class CreateSignatureTest extends
doc.appendChild(root);
root.appendChild(doc.createTextNode("Some simple text\n"));
- Element canonElem =
+ Element canonElem =
XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_CANONICALIZATIONMETHOD);
canonElem.setAttributeNS(
null, Constants._ATT_ALGORITHM, Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS
);
- SignatureAlgorithm signatureAlgorithm =
+ SignatureAlgorithm signatureAlgorithm =
new SignatureAlgorithm(doc, XMLSignature.ALGO_ID_SIGNATURE_DSA);
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature(doc, null, signatureAlgorithm.getElement(), canonElem);
root.appendChild(sig.getElement());
@@ -338,9 +338,9 @@ public class CreateSignatureTest extends
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
-
+
XMLSignature signature = new XMLSignature(sigElement, "");
KeyInfo ki = signature.getKeyInfo();
@@ -354,5 +354,5 @@ public class CreateSignatureTest extends
}
assertTrue(signature.checkSignatureValue(pk));
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Tue Dec 15 17:13:17 2015
@@ -53,17 +53,17 @@ public class ECDSASignatureTest extends
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private static final String ECDSA_JKS =
+ private static final String ECDSA_JKS =
"src/test/resources/org/apache/xml/security/samples/input/ecdsa.jks";
private static final String ECDSA_JKS_PASSWORD = "security";
-
+
private KeyStore keyStore;
-
+
private javax.xml.parsers.DocumentBuilder db;
public ECDSASignatureTest() throws Exception {
//
- // If the BouncyCastle provider is not installed, then try to load it
+ // If the BouncyCastle provider is not installed, then try to load it
// via reflection. If it is not available, then skip this test as it is
// required for elliptic curves
//
@@ -86,7 +86,7 @@ public class ECDSASignatureTest extends
//String id = "http://apache.org/xml/properties/dom/document-class-name";
//dbf.setAttribute(id, IndexedDocument.class.getName());
-
+
db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
}
@@ -95,27 +95,27 @@ public class ECDSASignatureTest extends
public static void cleanup() throws Exception {
Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
}
-
+
@org.junit.Test
public void testOne() throws Exception {
if (Security.getProvider("BC") == null) {
return;
}
-
+
//
// This test fails with the IBM JDK
//
if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
return;
}
-
+
keyStore = KeyStore.getInstance("JKS");
keyStore.load(
- new java.io.FileInputStream(ECDSA_JKS),
+ new java.io.FileInputStream(ECDSA_JKS),
ECDSA_JKS_PASSWORD.toCharArray()
);
-
- doVerify(doSign());
+
+ doVerify(doSign());
doVerify(doSign());
}
@@ -126,11 +126,11 @@ public class ECDSASignatureTest extends
if (Security.getProvider("BC") == null) {
return;
}
-
- File file =
+
+ File file =
makeDataFile("src/test/resources/org/apache/xml/security/samples/input/ecdsaSignature.xml");
InputStream is = new FileInputStream(file);
-
+
doVerify(is);
}
@@ -143,12 +143,12 @@ public class ECDSASignatureTest extends
File file = makeDataFile("src/test/resources/at/buergerkarte/testresp.xml");
InputStream is = new FileInputStream(file);
-
+
doVerify(is);
}
-
+
private byte[] doSign() throws Exception {
- PrivateKey privateKey =
+ PrivateKey privateKey =
(PrivateKey)keyStore.getKey("ECDSA", ECDSA_JKS_PASSWORD.toCharArray());
org.w3c.dom.Document doc = db.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
@@ -157,15 +157,15 @@ public class ECDSASignatureTest extends
doc.appendChild(root);
root.appendChild(doc.createTextNode("Some simple text\n"));
- Element canonElem =
+ Element canonElem =
XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_CANONICALIZATIONMETHOD);
canonElem.setAttributeNS(
null, Constants._ATT_ALGORITHM, Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS
);
- SignatureAlgorithm signatureAlgorithm =
+ SignatureAlgorithm signatureAlgorithm =
new SignatureAlgorithm(doc, XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1);
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature(doc, null, signatureAlgorithm.getElement(), canonElem);
root.appendChild(sig.getElement());
@@ -188,16 +188,16 @@ public class ECDSASignatureTest extends
private void doVerify(byte[] signedXml) throws Exception {
doVerify(new ByteArrayInputStream(signedXml));
}
-
+
private void doVerify(InputStream is) throws Exception {
org.w3c.dom.Document doc = this.db.parse(is);
-
+
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
XMLSignature signature = new XMLSignature(sigElement, "");
@@ -214,7 +214,7 @@ public class ECDSASignatureTest extends
}
assertTrue(signature.checkSignatureValue(cert) );
}
-
+
private File makeDataFile(String relPath) {
if (BASEDIR != null && !"".equals(BASEDIR)) {
return new File(BASEDIR + SEP + relPath);
@@ -222,35 +222,35 @@ public class ECDSASignatureTest extends
return new File(relPath);
}
}
-
+
/**
* DO NOT DELETE THIS COMMENTED OUT METHOD!
- *
- * The reason this method is commented out is to avoid introducing explicit
+ *
+ * The reason this method is commented out is to avoid introducing explicit
* BouncyCastle dependencies.
- *
+ *
* Create an X.509 Certificate and associated private key using the Elliptic Curve
- * DSA algorithm, and store in a KeyStore. This method was used to generate the
- * keystore used for this test
+ * DSA algorithm, and store in a KeyStore. This method was used to generate the
+ * keystore used for this test
* ("src/test/resources/org/apache/xml/security/samples/input/ecdsa.jks").
private static void setUpKeyAndCertificate() throws Exception {
- java.security.spec.ECGenParameterSpec ecGenParameterSpec =
+ java.security.spec.ECGenParameterSpec ecGenParameterSpec =
new java.security.spec.ECGenParameterSpec("B-409");
-
- java.security.KeyPairGenerator kpg =
+
+ java.security.KeyPairGenerator kpg =
java.security.KeyPairGenerator.getInstance("ECDH");
kpg.initialize(ecGenParameterSpec, new java.security.SecureRandom());
java.security.KeyPair kp = kpg.generateKeyPair();
-
- org.bouncycastle.x509.X509V3CertificateGenerator certGen =
+
+ org.bouncycastle.x509.X509V3CertificateGenerator certGen =
new org.bouncycastle.x509.X509V3CertificateGenerator();
long now = System.currentTimeMillis();
certGen.setSerialNumber(java.math.BigInteger.valueOf(now));
- org.bouncycastle.jce.X509Principal subject =
+ org.bouncycastle.jce.X509Principal subject =
new org.bouncycastle.jce.X509Principal(
"CN=XML ECDSA Signature Test,DC=apache,DC=org"
);
@@ -268,17 +268,17 @@ public class ECDSASignatureTest extends
certGen.setPublicKey(kp.getPublic());
certGen.setSignatureAlgorithm("SHA1withECDSA");
certGen.addExtension(
- org.bouncycastle.asn1.x509.X509Extensions.BasicConstraints,
- true,
+ org.bouncycastle.asn1.x509.X509Extensions.BasicConstraints,
+ true,
new org.bouncycastle.asn1.x509.BasicConstraints(false)
);
certGen.addExtension(
- org.bouncycastle.asn1.x509.X509Extensions.KeyUsage,
- true,
+ org.bouncycastle.asn1.x509.X509Extensions.KeyUsage,
+ true,
new org.bouncycastle.asn1.x509.KeyUsage(
- org.bouncycastle.asn1.x509.KeyUsage.digitalSignature |
- org.bouncycastle.asn1.x509.KeyUsage.keyEncipherment |
- org.bouncycastle.asn1.x509.KeyUsage.keyCertSign |
+ org.bouncycastle.asn1.x509.KeyUsage.digitalSignature |
+ org.bouncycastle.asn1.x509.KeyUsage.keyEncipherment |
+ org.bouncycastle.asn1.x509.KeyUsage.keyCertSign |
org.bouncycastle.asn1.x509.KeyUsage.cRLSign
)
);
@@ -288,7 +288,7 @@ public class ECDSASignatureTest extends
KeyStore keyStore = KeyStore.getInstance("JKS");
keyStore.load(null, ECDSA_JKS_PASSWORD.toCharArray());
keyStore.setKeyEntry(
- "ECDSA", kp.getPrivate(),
+ "ECDSA", kp.getPrivate(),
ECDSA_JKS_PASSWORD.toCharArray(), new java.security.cert.Certificate[]{x509}
);
keyStore.store(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java Tue Dec 15 17:13:17 2015
@@ -33,19 +33,19 @@ import org.apache.xml.security.utils.Con
import org.apache.xml.security.utils.XMLUtils;
public class HMACOutputLengthTest extends org.junit.Assert {
-
+
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger
(HMACOutputLengthTest.class);
-
- private static final String BASEDIR =
+
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
public HMACOutputLengthTest() throws Exception {
Init.init();
}
-
+
@org.junit.Test
public void test_signature_enveloping_hmac_sha1_trunclen_0() throws Exception {
try {
@@ -60,7 +60,7 @@ public class HMACOutputLengthTest extend
}
}
}
-
+
@org.junit.Test
public void test_signature_enveloping_hmac_sha1_trunclen_8() throws Exception {
try {
@@ -74,13 +74,13 @@ public class HMACOutputLengthTest extend
}
}
}
-
+
@org.junit.Test
public void test_generate_hmac_sha1_40() throws Exception {
Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature(
- doc, null, XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ doc, null, XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
40, Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS
);
try {
@@ -97,8 +97,8 @@ public class HMACOutputLengthTest extend
}
private boolean validate(String data) throws Exception {
- File file =
- new File(BASEDIR + SEP + "src/test/resources" + SEP + "javax" + SEP + "xml"
+ File file =
+ new File(BASEDIR + SEP + "src/test/resources" + SEP + "javax" + SEP + "xml"
+ SEP + "crypto" + SEP + "dsig" + SEP, data);
Document doc = XMLUtils.createDocumentBuilder(false).parse(file);
@@ -121,5 +121,5 @@ public class HMACOutputLengthTest extend
public String getAlgorithm(){ return "SECRET"; }
};
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java Tue Dec 15 17:13:17 2015
@@ -32,26 +32,26 @@ import org.w3c.dom.Node;
/**
* Test case contributed by Matthias Germann for testing that bug 43239 is
- * fixed: "No installed provider supports this key" when checking a RSA
+ * fixed: "No installed provider supports this key" when checking a RSA
* signature against a DSA key before RSA key.
*/
public class InvalidKeyTest extends org.junit.Assert {
- private static final String BASEDIR =
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
-
+
static {
Init.init();
}
@org.junit.Test
public void test() throws Exception {
- FileInputStream input = new FileInputStream(BASEDIR + SEP +
+ FileInputStream input = new FileInputStream(BASEDIR + SEP +
"src/test/resources/org/apache/xml/security/samples/input/truststore.jks");
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
trustStore.load(input, "testpw".toCharArray());
-
+
try {
validate(trustStore.getCertificate("bedag-test").getPublicKey());
throw new Exception("Failure expected on a DSA key");
@@ -60,13 +60,13 @@ public class InvalidKeyTest extends org.
}
validate(trustStore.getCertificate("a70-garaio-frontend-u").getPublicKey());
}
-
+
private void validate(PublicKey pk) throws Exception {
FileInputStream is = new FileInputStream(BASEDIR + SEP +
"src/test/resources/org/apache/xml/security/samples/input/test-assertion.xml");
-
+
Document e = XMLUtils.createDocumentBuilder(false).parse(is);
-
+
Node assertion = e.getFirstChild();
while (!(assertion instanceof Element)) {
assertion = assertion.getNextSibling();
@@ -75,13 +75,13 @@ public class InvalidKeyTest extends org.
if (attr != null) {
((Element)assertion).setIdAttributeNode(attr, true);
}
-
+
Element n = (Element)assertion.getLastChild();
-
+
XMLSignature si = new XMLSignature(n, "");
si.checkSignatureValue(pk);
// System.out.println("VALIDATION OK" );
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java Tue Dec 15 17:13:17 2015
@@ -40,7 +40,7 @@ public class KeyValueTest extends org.ju
private static final String SEP = System.getProperty("file.separator");
private DocumentBuilder db;
-
+
static {
Init.init();
}
@@ -52,7 +52,7 @@ public class KeyValueTest extends org.ju
@org.junit.Test
public void testDSAPublicKey() throws Exception {
File f = null;
- String filename =
+ String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml";
if (BASEDIR != null && !"".equals(BASEDIR)) {
f = new File(BASEDIR + SEP + filename);
@@ -68,5 +68,5 @@ public class KeyValueTest extends org.ju
PublicKey pk = kv.getPublicKey();
assertNotNull(pk);
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java Tue Dec 15 17:13:17 2015
@@ -36,7 +36,7 @@ public class NoKeyInfoTest extends org.j
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
-
+
static {
Init.init();
}
@@ -50,7 +50,7 @@ public class NoKeyInfoTest extends org.j
@org.junit.Test
public void testNullKeyInfo() throws Exception {
File f = null;
- String filename =
+ String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml";
if (BASEDIR != null && !"".equals(BASEDIR)) {
f = new File(BASEDIR + SEP + filename);
@@ -64,5 +64,5 @@ public class NoKeyInfoTest extends org.j
KeyInfo ki = sig.getKeyInfo();
assertNull(ki);
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java Tue Dec 15 17:13:17 2015
@@ -53,21 +53,21 @@ public class ProcessingInstructionTest e
private static String dir;
public ProcessingInstructionTest() {
- String base = System.getProperty("basedir") == null
+ String base = System.getProperty("basedir") == null
? "./" : System.getProperty("basedir");
String fs = System.getProperty("file.separator");
- dir = base + fs + "src/test/resources" + fs + "org" + fs + "apache" + fs + "xml" +
+ dir = base + fs + "src/test/resources" + fs + "org" + fs + "apache" + fs + "xml" +
fs + "security" + fs + "testcases" + fs;
}
-
+
@org.junit.Test
public void testProcessingInstruction() throws Exception {
String signatureFileName = dir + "upp_sign.xml";
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
File f = new File(signatureFileName);
Document doc = db.parse(new java.io.FileInputStream(f));
-
- Node obj =
+
+ Node obj =
doc.getElementsByTagNameNS("http://uri.etsi.org/01903/v1.3.2#", "QualifyingProperties").item(0);
while (obj != null) {
if (obj instanceof Element) {
@@ -84,7 +84,7 @@ public class ProcessingInstructionTest e
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
String baseUri = new File(".").toURI().toURL().toString();
@@ -102,24 +102,24 @@ public class ProcessingInstructionTest e
private static class FileResolver extends ResourceResolverSpi {
private static FileResolver resolver = null;
-
+
public synchronized static ResourceResolverSpi getInstance() {
if (resolver == null) {
resolver = new FileResolver();
}
return resolver;
}
-
+
private FileResolver() {
}
-
+
@Override
public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
throws ResourceResolverException {
try {
URI uriNew = getNewURI(context.uriToResolve, context.baseUri);
-
- FileInputStream inputStream =
+
+ FileInputStream inputStream =
new FileInputStream(dir + "out.xml");
XMLSignatureInput result = new XMLSignatureInput(inputStream);
@@ -132,7 +132,7 @@ public class ProcessingInstructionTest e
);
}
}
-
+
@Override
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null || !"out.xml".equals(context.uriToResolve)) {
@@ -140,7 +140,7 @@ public class ProcessingInstructionTest e
}
return true;
}
-
+
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
if (baseURI == null || "".equals(baseURI)) {
@@ -148,10 +148,10 @@ public class ProcessingInstructionTest e
} else {
newUri = new URI(baseURI).resolve(uri);
}
-
+
// if the URI contains a fragment, ignore it
if (newUri.getFragment() != null) {
- URI uriNewNoFrag =
+ URI uriNewNoFrag =
new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
return uriNewNoFrag;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java Tue Dec 15 17:13:17 2015
@@ -48,7 +48,7 @@ import org.apache.xml.security.utils.res
public class SignatureReferenceTest extends org.junit.Assert {
public static final String DS_NS = "http://www.w3.org/2000/09/xmldsig#";
- private static final String BASEDIR =
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
public static final String KEYSTORE_DIRECTORY = BASEDIR + "/src/test/resources/";
public static final String KEYSTORE_PASSWORD_STRING = "changeit";
@@ -66,7 +66,7 @@ public class SignatureReferenceTest exte
PublicKey pubKey = getPublicKey();
assertTrue(signature.checkSignatureValue(pubKey));
-
+
// Check the reference(s)
SignedInfo signedInfo = signature.getSignedInfo();
assertTrue(signedInfo.getLength() == 1);
@@ -74,13 +74,13 @@ public class SignatureReferenceTest exte
ReferenceData referenceData = reference.getReferenceData();
assertNotNull(referenceData);
assertTrue(referenceData instanceof ReferenceNodeSetData);
-
+
// Test the cached Element
- Element referenceElement =
+ Element referenceElement =
(Element)((ReferenceNodeSetData)referenceData).iterator().next();
assertNotNull(referenceElement);
assertTrue("root".equals(referenceElement.getLocalName()));
-
+
Element originalElement =
(Element) doc.getElementsByTagNameNS("http://ns.example.org/", "root").item(0);
assertNotNull(originalElement);
@@ -89,7 +89,7 @@ public class SignatureReferenceTest exte
/**
* Loads the 'localhost' keystore from the test keystore.
- *
+ *
* @return test keystore.
* @throws Exception
*/
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java Tue Dec 15 17:13:17 2015
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
public class SignatureTest extends org.junit.Assert {
public static final String DS_NS = "http://www.w3.org/2000/09/xmldsig#";
- private static final String BASEDIR =
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
public static final String KEYSTORE_DIRECTORY = BASEDIR + "/src/test/resources/";
public static final String KEYSTORE_PASSWORD_STRING = "changeit";
@@ -85,7 +85,7 @@ public class SignatureTest extends org.j
XMLSignature signature = signDocument(doc);
PublicKey pubKey = getPublicKey();
-
+
VerifyingRunnable r = new VerifyingRunnable(signature, pubKey);
r.run();
if (r.throwable != null) {
@@ -93,7 +93,7 @@ public class SignatureTest extends org.j
}
assertTrue(r.result);
}
-
+
@org.junit.Test
public void testSigningVerifyingFromExistingSignatureSeparateThread()
throws Throwable {
@@ -130,10 +130,10 @@ public class SignatureTest extends org.j
}
}
}
-
+
/**
* Loads the 'localhost' keystore from the test keystore.
- *
+ *
* @return test keystore.
* @throws Exception
*/
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java Tue Dec 15 17:13:17 2015
@@ -61,12 +61,12 @@ public class UnknownAlgoSignatureTest ex
protected static final String KEYSTORE_TYPE = "JKS";
- protected static final String KEYSTORE_FILE =
+ protected static final String KEYSTORE_FILE =
"src/test/resources/org/apache/xml/security/samples/input/keystore.jks";
protected static final String CERT_ALIAS = "test";
- protected static final String SIGNATURE_SOURCE_PATH =
+ protected static final String SIGNATURE_SOURCE_PATH =
"src/test/resources/org/apache/xml/security/temp/signature";
protected PublicKey publicKey;
@@ -152,13 +152,13 @@ public class UnknownAlgoSignatureTest ex
file = new File(SIGNATURE_SOURCE_PATH, fileName);
}
Document doc = getDocument(file);
-
+
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
return new XMLSignature(sigElement, file.toURI().toURL().toString());
}
@@ -169,5 +169,5 @@ public class UnknownAlgoSignatureTest ex
Document doc = db.parse(new FileInputStream(file));
return doc;
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java Tue Dec 15 17:13:17 2015
@@ -78,7 +78,7 @@ public class XMLSignatureInputTest exten
// added one for xmlns:xml since Xalan 2.2.D11
static final int _nodeSetInput3Nodes = 11; // was 10
static final int _nodeSetInput3NodesWithComments = _nodeSetInput3Nodes + 1;
-
+
static {
org.apache.xml.security.Init.init();
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java Tue Dec 15 17:13:17 2015
@@ -40,11 +40,11 @@ import org.w3c.dom.NodeList;
/**
* An implementation of a resource resolver, which evaluates xpointer expressions.
- *
+ *
* @author wglas
*/
public class XPointerResourceResolver extends ResourceResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(XPointerResourceResolver.class);
private static final String XP_OPEN = "xpointer(";
@@ -101,7 +101,7 @@ public class XPointerResourceResolver ex
}
@Override
- public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
+ public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
throws ResourceResolverException {
String v = context.uriToResolve;
@@ -121,7 +121,7 @@ public class XPointerResourceResolver ex
int i = 0;
Map<String, String> namespaces = new HashMap<String, String>();
-
+
if (parts.length > 1) {
for (; i < parts.length - 1; ++i) {
@@ -140,7 +140,7 @@ public class XPointerResourceResolver ex
}
namespaces.put(
- mapping.substring(0, pos),
+ mapping.substring(0, pos),
mapping.substring(pos + 1)
);
}
@@ -162,11 +162,11 @@ public class XPointerResourceResolver ex
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
- DSNamespaceContext namespaceContext =
+ DSNamespaceContext namespaceContext =
new DSNamespaceContext(namespaces);
xpath.setNamespaceContext(namespaceContext);
- nodes =
+ nodes =
(NodeList) xpath.evaluate(
xpathExpr, this.baseNode, XPathConstants.NODESET
);
@@ -197,7 +197,7 @@ public class XPointerResourceResolver ex
result.setMIMEType("text/xml");
result.setExcludeComments(true);
- result.setSourceURI((context.baseUri != null) ? context.baseUri.concat(v) : v);
+ result.setSourceURI((context.baseUri != null) ? context.baseUri.concat(v) : v);
return result;
} catch (XPathExpressionException e) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java Tue Dec 15 17:13:17 2015
@@ -50,8 +50,8 @@ import org.w3c.dom.Element;
* @author Frank Cornelis
*/
public class XmlSecTest extends org.junit.Assert {
-
- private static final String BASEDIR =
+
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
static org.slf4j.Logger log =
@@ -62,23 +62,23 @@ public class XmlSecTest extends org.juni
public void testCheckXmlSignatureSoftwareStack() throws Exception {
checkXmlSignatureSoftwareStack(false);
}
-
+
@org.junit.Test
public void testCheckXmlSignatureSoftwareStackWithCert() throws Exception {
checkXmlSignatureSoftwareStack(true);
}
-
+
private void checkXmlSignatureSoftwareStack(boolean cert) throws Exception {
Init.init();
DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(false);
Document testDocument = documentBuilder.newDocument();
- Element rootElement =
+ Element rootElement =
testDocument.createElementNS("urn:namespace", "tns:document");
rootElement.setAttributeNS
(Constants.NamespaceSpecNS, "xmlns:tns", "urn:namespace");
testDocument.appendChild(rootElement);
- Element childElement =
+ Element childElement =
testDocument.createElementNS("urn:childnamespace", "t:child");
childElement.setAttributeNS
(Constants.NamespaceSpecNS, "xmlns:t", "urn:childnamespace");
@@ -91,7 +91,7 @@ public class XmlSecTest extends org.juni
if (cert) {
// get key & self-signed certificate from keystore
String fs = System.getProperty("file.separator");
- FileInputStream fis =
+ FileInputStream fis =
new FileInputStream(BASEDIR + fs + "src/test/resources" + fs + "test.jks");
KeyStore ks = KeyStore.getInstance("JKS");
ks.load(fis, "changeit".toCharArray());
@@ -104,7 +104,7 @@ public class XmlSecTest extends org.juni
privateKey = keyPair.getPrivate();
}
- XMLSignature signature =
+ XMLSignature signature =
new XMLSignature(
testDocument, "", XMLSignature.ALGO_ID_SIGNATURE_DSA,
Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS
@@ -133,13 +133,13 @@ public class XmlSecTest extends org.juni
);
signature.sign(privateKey);
-
+
XPathFactory xpf = XPathFactory.newInstance();
XPath xPath = xpf.newXPath();
xPath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xPath.evaluate(expression, testDocument, XPathConstants.NODE);
XMLSignature signatureToVerify = new XMLSignature(sigElement, "");
@@ -148,5 +148,5 @@ public class XmlSecTest extends org.juni
assertTrue(signResult);
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Tue Dec 15 17:13:17 2015
@@ -47,7 +47,7 @@ public class TransformBase64DecodeTest e
static {
org.apache.xml.security.Init.init();
}
-
+
@org.junit.Test
public void test1() throws Exception {
// base64 encoded
@@ -110,13 +110,13 @@ public class TransformBase64DecodeTest e
Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
//XMLUtils.circumventBug2650(doc);
-
+
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Base64";
- Node base64Node =
+ Node base64Node =
(Node) xpath.evaluate(expression, doc, XPathConstants.NODE);
XMLSignatureInput xmlinput = new XMLSignatureInput(base64Node);
@@ -130,7 +130,7 @@ public class TransformBase64DecodeTest e
String result = new String(out.getBytes());
assertTrue(
- "\"" + result + "\"",
+ "\"" + result + "\"",
result.equals("The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64")
);
}
@@ -146,5 +146,5 @@ public class TransformBase64DecodeTest e
}
return doc;
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java Tue Dec 15 17:13:17 2015
@@ -38,18 +38,18 @@ import org.apache.xml.security.utils.XML
public class TransformXSLTTest extends org.junit.Assert {
- private static final String BASEDIR =
+ private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private static final String SOURCE_PATH =
+ private static final String SOURCE_PATH =
"src/test/resources/com/phaos/phaos-xmldsig-three/";
- private static final String SIGNATURE_FILE =
+ private static final String SIGNATURE_FILE =
"signature-rsa-detached-xslt-transform.xml";
private static final String STYLESHEET_FILE = "document-stylesheet.xml";
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(TransformXSLTTest.class);
-
+
static {
org.apache.xml.security.Init.init();
}
@@ -77,16 +77,16 @@ public class TransformXSLTTest extends o
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Transform[1]";
- Element transformEl =
+ Element transformEl =
(Element) xpath.evaluate(expression, doc1, XPathConstants.NODE);
- Transform transform =
+ Transform transform =
new Transform(doc1, Transforms.TRANSFORM_XSLT, transformEl.getChildNodes());
transform.performTransform(new XMLSignatureInput(doc2));
}
-
- private static Document getDocument(File file)
+
+ private static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
return XMLUtils.createDocumentBuilder(false).parse(new FileInputStream(file));
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java Tue Dec 15 17:13:17 2015
@@ -33,7 +33,7 @@ public class Base64Test extends org.juni
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(Base64Test.class);
-
+
static {
org.apache.xml.security.Init.init();
}
@@ -57,7 +57,7 @@ public class Base64Test extends org.juni
@org.junit.Test
public void testWrap1() throws java.io.UnsupportedEncodingException,Exception {
String inputData = "The quick brown fox jumps over the lazy dog and some extr";
- String expectedResult =
+ String expectedResult =
"VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRy";
String result = Base64.encode(inputData.getBytes("UTF-8"));
assertEquals("Result of encoding", result, expectedResult);
@@ -73,14 +73,14 @@ public class Base64Test extends org.juni
@org.junit.Test
public void testWrap2() throws java.io.UnsupportedEncodingException, Exception {
- String inputData =
+ String inputData =
"The quick brown fox jumps over the lazy dog and some extra text that will cause a line wrap";
String expectedResult = null;
if (XMLUtils.ignoreLineBreaks()) {
- expectedResult =
+ expectedResult =
"VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRyYSB0ZXh0IHRoYXQgd2lsbCBjYXVzZSBhIGxpbmUgd3JhcA==";
} else {
- expectedResult =
+ expectedResult =
"VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRy\nYSB0ZXh0IHRoYXQgd2lsbCBjYXVzZSBhIGxpbmUgd3JhcA==";
}
String result = Base64.encode(inputData.getBytes("UTF-8"));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java Tue Dec 15 17:13:17 2015
@@ -45,20 +45,20 @@ public class OfflineResolver extends Res
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(OfflineResolver.class);
-
+
/** Field _uriMap */
static Map<String, String> _uriMap = null;
/** Field _mimeMap */
static Map<String, String> _mimeMap = null;
-
+
static {
org.apache.xml.security.Init.init();
_uriMap = new HashMap<String, String>();
_mimeMap = new HashMap<String, String>();
- String basedir =
+ String basedir =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir") + "/";
OfflineResolver.register(
@@ -83,8 +83,8 @@ public class OfflineResolver extends Res
);
OfflineResolver.register(
"http://www.w3.org/Signature/2002/04/xml-stylesheet.b64",
- basedir
- + "src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/xml-stylesheet.b64",
+ basedir
+ + "src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/xml-stylesheet.b64",
"text/plain"
);
}
@@ -169,7 +169,7 @@ public class OfflineResolver extends Res
OfflineResolver._uriMap.put(URI, filename);
OfflineResolver._mimeMap.put(URI, MIME);
}
-
+
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
if (baseURI == null || "".equals(baseURI)) {
@@ -177,10 +177,10 @@ public class OfflineResolver extends Res
} else {
newUri = new URI(baseURI).resolve(uri);
}
-
+
// if the URI contains a fragment, ignore it
if (newUri.getFragment() != null) {
- URI uriNewNoFrag =
+ URI uriNewNoFrag =
new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
return uriNewNoFrag;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Tue Dec 15 17:13:17 2015
@@ -35,7 +35,7 @@ public class ResourceResolverTest extend
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger
(ResourceResolverTest.class);
-
+
static {
org.apache.xml.security.Init.init();
}
@@ -45,20 +45,20 @@ public class ResourceResolverTest extend
*/
@org.junit.Test
public void testCustomResolver() throws Exception {
- String className =
+ String className =
"org.apache.xml.security.test.dom.utils.resolver.OfflineResolver";
ResourceResolver.registerAtStart(className);
Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uriAttr = doc.createAttribute("URI");
uriAttr.setValue("http://www.apache.org");
- ResourceResolver res =
+ ResourceResolver res =
ResourceResolver.getInstance(uriAttr, "http://www.apache.org", true);
try {
uriAttr.setValue("http://xmldsig.pothole.com/xml-stylesheet.txt");
res.resolve(uriAttr, null, true);
} catch (Exception e) {
e.printStackTrace();
- fail(uriAttr.getValue()
+ fail(uriAttr.getValue()
+ " should be resolvable by the OfflineResolver");
}
try {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java Tue Dec 15 17:13:17 2015
@@ -39,7 +39,7 @@ public class UncategorizedTest extends o
@Test
public void testConfigurationLoadFromUrl() throws Exception {
- URL url =
+ URL url =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_input.xml");
try {
@@ -49,21 +49,21 @@ public class UncategorizedTest extends o
Assert.assertTrue(e.getMessage().contains("Cannot find the declaration of element 'doc'."));
}
}
-
+
@Test
public void testDuplicateActions() throws Exception {
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
-
+
// Should work
XMLSec.getOutboundXMLSec(properties);
-
+
// Should throw an error on a duplicate Action
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
-
+
try {
XMLSec.getOutboundXMLSec(properties);
Assert.fail();