From 7a2b1f8c19ef100683a02c4988027af030c2c1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Mon, 2 Jun 2025 14:40:10 -0300 Subject: [PATCH 1/5] fix error --- oauthproxy.go | 10 +++------- pics_oauthproxy.go | 12 ++++++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/oauthproxy.go b/oauthproxy.go index 09fd2e2a..7b0c9165 100644 --- a/oauthproxy.go +++ b/oauthproxy.go @@ -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 := PicsRevokeAcessToken(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 == "" { diff --git a/pics_oauthproxy.go b/pics_oauthproxy.go index 9d9d9b78..e448d251 100644 --- a/pics_oauthproxy.go +++ b/pics_oauthproxy.go @@ -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 PicsRevokeAcessToken(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"). @@ -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: %v", resp.Error()) + } + + return nil } func getUserID(introspectClaims string) (string, error) { From 59127d43b714f46920473e565d00763f7b88a84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Mon, 2 Jun 2025 14:42:50 -0300 Subject: [PATCH 2/5] t --- pics_oauthproxy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pics_oauthproxy.go b/pics_oauthproxy.go index e448d251..74aef2b8 100644 --- a/pics_oauthproxy.go +++ b/pics_oauthproxy.go @@ -29,7 +29,7 @@ func PicsSignOutAllSessions(backendLogoutAllSessionsURL string, introspectClaims Do() if resp.Error() != nil { - return nil, fmt.Errorf("error logging out from IAM: %v", resp.Error()) + return nil, fmt.Errorf("errr logging out from IAM: %v", resp.Error()) } return resp, err From 58389a741ab33bdcb3e1689f1ca6f105fe35df64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Mon, 2 Jun 2025 14:42:57 -0300 Subject: [PATCH 3/5] t --- pics_oauthproxy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pics_oauthproxy.go b/pics_oauthproxy.go index 74aef2b8..e448d251 100644 --- a/pics_oauthproxy.go +++ b/pics_oauthproxy.go @@ -29,7 +29,7 @@ func PicsSignOutAllSessions(backendLogoutAllSessionsURL string, introspectClaims Do() if resp.Error() != nil { - return nil, fmt.Errorf("errr logging out from IAM: %v", resp.Error()) + return nil, fmt.Errorf("error logging out from IAM: %v", resp.Error()) } return resp, err From f6f1f4353c0b3b96693b3b934b58934ac8c41959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Mon, 2 Jun 2025 14:55:00 -0300 Subject: [PATCH 4/5] Update pics_oauthproxy.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- pics_oauthproxy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pics_oauthproxy.go b/pics_oauthproxy.go index e448d251..5f0fe26b 100644 --- a/pics_oauthproxy.go +++ b/pics_oauthproxy.go @@ -53,7 +53,7 @@ func PicsRevokeAcessToken(backendRevokeURL string, accessToken string, clientID } if resp.StatusCode() != 200 { - return fmt.Errorf("error revoking access token: %v", resp.Error()) + return fmt.Errorf("error revoking access token: status code %d, error: %v", resp.StatusCode(), resp.Error()) } return nil From f065966ec559aefdf52466655c6a4e3c6f000db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Mon, 2 Jun 2025 14:56:07 -0300 Subject: [PATCH 5/5] fix typo --- oauthproxy.go | 2 +- pics_oauthproxy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oauthproxy.go b/oauthproxy.go index 7b0c9165..00ac1d49 100644 --- a/oauthproxy.go +++ b/oauthproxy.go @@ -815,7 +815,7 @@ 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 != "" { - 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) } else { diff --git a/pics_oauthproxy.go b/pics_oauthproxy.go index e448d251..91e8cfa9 100644 --- a/pics_oauthproxy.go +++ b/pics_oauthproxy.go @@ -35,7 +35,7 @@ func PicsSignOutAllSessions(backendLogoutAllSessionsURL string, introspectClaims return resp, err } -func PicsRevokeAcessToken(backendRevokeURL string, accessToken string, clientID string, clientSecret string) (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