Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3679 hide certificate, key and chain ca in AS3 response #3714

Merged
merged 6 commits into from
Jan 15, 2025
Merged

#3679 hide certificate, key and chain ca in AS3 response #3714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46aef69
#3679 hide certificate, key and chain ca in AS3 response
vidyasagar-m Jan 9, 2025
51fcbd5
fix for hiding certificate, CA Chain and private keys from as3 response
vidyasagar-m Jan 10, 2025
e557ef7
update release notes
vidyasagar-m Jan 15, 2025
6afbc0a
fix release notes
vidyasagar-m Jan 15, 2025
6a3f798
fix ut
vidyasagar-m Jan 15, 2025
f00c31d
Merge branch '2.19-stable' into issues/3679
vidyasagar-m Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/RELEASE-NOTES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Added Functionality

Bug Fixes
````````````
* `Issue 3679 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/3679>`_: Certificate, CA chain, and private key shown in debug logs

2.19.0
-------------
Expand Down
11 changes: 8 additions & 3 deletions pkg/agent/as3/postManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,13 @@ func (postMgr *PostManager) getBigipRegKeyURL() string {
}

func (postMgr *PostManager) logAS3Response(responseMap map[string]interface{}) {
// Avoid modifying the original response
responseMapCopy := make(map[string]interface{})
for key, value := range responseMap {
responseMapCopy[key] = value
}
// removing the certificates/privateKey from response log
if declaration, ok := (responseMap["declaration"]).([]interface{}); ok {
if declaration, ok := (responseMapCopy["declaration"]).(map[string]interface{}); ok {
for _, value := range declaration {
if tenantMap, ok := value.(map[string]interface{}); ok {
for _, value2 := range tenantMap {
Expand All @@ -425,9 +430,9 @@ func (postMgr *PostManager) logAS3Response(responseMap map[string]interface{}) {
log.Errorf("[AS3] error while reading declaration from AS3 response: %v\n", err)
return
}
responseMap["declaration"] = as3Declaration(decl)
responseMapCopy["declaration"] = as3Declaration(decl)
}
log.Debugf("[AS3] Raw response from Big-IP: %v ", responseMap)
log.Debugf("[AS3] Raw response from Big-IP: %v ", responseMapCopy)
}

func (postMgr *PostManager) logAS3Request(cfg string) {
Expand Down
11 changes: 8 additions & 3 deletions pkg/controller/postManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,13 @@ func (postMgr *PostManager) getBigipRegKeyURL() string {
}

func (postMgr *PostManager) logAS3Response(responseMap map[string]interface{}) {
// Avoid modifying the original response
responseMapCopy := make(map[string]interface{})
for key, value := range responseMap {
responseMapCopy[key] = value
}
// removing the certificates/privateKey from response log
if declaration, ok := (responseMap["declaration"]).([]interface{}); ok {
if declaration, ok := (responseMapCopy["declaration"]).(map[string]interface{}); ok {
for _, value := range declaration {
if tenantMap, ok := value.(map[string]interface{}); ok {
for _, value2 := range tenantMap {
Expand All @@ -661,9 +666,9 @@ func (postMgr *PostManager) logAS3Response(responseMap map[string]interface{}) {
log.Errorf("[AS3]%v error while reading declaration from AS3 response: %v\n", postMgr.postManagerPrefix, err)
return
}
responseMap["declaration"] = as3Declaration(decl)
responseMapCopy["declaration"] = as3Declaration(decl)
}
log.Debugf("[AS3]%v Raw response from Big-IP: %v ", postMgr.postManagerPrefix, responseMap)
log.Debugf("[AS3]%v Raw response from Big-IP: %v ", postMgr.postManagerPrefix, responseMapCopy)
}

func (postMgr *PostManager) logAS3Request(cfg string) {
Expand Down
Loading