You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/24 12:46:42 UTC
[1/3] camel git commit: CAMEL-10869: Mask password in trace logging.
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 8dddc4fdb -> 213a926d8
refs/heads/camel-2.18.x d953d3b57 -> cc704cd2e
refs/heads/master b2bf0520c -> 60952ba8d
CAMEL-10869: Mask password in trace logging.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60952ba8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60952ba8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60952ba8
Branch: refs/heads/master
Commit: 60952ba8d61b5485bd24d593cb9ccd1fc2bd49bf
Parents: b2bf052
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 24 13:45:25 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 24 13:45:25 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/FtpOperations.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/60952ba8/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index ad55ea8..4a96d94 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -144,7 +144,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
if (endpoint instanceof FtpEndpoint) {
FtpEndpoint<?> ftpEndpoint = (FtpEndpoint<?>) endpoint;
if (ftpEndpoint.getSoTimeout() > 0) {
- log.trace("Using SoTimeout=" + ftpEndpoint.getSoTimeout());
+ log.trace("Using SoTimeout={}", ftpEndpoint.getSoTimeout());
try {
client.setSoTimeout(ftpEndpoint.getSoTimeout());
} catch (IOException e) {
@@ -157,10 +157,10 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
boolean login;
if (username != null) {
if (account != null) {
- log.trace("Attempting to login user: {} using password: {} and account: {}", new Object[]{username, configuration.getPassword(), account});
+ log.trace("Attempting to login user: {} using password: ******** and account: {}", new Object[]{username, account});
login = client.login(username, configuration.getPassword(), account);
} else {
- log.trace("Attempting to login user: {} using password: {}", username, configuration.getPassword());
+ log.trace("Attempting to login user: {} using password: ********", username);
login = client.login(username, configuration.getPassword());
}
} else {
[2/3] camel git commit: CAMEL-10869: Mask password in trace logging.
Posted by da...@apache.org.
CAMEL-10869: Mask password in trace logging.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc704cd2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc704cd2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc704cd2
Branch: refs/heads/camel-2.18.x
Commit: cc704cd2e2d874156f9e9fca8020be6841a16b0c
Parents: d953d3b
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 24 13:45:25 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 24 13:46:13 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/FtpOperations.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cc704cd2/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index f2447ff..c9f5b5d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -144,7 +144,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
if (endpoint instanceof FtpEndpoint) {
FtpEndpoint<?> ftpEndpoint = (FtpEndpoint<?>) endpoint;
if (ftpEndpoint.getSoTimeout() > 0) {
- log.trace("Using SoTimeout=" + ftpEndpoint.getSoTimeout());
+ log.trace("Using SoTimeout={}", ftpEndpoint.getSoTimeout());
try {
client.setSoTimeout(ftpEndpoint.getSoTimeout());
} catch (IOException e) {
@@ -157,10 +157,10 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
boolean login;
if (username != null) {
if (account != null) {
- log.trace("Attempting to login user: {} using password: {} and account: {}", new Object[]{username, configuration.getPassword(), account});
+ log.trace("Attempting to login user: {} using password: ******** and account: {}", new Object[]{username, account});
login = client.login(username, configuration.getPassword(), account);
} else {
- log.trace("Attempting to login user: {} using password: {}", username, configuration.getPassword());
+ log.trace("Attempting to login user: {} using password: ********", username);
login = client.login(username, configuration.getPassword());
}
} else {
[3/3] camel git commit: CAMEL-10869: Mask password in trace logging.
Posted by da...@apache.org.
CAMEL-10869: Mask password in trace logging.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/213a926d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/213a926d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/213a926d
Branch: refs/heads/camel-2.17.x
Commit: 213a926d87905ff9733c8bf30444de551b011ac6
Parents: 8dddc4f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 24 13:45:25 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 24 13:46:34 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/FtpOperations.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/213a926d/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index cfc72f7..c0397ee 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -144,7 +144,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
if (endpoint instanceof FtpEndpoint) {
FtpEndpoint<?> ftpEndpoint = (FtpEndpoint<?>) endpoint;
if (ftpEndpoint.getSoTimeout() > 0) {
- log.trace("Using SoTimeout=" + ftpEndpoint.getSoTimeout());
+ log.trace("Using SoTimeout={}", ftpEndpoint.getSoTimeout());
try {
client.setSoTimeout(ftpEndpoint.getSoTimeout());
} catch (IOException e) {
@@ -157,10 +157,10 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
boolean login;
if (username != null) {
if (account != null) {
- log.trace("Attempting to login user: {} using password: {} and account: {}", new Object[]{username, configuration.getPassword(), account});
+ log.trace("Attempting to login user: {} using password: ******** and account: {}", new Object[]{username, account});
login = client.login(username, configuration.getPassword(), account);
} else {
- log.trace("Attempting to login user: {} using password: {}", username, configuration.getPassword());
+ log.trace("Attempting to login user: {} using password: ********", username);
login = client.login(username, configuration.getPassword());
}
} else {