You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2020/04/23 06:08:21 UTC
[ws-wss4j] branch master updated: Picking up fixes from Santuario
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push:
new b6cd7fa Picking up fixes from Santuario
b6cd7fa is described below
commit b6cd7fad2447ef6dcfe6dc9a008bf559c688966e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 07:02:43 2020 +0100
Picking up fixes from Santuario
---
.../wss4j/policy/stax/enforcer/PolicyInputProcessor.java | 4 ++--
.../stax/impl/processor/input/EncryptedDataInputHandler.java | 4 ++--
.../stax/impl/processor/input/OperationInputProcessor.java | 4 ++--
.../stax/impl/processor/input/SAMLTokenInputHandler.java | 4 ++--
.../impl/processor/input/SecurityHeaderInputProcessor.java | 12 ++++++------
.../processor/input/SecurityTokenReferenceInputHandler.java | 4 ++--
.../processor/input/SignatureConfirmationInputProcessor.java | 4 ++--
.../input/WSSSignatureReferenceVerifyInputProcessor.java | 4 ++--
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyInputProcessor.java b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyInputProcessor.java
index a28584a..03c466d 100644
--- a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyInputProcessor.java
+++ b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyInputProcessor.java
@@ -60,7 +60,7 @@ public class PolicyInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processHeaderEvent();
//test if non encrypted element have to be encrypted per policy
init(inputProcessorChain);
@@ -100,7 +100,7 @@ public class PolicyInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processEvent();
List<QName> elementPath = null;
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/EncryptedDataInputHandler.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/EncryptedDataInputHandler.java
index 7ea905f..14e78f0 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/EncryptedDataInputHandler.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/EncryptedDataInputHandler.java
@@ -80,14 +80,14 @@ public class EncryptedDataInputHandler extends AbstractInputSecurityHeaderHandle
//replay the EncryptedData event for the DecryptInputProcessor:
InputProcessor tmpProcessor = new AbstractInputProcessor(securityProperties) {
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
inputProcessorChain.removeProcessor(this);
return encryptedDataElement;
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
inputProcessorChain.removeProcessor(this);
return encryptedDataElement;
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/OperationInputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/OperationInputProcessor.java
index 3c50f67..49f0500 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/OperationInputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/OperationInputProcessor.java
@@ -47,13 +47,13 @@ public class OperationInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
return inputProcessorChain.processHeaderEvent();
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processEvent();
if (xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT) {
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
index 2c4c628..e709188 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
@@ -587,13 +587,13 @@ public class SAMLTokenInputHandler extends AbstractInputSecurityHeaderHandler {
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
return inputProcessorChain.processHeaderEvent();
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processEvent();
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
index 76800cf..b9cb724 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
@@ -62,13 +62,13 @@ public class SecurityHeaderInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
return null;
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
//buffer all events until the end of the security header
@@ -237,7 +237,7 @@ public class SecurityHeaderInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processHeaderEvent();
xmlSecEventList.push(xmlSecEvent);
@@ -245,7 +245,7 @@ public class SecurityHeaderInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
//should never be called because we remove this processor before
return null;
@@ -265,13 +265,13 @@ public class SecurityHeaderInputProcessor extends AbstractInputProcessor {
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
return null;
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
if (!xmlSecEventList.isEmpty()) {
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
index 2efbe1f..1e8b61c 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
@@ -119,13 +119,13 @@ public class SecurityTokenReferenceInputHandler extends AbstractInputSecurityHea
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
return inputProcessorChain.processHeaderEvent();
}
@Override
- public XMLSecEvent processNextEvent(final InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(final InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processEvent();
switch (xmlSecEvent.getEventType()) {
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java
index d380372..89461d0 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputProcessor.java
@@ -42,7 +42,7 @@ public class SignatureConfirmationInputProcessor extends AbstractInputProcessor
}
@Override
- public XMLSecEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processHeaderEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
XMLSecEvent xmlSecEvent = inputProcessorChain.processHeaderEvent();
@@ -93,7 +93,7 @@ public class SignatureConfirmationInputProcessor extends AbstractInputProcessor
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain)
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain)
throws XMLStreamException, XMLSecurityException {
//should never be called
return null;
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
index e4a7680..881d1bf 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
@@ -265,14 +265,14 @@ public class WSSSignatureReferenceVerifyInputProcessor extends AbstractSignature
}
@Override
- public XMLSecEvent processNextEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
+ public XMLSecEvent processEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
//this is the earliest possible point to check for an replay attack
if (!replayChecked) {
replayChecked = true;
detectReplayAttack(inputProcessorChain);
}
- return super.processNextEvent(inputProcessorChain);
+ return super.processEvent(inputProcessorChain);
}
@Override