Skip to content

Commit 25b3a13

Browse files
committed
fix: docker hub creds might leak in pod events
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent c7a4f0b commit 25b3a13

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

pkg/tracker/event/informer.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,22 @@ func (e *EventInformer) handleInitialEvents(inform *informer.Informer, involvedU
169169

170170
// handleEvent sends a message to Messages channel for all events and a message to Failures channel for Failed events
171171
func (e *EventInformer) handleEvent(event *corev1.Event) {
172-
uid := event.UID
173-
msg := fmt.Sprintf("%s: %s", event.Reason, event.Message)
174-
175-
if _, ok := e.initialEventUids[uid]; ok {
176-
delete(e.initialEventUids, uid)
172+
if _, ok := e.initialEventUids[event.UID]; ok {
173+
delete(e.initialEventUids, event.UID)
177174
return
178175
}
179176

177+
// Docker Hub leaks username and token, so we sanitize the message
178+
if strings.Contains(event.Message, "You have reached your pull rate limit as") {
179+
regex := regexp.MustCompile(`(.*You have reached your pull rate limit) as .*`)
180+
sub := regex.FindStringSubmatch(event.Message)
181+
if sub != nil {
182+
event.Message = sub[1]
183+
}
184+
}
185+
186+
msg := fmt.Sprintf("%s: %s", event.Reason, event.Message)
187+
180188
if debug.Debug() {
181189
fmt.Printf(" %s got normal event: %s\n", e.FullResourceName, msg)
182190
}

0 commit comments

Comments
 (0)