From d31634f4c7797b1d98cd3dba1744c9f54c3402f7 Mon Sep 17 00:00:00 2001 From: Jay Sabale Date: Wed, 30 Nov 2022 17:19:45 +0530 Subject: [PATCH 1/4] Regex Fix Added --- go/session/avisession.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/go/session/avisession.go b/go/session/avisession.go index d6576bb671..f9c96f5d0d 100644 --- a/go/session/avisession.go +++ b/go/session/avisession.go @@ -11,12 +11,14 @@ import ( "fmt" "io" "io/ioutil" + "log" "math" "mime/multipart" "net/http" "net/http/httputil" "os" "reflect" + "regexp" "strings" "sync" "time" @@ -1026,7 +1028,11 @@ type AviCollectionResult struct { func debug(data []byte, err error) { if err == nil { - glog.Infof("%s\n\n", data) + dataString := string(data) + re := regexp.MustCompile(`"password":"([^\s]+?)","username":"([^\s]+?)"`) + updatedDataString := re.ReplaceAllString(dataString, "{\"password\":\"\",\"username\":\"\"}") + log.Println("data = ", updatedDataString) + glog.Infof("%s\n\n", updatedDataString) } else { glog.Errorf("%s\n\n", err) } From 8add97ca2b30ea9632d2439e8caf320cd155972f Mon Sep 17 00:00:00 2001 From: Jay Sabale Date: Wed, 30 Nov 2022 17:23:50 +0530 Subject: [PATCH 2/4] Made minor fixes --- go/session/avisession.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/go/session/avisession.go b/go/session/avisession.go index f9c96f5d0d..b8c8fec131 100644 --- a/go/session/avisession.go +++ b/go/session/avisession.go @@ -11,7 +11,6 @@ import ( "fmt" "io" "io/ioutil" - "log" "math" "mime/multipart" "net/http" @@ -1031,7 +1030,6 @@ func debug(data []byte, err error) { dataString := string(data) re := regexp.MustCompile(`"password":"([^\s]+?)","username":"([^\s]+?)"`) updatedDataString := re.ReplaceAllString(dataString, "{\"password\":\"\",\"username\":\"\"}") - log.Println("data = ", updatedDataString) glog.Infof("%s\n\n", updatedDataString) } else { glog.Errorf("%s\n\n", err) From a5d93b5903dce91ebf8e552f8171ff4982971be9 Mon Sep 17 00:00:00 2001 From: Jay Sabale Date: Sat, 3 Dec 2022 22:15:08 +0530 Subject: [PATCH 3/4] AV-161196 Logging-Sensitive-Fields-Stopped --- go/session/avisession.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/go/session/avisession.go b/go/session/avisession.go index b8c8fec131..d5a3105a40 100644 --- a/go/session/avisession.go +++ b/go/session/avisession.go @@ -1025,12 +1025,17 @@ type AviCollectionResult struct { Next string } +func removeSensitiveFields(data []byte) []byte { + dataString := string(data) + re := regexp.MustCompile(`"password":"([^\s]+?)","username":"([^\s]+?)"`) + updatedDataString := re.ReplaceAllString(dataString, "") + return []byte(updatedDataString) +} + func debug(data []byte, err error) { if err == nil { - dataString := string(data) - re := regexp.MustCompile(`"password":"([^\s]+?)","username":"([^\s]+?)"`) - updatedDataString := re.ReplaceAllString(dataString, "{\"password\":\"\",\"username\":\"\"}") - glog.Infof("%s\n\n", updatedDataString) + data = removeSensitiveFields(data) + glog.Infof("%s\n\n", data) } else { glog.Errorf("%s\n\n", err) } @@ -1041,7 +1046,8 @@ func debug(data []byte, err error) { func (avisess *AviSession) CheckControllerStatus() (bool, *http.Response, error) { url := avisess.prefix + "/api/cluster/status" var isControllerUp bool - for round := 0; round < avisess.ctrlStatusCheckRetryCount; round++ { + // for round := 0; round < avisess.ctrlStatusCheckRetryCount; round++ { + for round := 0; round < 2; round++ { checkReq, err := http.NewRequest("GET", url, nil) if err != nil { glog.Errorf("CheckControllerStatus Error %v while generating http request.", err) From 484e2dd0989f7798fb3e7d313b61ef923427c142 Mon Sep 17 00:00:00 2001 From: Jay Sabale Date: Sat, 3 Dec 2022 22:17:28 +0530 Subject: [PATCH 4/4] AV-161196 Minor-Bugs-Fixed --- go/session/avisession.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go/session/avisession.go b/go/session/avisession.go index d5a3105a40..50aff3505d 100644 --- a/go/session/avisession.go +++ b/go/session/avisession.go @@ -1046,8 +1046,7 @@ func debug(data []byte, err error) { func (avisess *AviSession) CheckControllerStatus() (bool, *http.Response, error) { url := avisess.prefix + "/api/cluster/status" var isControllerUp bool - // for round := 0; round < avisess.ctrlStatusCheckRetryCount; round++ { - for round := 0; round < 2; round++ { + for round := 0; round < avisess.ctrlStatusCheckRetryCount; round++ { checkReq, err := http.NewRequest("GET", url, nil) if err != nil { glog.Errorf("CheckControllerStatus Error %v while generating http request.", err)