Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-02 15:27:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1962 from ywk253100/170407_adminserver_log_leak

Browse Source 
Fix logs leak
This commit is contained in:
Daniel Jiang 2017-04-07 19:19:17 +08:00 committed by GitHub
commit 49377c5bc8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/adminserver/systemcfg/store/encrypt/driver.go
View File

@ -62,7 +62,7 @@ func (c *cfgStore) Read() (map[string]interface{}, error) {
str, ok := v.(string) str, ok := v.(string)
if !ok { if !ok {
log.Warningf("%v is not string, skip decrypt", v) log.Warningf("the value of %s is not string, skip decrypt", key)
continue continue
} }

11
src/jobservice/api/replication.go
View File

@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httputil"
"strconv" "strconv"
"github.com/vmware/harbor/src/common/api" "github.com/vmware/harbor/src/common/api"
@ -203,9 +202,13 @@ func getRepoList(projectID int64) ([]string, error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
dump, _ := httputil.DumpResponse(resp, true) b, err := ioutil.ReadAll(resp.Body)
log.Debugf("response: %q", dump) if err != nil {
return repositories, fmt.Errorf("Unexpected status code when getting repository list: %d", resp.StatusCode) 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) body, err := ioutil.ReadAll(resp.Body)