Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Security] Bump ant from 1.8.2 to 1.10.9 #31

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Security] Bump ant from 1.8.2 to 1.10.9 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9fb243
Update MessageSendingPipe.java
jjansenvr Feb 7, 2017
c1eb8f6
Merge pull request #1 from jjansenvr/jjansenvr-patch-5
jjansenvr Feb 7, 2017
9283a01
[Security] Bump ant from 1.8.2 to 1.10.9
dependabot-preview[bot] Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions core/src/main/java/nl/nn/adapterframework/pipes/MessageSendingPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
* <tr><td>{@link #setCorrelationIDStyleSheet(String) correlationIDStyleSheet}</td><td>stylesheet to extract correlationID from message</td><td>&nbsp;</td></tr>
* <tr><td>{@link #setCorrelationIDSessionKey(String) correlationIDSessionKey}</td><td>Key of a PipeLineSession-variable. Is specified, the value of the PipeLineSession variable is used as input for the XpathExpression or StyleSheet, instead of the current input message</td><td>&nbsp;</td></tr>
* <tr><td>{@link #setHideRegex(String) hideRegex}</td><td>Regular expression to mask strings in the error/logstore. Everything character between to strings in this expression will be replaced by a '*'that fits the expression is replaced. For Example, the regular expression (?&lt;=&lt;Party&gt;).*?(?=&lt;/Party&gt;) will replace every character between keys <party> and </party></td><td>&nbsp;</td></tr>
* <tr><td>{@link #setHideMethod(String) hideMethod}</td><td>(only used when hideRegex is not empty) either <code>all</code> or <code>firstHalf</code>. When <code>firstHalf</code> only the first half of the string is masked, otherwise (<code>all</code>) the entire string is masked</td><td>"all"</td></tr>
* <tr><td>{@link #setLabelXPath(String) labelXPath}</td><td>xpath expression to extract label from message</td><td>&nbsp;</td></tr>
* <tr><td>{@link #setLabelNamespaceDefs(String) labelNamespaceDefs}</td><td>namespace defintions for labelXPath. Must be in the form of a comma or space separated list of <code>prefix=namespaceuri</code>-definitions</td><td>&nbsp;</td></tr>
* <tr><td>{@link #setLabelStyleSheet(String) labelStyleSheet}</td><td>stylesheet to extract label from message</td><td>&nbsp;</td></tr>
Expand Down Expand Up @@ -228,7 +227,6 @@ public class MessageSendingPipe extends FixedForwardPipe implements HasSender, H
private ListenerProcessor listenerProcessor;

private String hideRegex = null;
private String hideMethod = "all";

private boolean streamResultToServlet=false;

Expand Down Expand Up @@ -581,21 +579,13 @@ public PipeRunResult doPipe(Object input, IPipeLineSession session) throws PipeR
if (sender instanceof MailSender) {
String messageInMailSafeForm = (String)session.get("messageInMailSafeForm");
if (hideRegex != null){
if (getHideMethod().equalsIgnoreCase("FIRSTHALF")) {
messageInMailSafeForm = Misc.hideFirstHalf(messageInMailSafeForm, hideRegex);
} else {
messageInMailSafeForm = Misc.hideAll(messageInMailSafeForm, hideRegex);
}
messageInMailSafeForm = messageInMailSafeForm.replaceAll(hideRegex,"$1**********$2");
}
messageLog.storeMessage(storedMessageID,correlationID,new Date(),messageTrail,label,messageInMailSafeForm);
} else {
String message = (String)input;
if (hideRegex != null){
if (getHideMethod().equalsIgnoreCase("FIRSTHALF")) {
message = Misc.hideFirstHalf(message, hideRegex);
} else {
message = Misc.hideAll(message, hideRegex);
}
message = message.replaceAll(hideRegex,"$1**********$2");
}
messageLog.storeMessage(storedMessageID,correlationID,new Date(),messageTrail,label,message);
}
Expand Down Expand Up @@ -1131,14 +1121,6 @@ public String getHideRegex() {
return hideRegex;
}

public void setHideMethod(String hideMethod) {
this.hideMethod = hideMethod;
}

public String getHideMethod() {
return hideMethod;
}

public void setStreamResultToServlet(boolean b) {
streamResultToServlet = b;
}
Expand Down
2 changes: 1 addition & 1 deletion larva/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.8.2</version>
<version>1.10.9</version>
</dependency>
<dependency>
<groupId>rome</groupId>
Expand Down