From ff9a64c631fe006e1f0e94cb915bdc1c53eeec2f Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 7 Apr 2017 17:58:57 +0800 Subject: [PATCH 1/2] donot log sensitive message to logs, fix #1949 --- src/adminserver/systemcfg/store/encrypt/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adminserver/systemcfg/store/encrypt/driver.go b/src/adminserver/systemcfg/store/encrypt/driver.go index 79216586f..24638d620 100644 --- a/src/adminserver/systemcfg/store/encrypt/driver.go +++ b/src/adminserver/systemcfg/store/encrypt/driver.go @@ -62,7 +62,7 @@ func (c *cfgStore) Read() (map[string]interface{}, error) { str, ok := v.(string) if !ok { - log.Warningf("%v is not string, skip decrypt", v) + log.Warningf("the value of %s is not string, skip decrypt", key) continue } From cd86c50e29a61c77a68133e5245be0059b044fd0 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 7 Apr 2017 18:14:22 +0800 Subject: [PATCH 2/2] donot dump response to log, fix #1950 --- src/jobservice/api/replication.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/jobservice/api/replication.go b/src/jobservice/api/replication.go index bfe7dd5c5..26c7dd159 100644 --- a/src/jobservice/api/replication.go +++ b/src/jobservice/api/replication.go @@ -20,7 +20,6 @@ import ( "fmt" "io/ioutil" "net/http" - "net/http/httputil" "strconv" "github.com/vmware/harbor/src/common/api" @@ -203,9 +202,13 @@ func getRepoList(projectID int64) ([]string, error) { defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - dump, _ := httputil.DumpResponse(resp, true) - log.Debugf("response: %q", dump) - return repositories, fmt.Errorf("Unexpected status code when getting repository list: %d", resp.StatusCode) + b, err := ioutil.ReadAll(resp.Body) + if err != nil { + return repositories, err + } + return repositories, + fmt.Errorf("failed to get repo list, response code: %d, error: %s", + resp.StatusCode, string(b)) } body, err := ioutil.ReadAll(resp.Body)