Skip to content

Fix revoke access token error handling #67

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

Merged
Anderson Valério (andersonvcv) merged 6 commits into from
Jun 2, 2025
Merged

Fix revoke access token error handling #67

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
7a2b1f8
fix error
andersonvcv Jun 2, 2025
59127d4
t
andersonvcv Jun 2, 2025
58389a7
t
andersonvcv Jun 2, 2025
f6f1f43
Update pics_oauthproxy.go
andersonvcv Jun 2, 2025
f065966
fix typo
andersonvcv Jun 2, 2025
ce59904
Merge branch 'anderson/fix-revoke-error' of https://github.com/philip…
andersonvcv Jun 2, 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
10 changes: 3 additions & 7 deletions oauthproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,16 +815,12 @@ func (p *OAuthProxy) backendLogout(rw http.ResponseWriter, req *http.Request, si
p.picsAuditClient.CreateSuccessfulLogoutAuditEntry(session, req.RequestURI, req.Header.Get("edisp-org-id"))
} else {
if providerData.BackendRevokeAccessTokenURL != "" {
resp, err := PicsRevokeAcessToken(providerData.BackendRevokeAccessTokenURL, session.AccessToken, providerData.ClientID, providerData.ClientSecret)
err := PicsRevokeAccessToken(providerData.BackendRevokeAccessTokenURL, session.AccessToken, providerData.ClientID, providerData.ClientSecret)
if err != nil {
logger.Errorf("error while calling backend revoke access token: %v", err)
return
} else {
p.picsAuditClient.CreateSuccessfulRevokeAccessTokenAuditEntry(session, req.RequestURI, req.Header.Get("edisp-org-id"))
}

if resp.StatusCode() != 200 {
logger.Errorf("error while calling backend revoke acess token url, returned error code %v", resp.StatusCode())
}
p.picsAuditClient.CreateSuccessfulRevokeAccessTokenAuditEntry(session, req.RequestURI, req.Header.Get("edisp-org-id"))
}

if providerData.BackendLogoutURL == "" {
Expand Down
12 changes: 8 additions & 4 deletions pics_oauthproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ func PicsSignOutAllSessions(backendLogoutAllSessionsURL string, introspectClaims
return resp, err
}

func PicsRevokeAcessToken(backendRevokeURL string, accessToken string, clientID string, clientSecret string) (resp requests.Result, err error) {
func PicsRevokeAccessToken(backendRevokeURL string, accessToken string, clientID string, clientSecret string) (err error) {
authHeader := "Basic " + base64.StdEncoding.EncodeToString([]byte(clientID+":"+clientSecret))
body := "token=" + accessToken

resp = requests.New(backendRevokeURL).
resp := requests.New(backendRevokeURL).
WithMethod("POST").
SetHeader("Authorization", authHeader).
SetHeader("api-version", "2").
Expand All @@ -49,10 +49,14 @@ func PicsRevokeAcessToken(backendRevokeURL string, accessToken string, clientID
Do()

if resp.Error() != nil {
return nil, fmt.Errorf("error revoking access token: %v", resp.Error())
return fmt.Errorf("error revoking access token: %v", resp.Error())
}

return resp, nil
if resp.StatusCode() != 200 {
return fmt.Errorf("error revoking access token: status code %d, error: %v", resp.StatusCode(), resp.Error())
}

return nil
}

func getUserID(introspectClaims string) (string, error) {
Expand Down
Loading