You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/10 15:43:43 UTC
[1/2] git commit: updated refs/heads/master to e1cc673
Repository: cloudstack
Updated Branches:
refs/heads/master 62f57d235 -> e1cc673ea
CLOUDSTACK-9023 filtering privatekey info from logging
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5803308
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5803308
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5803308
Branch: refs/heads/master
Commit: a580330864780582ec33d723c7da044d935d4f22
Parents: 7e42978
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu Nov 5 14:23:11 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Nov 10 12:08:01 2015 +0100
----------------------------------------------------------------------
.../api/command/admin/resource/UploadCustomCertificateCmd.java | 2 +-
utils/src/main/java/com/cloud/utils/StringUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5803308/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
index e11876a..e8d6cc5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
@@ -32,7 +32,7 @@ import com.cloud.user.Account;
@APICommand(name = "uploadCustomCertificate",
responseObject = CustomCertificateResponse.class,
description = "Uploads a custom certificate for the console proxy VMs to use for SSL. Can be used to upload a single certificate signed by a known CA. Can also be used, through multiple calls, to upload a chain of certificates from CA to the custom certificate itself.",
- requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class UploadCustomCertificateCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UploadCustomCertificateCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5803308/utils/src/main/java/com/cloud/utils/StringUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/StringUtils.java b/utils/src/main/java/com/cloud/utils/StringUtils.java
index c598be8..71cebe1 100644
--- a/utils/src/main/java/com/cloud/utils/StringUtils.java
+++ b/utils/src/main/java/com/cloud/utils/StringUtils.java
@@ -186,7 +186,7 @@ public class StringUtils {
private static final Pattern REGEX_PASSWORD_QUERYSTRING = Pattern.compile("(&|%26)?[^(&|%26)]*((p|P)assword|accesskey|secretkey)(=|%3D).*?(?=(%26|[&'\"]|$))");
// removes a password/accesskey/ property from a response json object
- private static final Pattern REGEX_PASSWORD_JSON = Pattern.compile("\"((p|P)assword|accesskey|secretkey)\":\\s?\".*?\",?");
+ private static final Pattern REGEX_PASSWORD_JSON = Pattern.compile("\"((p|P)assword|privatekey|accesskey|secretkey)\":\\s?\".*?\",?");
private static final Pattern REGEX_PASSWORD_DETAILS = Pattern.compile("(&|%26)?details(\\[|%5B)\\d*(\\]|%5D)\\.key(=|%3D)((p|P)assword|accesskey|secretkey)(?=(%26|[&'\"]))");
[2/2] git commit: updated refs/heads/master to e1cc673
Posted by re...@apache.org.
Merge pull request #1055 from DaanHoogland/CLOUDSTACK-9023
CLOUDSTACK-9023 filtering privatekey info from loggingtested off-line but rebased afterwards!
* pr/1055:
CLOUDSTACK-9023 filtering privatekey info from logging
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1cc673e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1cc673e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1cc673e
Branch: refs/heads/master
Commit: e1cc673ead3770ceff2f33a7480f4e02aa15a338
Parents: 62f57d2 a580330
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Nov 10 14:57:02 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Nov 10 14:57:02 2015 +0100
----------------------------------------------------------------------
.../api/command/admin/resource/UploadCustomCertificateCmd.java | 2 +-
utils/src/main/java/com/cloud/utils/StringUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------