Merge pull request #226 from jfrog/GH-225-fix-concurrency-issue

Add read/write mutex for refreshing access token
jfrog · Nov 21, 2024 · e031c3a · e031c3a
2 parents 3ccc3ad + cc0353d
commit e031c3a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.8.2 (November 21, 2024). Tested on Artifactory 7.98.8 with Vault v1.18.1 and OpenBao v2.0.0
+
+BUG FIXES:
+
+* Fix concurrency error when refreshing user token. Issue: [#225](https://github.com/jfrog/artifactory-secrets-plugin/issues/225) PR: [#226](https://github.com/jfrog/artifactory-secrets-plugin/pull/226)
+
 ## 1.8.1 (November 8, 2024). Tested on Artifactory 7.98.8 with Vault v1.18.1 and OpenBao v2.0.0
 
 BUG FIXES:

diff --git a/artifactory.go b/artifactory.go
@@ -216,7 +216,6 @@ func (b *backend) CreateToken(config baseConfiguration, role artifactoryRole) (*
 		return nil, createErr
 	}
 
-	//noinspection GoUnhandledErrorResult
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {

diff --git a/path_config_user_token.go b/path_config_user_token.go
@@ -94,6 +94,9 @@ type userTokenConfiguration struct {
 }
 
 func (c *userTokenConfiguration) RefreshAccessToken(ctx context.Context, req *logical.Request, username string, b *backend, adminBaseConfig baseConfiguration) error {
+	b.configMutex.Lock()
+	defer b.configMutex.Unlock()
+
 	logger := b.Logger().With("func", "RefreshAccessToken")
 
 	if c.RefreshToken == "" {