Author: coheigea
Date: Mon Jan 13 16:13:30 2014
New Revision: 1557763
URL: http://svn.apache.org/r1557763
Log:
Switching to use new AlgorithmUsage identifiers from Santuario
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java?rev=1557763&r1=1557762&r2=1557763&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
(original)
+++
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
Mon Jan 13 16:13:30 2014
@@ -81,7 +81,7 @@ public class AlgorithmSuiteAssertionStat
setAsserted(false);
setErrorMessage("Asymmetric signature algorithm key length " +
algorithmSuiteSecurityEvent.getKeyLength() + " does not meet policy");
}
- } else if (WSSConstants.Dig.equals(keyUsage)) {
+ } else if (WSSConstants.SigDig.equals(keyUsage)) {
if (algorithmSuite.getAlgorithmSuiteType() != null
&&
!algorithmSuite.getAlgorithmSuiteType().getDigest().equals(algorithmSuiteSecurityEvent.getAlgorithmURI()))
{
setAsserted(false);
@@ -147,15 +147,21 @@ public class AlgorithmSuiteAssertionStat
setAsserted(false);
setErrorMessage("Signature key derivation algorithm " +
algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
}
- } else if (WSSConstants.C14n.equals(keyUsage)) {
+ } else if (WSSConstants.SigC14n.equals(keyUsage)) {
if (algorithmSuite.getC14n() != null
- &&
!algorithmSuite.getC14n().getValue().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())
- &&
!WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithmSuiteSecurityEvent.getAlgorithmURI())
- &&
!WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithmSuiteSecurityEvent.getAlgorithmURI())
- &&
!WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithmSuiteSecurityEvent.getAlgorithmURI()))
{
+ &&
!algorithmSuite.getC14n().getValue().equals(algorithmSuiteSecurityEvent.getAlgorithmURI()))
{
setAsserted(false);
setErrorMessage("C14N algorithm " +
algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
}
+ } else if (WSSConstants.SigTransform.equals(keyUsage)) {
+ if (algorithmSuite.getC14n() != null
+ &&
!algorithmSuite.getC14n().getValue().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())
+ &&
!WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(algorithmSuiteSecurityEvent.getAlgorithmURI())
+ &&
!WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(algorithmSuiteSecurityEvent.getAlgorithmURI())
+ &&
!WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(algorithmSuiteSecurityEvent.getAlgorithmURI()))
{
+ setAsserted(false);
+ setErrorMessage("Transform C14N algorithm " +
algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
} else if (WSSConstants.Soap_Norm.equals(keyUsage)) {
if (algorithmSuite.getSoapNormType() != null
&&
!algorithmSuite.getSoapNormType().getValue().equals(algorithmSuiteSecurityEvent.getAlgorithmURI()))
{
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java?rev=1557763&r1=1557762&r2=1557763&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
(original)
+++
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
Mon Jan 13 16:13:30 2014
@@ -85,7 +85,7 @@ public class AlgorithmSuiteTest extends
algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.Enc);
policyEnforcer.registerSecurityEvent(algorithmSuiteSecurityEvent);
algorithmSuiteSecurityEvent.setAlgorithmURI("http://www.w3.org/2001/04/xmlenc#sha256";);
- algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.Dig);
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.SigDig);
try {
policyEnforcer.registerSecurityEvent(algorithmSuiteSecurityEvent);
Assert.fail("Exception expected");
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java?rev=1557763&r1=1557762&r2=1557763&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
Mon Jan 13 16:13:30 2014
@@ -80,7 +80,7 @@ public class WSSSignatureInputHandler ex
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new
AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(signatureType.getSignedInfo().getCanonicalizationMethod().getAlgorithm());
- algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.C14n);
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.SigC14n);
algorithmSuiteSecurityEvent.setCorrelationID(signatureType.getId());
securityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1557763&r1=1557762&r2=1557763&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
Mon Jan 13 16:13:30 2014
@@ -361,7 +361,7 @@ public class WSSSignatureReferenceVerify
algorithm = transformType.getAlgorithm();
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new
AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(algorithm);
- algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.C14n);
+
algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.SigTransform);
algorithmSuiteSecurityEvent.setCorrelationID(referenceType.getId());
inputProcessorChain.getSecurityContext().registerSecurityEvent(algorithmSuiteSecurityEvent);
