From 8b4ff91c22cd1b2dddcf43ee41f41cc30bf374a0 Mon Sep 17 00:00:00 2001 From: Tommy McNeely Date: Fri, 24 Feb 2023 09:49:47 -0700 Subject: [PATCH 1/3] feat: include tokenId in revoke errors --- artifactory.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artifactory.go b/artifactory.go index fb9d43c..099adc4 100644 --- a/artifactory.go +++ b/artifactory.go @@ -46,14 +46,14 @@ func (b *backend) revokeToken(config adminConfiguration, secret logical.Secret) if newAccessReq { resp, err = b.performArtifactoryDelete(config, "/access/api/v1/tokens/"+tokenId) if err != nil { - b.Backend.Logger().Warn("error deleting access token", "response", resp, "err", err) + b.Backend.Logger().Warn("error deleting access tokenID", tokenId, "response", resp, "err", err) return err } } else { resp, err = b.performArtifactoryPost(config, u.Path+"/api/security/token/revoke", values) if err != nil { - b.Backend.Logger().Warn("error deleting token", "response", resp, "err", err) + b.Backend.Logger().Warn("error deleting tokenID", tokenId, "response", resp, "err", err) return err } } @@ -62,7 +62,7 @@ func (b *backend) revokeToken(config adminConfiguration, secret logical.Secret) if resp.StatusCode != http.StatusOK { b.Backend.Logger().Warn("got non-200 status code", "statusCode", resp.StatusCode) - return fmt.Errorf("could not revoke token: HTTP response %v", resp.StatusCode) + return fmt.Errorf("could not revoke tokenID: %v - HTTP response %v", tokenId, resp.StatusCode) } return nil From 97f26f28a31448a6c5a60957d5831aca4d40c706 Mon Sep 17 00:00:00 2001 From: Tommy McNeely Date: Fri, 24 Feb 2023 13:20:05 -0700 Subject: [PATCH 2/3] fix: check for http.StatusCode >= 400 --- artifactory.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artifactory.go b/artifactory.go index 099adc4..f3c10ae 100644 --- a/artifactory.go +++ b/artifactory.go @@ -60,8 +60,8 @@ func (b *backend) revokeToken(config adminConfiguration, secret logical.Secret) //noinspection GoUnhandledErrorResult defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - b.Backend.Logger().Warn("got non-200 status code", "statusCode", resp.StatusCode) + if resp.StatusCode >= http.StatusBadRequest { + b.Backend.Logger().Warn("revokeToken got bad http status code", "statusCode", resp.StatusCode) return fmt.Errorf("could not revoke tokenID: %v - HTTP response %v", tokenId, resp.StatusCode) } From fe911f7fe006730ecc4b4d5feb577365007ea33f Mon Sep 17 00:00:00 2001 From: Tommy McNeely Date: Fri, 24 Feb 2023 13:38:34 -0700 Subject: [PATCH 3/3] fix: log kv pairs --- artifactory.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artifactory.go b/artifactory.go index f3c10ae..4b53a04 100644 --- a/artifactory.go +++ b/artifactory.go @@ -46,14 +46,14 @@ func (b *backend) revokeToken(config adminConfiguration, secret logical.Secret) if newAccessReq { resp, err = b.performArtifactoryDelete(config, "/access/api/v1/tokens/"+tokenId) if err != nil { - b.Backend.Logger().Warn("error deleting access tokenID", tokenId, "response", resp, "err", err) + b.Backend.Logger().Warn("error deleting access token", "tokenId", tokenId, "response", resp, "err", err) return err } } else { resp, err = b.performArtifactoryPost(config, u.Path+"/api/security/token/revoke", values) if err != nil { - b.Backend.Logger().Warn("error deleting tokenID", tokenId, "response", resp, "err", err) + b.Backend.Logger().Warn("error deleting token", "tokenId", tokenId, "response", resp, "err", err) return err } }