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 2012/07/12 18:06:43 UTC
svn commit: r1360742 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/stax/impl/processor/input/
test/java/org/apache/xml/security/test/stax/signature/
Author: coheigea
Date: Thu Jul 12 16:06:43 2012
New Revision: 1360742
URL: http://svn.apache.org/viewvc?rev=1360742&view=rev
Log:
Testing the PublicKey that was used for signature verification via a KeyValueTokenSecurityEvent
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java?rev=1360742&r1=1360741&r2=1360742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java Thu Jul 12 16:06:43 2012
@@ -75,6 +75,7 @@ public class XMLSignatureInputHandler ex
throw new XMLSecurityException(XMLSecurityException.ErrorCode.UNSUPPORTED_SECURITY_TOKEN);
}*/
if (tokenSecurityEvent != null) {
+ tokenSecurityEvent.setSecurityToken(securityToken);
securityContext.registerSecurityEvent(tokenSecurityEvent);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1360742&r1=1360741&r2=1360742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Thu Jul 12 16:06:43 2012
@@ -48,6 +48,8 @@ import org.apache.xml.security.stax.conf
import org.apache.xml.security.stax.ext.InboundXMLSec;
import org.apache.xml.security.stax.ext.XMLSec;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
+import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.junit.Before;
@@ -250,9 +252,6 @@ public class BaltimoreTest extends org.j
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document document = builder.parse(sourceDocument);
- // Set up the Key
- Key publicKey = getPublicKey("DSA", 15);
-
// XMLUtils.outputDOM(document, System.out);
// Convert Document to a Stream Reader
@@ -264,11 +263,20 @@ public class BaltimoreTest extends org.j
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
- properties.setSignatureVerificationKey(publicKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
- XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
+ TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
+ XMLStreamReader securityStreamReader =
+ inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), securityStreamReader);
+
+ // Compare the keys
+ KeyValueTokenSecurityEvent tokenEvent =
+ (KeyValueTokenSecurityEvent)securityEventListener.getTokenEvent(SecurityEventConstants.KeyValueToken);
+ assertNotNull(tokenEvent);
+ PublicKey processedKey = tokenEvent.getSecurityToken().getPublicKey("", null);
+ Key publicKey = getPublicKey("DSA", 15);
+ assertEquals(processedKey, publicKey);
}
@Test
@@ -280,9 +288,6 @@ public class BaltimoreTest extends org.j
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document document = builder.parse(sourceDocument);
- // Set up the Key
- Key publicKey = getPublicKey("RSA", 15);
-
// XMLUtils.outputDOM(document, System.out);
// Convert Document to a Stream Reader
@@ -294,11 +299,20 @@ public class BaltimoreTest extends org.j
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
- properties.setSignatureVerificationKey(publicKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
- XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
+ TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
+ XMLStreamReader securityStreamReader =
+ inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), securityStreamReader);
+
+ // Compare the keys
+ KeyValueTokenSecurityEvent tokenEvent =
+ (KeyValueTokenSecurityEvent)securityEventListener.getTokenEvent(SecurityEventConstants.KeyValueToken);
+ assertNotNull(tokenEvent);
+ PublicKey processedKey = tokenEvent.getSecurityToken().getPublicKey("", null);
+ Key publicKey = getPublicKey("RSA", 15);
+ assertEquals(processedKey, publicKey);
}
// See SANTUARIO-318
@@ -508,9 +522,6 @@ public class BaltimoreTest extends org.j
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document document = builder.parse(sourceDocument);
- // Set up the Key
- Key publicKey = getPublicKey("DSA", 23);
-
// XMLUtils.outputDOM(document, System.out);
// Convert Document to a Stream Reader
@@ -522,11 +533,20 @@ public class BaltimoreTest extends org.j
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
- properties.setSignatureVerificationKey(publicKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
- XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
+ TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
+ XMLStreamReader securityStreamReader =
+ inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), securityStreamReader);
+
+ // Compare the keys
+ KeyValueTokenSecurityEvent tokenEvent =
+ (KeyValueTokenSecurityEvent)securityEventListener.getTokenEvent(SecurityEventConstants.KeyValueToken);
+ assertNotNull(tokenEvent);
+ PublicKey processedKey = tokenEvent.getSecurityToken().getPublicKey("", null);
+ Key publicKey = getPublicKey("DSA", 23);
+ assertEquals(processedKey, publicKey);
}
@Test
@@ -538,9 +558,6 @@ public class BaltimoreTest extends org.j
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document document = builder.parse(sourceDocument);
- // Set up the Key
- Key publicKey = getPublicKey("RSA", 23);
-
// XMLUtils.outputDOM(document, System.out);
// Convert Document to a Stream Reader
@@ -552,11 +569,20 @@ public class BaltimoreTest extends org.j
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
- properties.setSignatureVerificationKey(publicKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
- XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
+ TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
+ XMLStreamReader securityStreamReader =
+ inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), securityStreamReader);
+
+ // Compare the keys
+ KeyValueTokenSecurityEvent tokenEvent =
+ (KeyValueTokenSecurityEvent)securityEventListener.getTokenEvent(SecurityEventConstants.KeyValueToken);
+ assertNotNull(tokenEvent);
+ PublicKey processedKey = tokenEvent.getSecurityToken().getPublicKey("", null);
+ Key publicKey = getPublicKey("RSA", 23);
+ assertEquals(processedKey, publicKey);
}
// See SANTUARIO-318
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1360742&r1=1360741&r2=1360742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Thu Jul 12 16:06:43 2012
@@ -46,6 +46,8 @@ import org.apache.xml.security.stax.conf
import org.apache.xml.security.stax.ext.InboundXMLSec;
import org.apache.xml.security.stax.ext.XMLSec;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
+import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.junit.Before;
@@ -171,9 +173,6 @@ public class IAIKTest extends org.junit.
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document document = builder.parse(sourceDocument);
- // Set up the Key
- Key publicKey = getPublicKey("DSA");
-
// XMLUtils.outputDOM(document, System.out);
// Convert Document to a Stream Reader
@@ -185,11 +184,20 @@ public class IAIKTest extends org.junit.
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
- properties.setSignatureVerificationKey(publicKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
- XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
+ TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
+ XMLStreamReader securityStreamReader =
+ inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), securityStreamReader);
+
+ // Compare the keys
+ KeyValueTokenSecurityEvent tokenEvent =
+ (KeyValueTokenSecurityEvent)securityEventListener.getTokenEvent(SecurityEventConstants.KeyValueToken);
+ assertNotNull(tokenEvent);
+ PublicKey processedKey = tokenEvent.getSecurityToken().getPublicKey("", null);
+ Key publicKey = getPublicKey("DSA");
+ assertEquals(processedKey, publicKey);
}
@Test
@@ -201,9 +209,6 @@ public class IAIKTest extends org.junit.
DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document document = builder.parse(sourceDocument);
- // Set up the Key
- Key publicKey = getPublicKey("RSA");
-
// XMLUtils.outputDOM(document, System.out);
// Convert Document to a Stream Reader
@@ -215,11 +220,20 @@ public class IAIKTest extends org.junit.
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
- properties.setSignatureVerificationKey(publicKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
- XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
+ TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
+ XMLStreamReader securityStreamReader =
+ inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), securityStreamReader);
+
+ // Compare the keys
+ KeyValueTokenSecurityEvent tokenEvent =
+ (KeyValueTokenSecurityEvent)securityEventListener.getTokenEvent(SecurityEventConstants.KeyValueToken);
+ assertNotNull(tokenEvent);
+ PublicKey processedKey = tokenEvent.getSecurityToken().getPublicKey("", null);
+ Key publicKey = getPublicKey("RSA");
+ assertEquals(processedKey, publicKey);
}
// See SANTUARIO-318