opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-16 06:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(baremetal): mask idrac session cookie and token in debug logs (#25781)

Browse Source
This commit is contained in:
aragossa
2026-10-15 11:21:08 +08:00
committed by GitHub
parent d09de8d4ae
commit 71f75d3076
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/redfish/bmconsole/idrac.go
+4 -3
View File
@@ -26,6 +26,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/httputils"
"yunion.io/x/pkg/utils"
"yunion.io/x/onecloud/pkg/httperrors"
)
@@ -78,7 +79,8 @@ func (r *SBMCConsole) GetIdrac7ConsoleJNLP(ctx context.Context, sku, model strin
if err != nil {
return "", errors.Wrap(err, "r.FormPost Login")
}
log.Debugf("Header: %s %s", hdr, loginResp)
// the header carries the session cookie and the body the ST1 token, do not print them verbatim
log.Debugf("Header: %d Set-Cookie, loginResp %d bytes", len(hdr["Set-Cookie"]), len(loginResp))
if setCookies, ok := hdr["Set-Cookie"]; ok {
for _, cookieHdr := range setCookies {
parts := strings.Split(cookieHdr, ";")
@@ -104,12 +106,11 @@ func (r *SBMCConsole) GetIdrac7ConsoleJNLP(ctx context.Context, sku, model strin
tokenPattern := regexp.MustCompile(`ST1=(\w+),ST2=`)
matched = tokenPattern.FindAllStringSubmatch(indexUrlStr, -1)
log.Debugf("%s", matched)
token := ""
if len(matched) > 0 && len(matched[0]) > 1 {
token = matched[0][1]
}
log.Debugf("token: %s", token)
log.Debugf("token: %s", utils.TruncateString(token, 16))
cookies["tokenvalue"] = token
cookies["batteriesIcon"] = "status_ok"
cookies["fansIcon"] = "status_ok"
pkg/util/redfish/bmconsole/idrac6.go
+5 -4
View File
@@ -26,6 +26,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/httputils"
"yunion.io/x/pkg/utils"
"yunion.io/x/onecloud/pkg/httperrors"
)
@@ -37,7 +38,8 @@ func (r *SBMCConsole) GetIdrac6ConsoleJNLP(ctx context.Context, sku, model strin
if err != nil {
return "", errors.Wrap(err, "r.Get start.html")
}
log.Debugf("start.html hdr %s", hdr)
// the header carries the session cookie, do not print it verbatim
log.Debugf("start.html hdr %d Set-Cookie", len(hdr["Set-Cookie"]))
if setCookies, ok := hdr["Set-Cookie"]; ok {
for _, cookieHdr := range setCookies {
parts := strings.Split(cookieHdr, ";")
@@ -64,7 +66,7 @@ func (r *SBMCConsole) GetIdrac6ConsoleJNLP(ctx context.Context, sku, model strin
if err != nil {
return "", errors.Wrap(err, "r.FormPost Login")
}
log.Debugf("LoginResp: %s", loginResp)
log.Debugf("LoginResp: %d bytes", len(loginResp))
forwardUrlPattern := regexp.MustCompile(`<forwardUrl>(.*)</forwardUrl>`)
matched := forwardUrlPattern.FindAllStringSubmatch(string(loginResp), -1)
indexUrlStr := ""
@@ -77,12 +79,11 @@ func (r *SBMCConsole) GetIdrac6ConsoleJNLP(ctx context.Context, sku, model strin
tokenPattern := regexp.MustCompile(`ST1=(\w+),ST2=`)
matched = tokenPattern.FindAllStringSubmatch(indexUrlStr, -1)
log.Debugf("%s", matched)
token := ""
if len(matched) > 0 && len(matched[0]) > 1 {
token = matched[0][1]
}
log.Debugf("token: %s", token)
log.Debugf("token: %s", utils.TruncateString(token, 16))
cookies["batteriesIcon"] = "status_normal"
cookies["fansIcon"] = "status_normal"