Skip to content

Fix 401 Unauthorized on log push after token refresh #269

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

Open
cchristous wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix 401 Unauthorized on log push after token refresh #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions pkg/eventlogger/httpbackend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,16 @@ func (l *HTTPBackend) newRequest() error {
}

log.Infof("Pushing next batch of logs with %d log events...", (nextStartFrom - l.startFrom))

// Store buffer contents so we can retry after token refresh
bufferBytes := buffer.Bytes()

return l.sendLogRequest(bufferBytes, nextStartFrom, false)
}

func (l *HTTPBackend) sendLogRequest(bufferBytes []byte, nextStartFrom int, isRetry bool) error {
url := fmt.Sprintf("%s?start_from=%d", l.config.URL, l.startFrom)
request, err := http.NewRequest("POST", url, buffer)
request, err := http.NewRequest("POST", url, bytes.NewReader(bufferBytes))
if err != nil {
return err
}
Expand Down Expand Up @@ -206,16 +214,21 @@ func (l *HTTPBackend) newRequest() error {
return errors.New("no more space available for logs - stopping")

// The token issued for the agent expired.
// Try to refresh the token and try again.
// Here, we only update the token, and we let the caller do the retrying.
// Try to refresh the token and retry immediately.
case http.StatusUnauthorized:
// Only retry once to avoid infinite loops
if isRetry {
return fmt.Errorf("request to %s failed after token refresh: %s", url, response.Status)
}

newToken, err := l.config.RefreshTokenFn()
if err != nil {
return err
}

l.config.Token = newToken
return fmt.Errorf("request to %s failed: %s", url, response.Status)
log.Infof("Retrying log push with refreshed token...")
return l.sendLogRequest(bufferBytes, nextStartFrom, true)

// something else went wrong
default:
Expand Down