Skip to content

Commit

Permalink
Merge pull request #189 from jfrog/make-access-token-optional
Browse files Browse the repository at this point in the history
Make 'access_token' optional for 'config/admin' path
  • Loading branch information
alexhung authored May 28, 2024
2 parents 43ee4b4 + 8369823 commit ac04491
Show file tree
Hide file tree
Showing 14 changed files with 266 additions and 150 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
## 1.6.0 (April 19, 2023)
## 1.7.0 (May 29, 2024)

IMPROVEMENTS:

* Make `access_token` field to `config/admin` optional for path. This allows the plugin to be configured without requiring an admin access token even if the plugin is used only to generate user token using identity token with `config/user_token` path. PR: [#189](https://github.com/jfrog/artifactory-secrets-plugin/pull/189)

## 1.6.0 (April 19, 2024)

IMPROVEMENTS:

* Add `force_revocable` field to `config/admin`, `config/user_token`, and `config/user_token/<username>` paths. Issue: [#174](https://github.com/jfrog/artifactory-secrets-plugin/issues/174) PR: [#147](https://github.com/jfrog/artifactory-secrets-plugin/pull/147), [#175](https://github.com/jfrog/artifactory-secrets-plugin/pull/175)

## 1.5.0 (March 13, 2023)
## 1.5.0 (March 13, 2024)

IMPROVEMENTS:

* Add `allow_scope_override` field to `config/admin` path. This allows override of `scope` field when generating new admin scope token using `artifactory/roles/<name>` path. Issue: [#134](https://github.com/jfrog/artifactory-secrets-plugin/issues/134) PR: [#147](https://github.com/jfrog/artifactory-secrets-plugin/pull/147), [#163](https://github.com/jfrog/artifactory-secrets-plugin/pull/163)

## 1.4.0 (March 11, 2023)
## 1.4.0 (March 11, 2024)

IMPROVEMENTS:

Expand All @@ -20,7 +26,7 @@ BUG FIXES:

* Fix `default_ttl` and `max_ttl` for `config/user_token` path fall back logic. Issue: [#159](https://github.com/jfrog/artifactory-secrets-plugin/issues/159) PR: [#162](https://github.com/jfrog/artifactory-secrets-plugin/pull/162)

## 1.3.0 (Feburary 27, 2023)
## 1.3.0 (Feburary 27, 2024)

IMPROVEMENTS:

Expand All @@ -37,7 +43,7 @@ BUG FIXES:

PR: [155](https://github.com/jfrog/vault-plugin-secrets-artifactory/pull/155)

## 1.2.0 (January 10, 2023)
## 1.2.0 (January 10, 2024)

IMPROVEMENTS:

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ No renewals or new tokens will be issued if the backend configuration (config/ad
#### Parameters

* `url` (string) - Address of the Artifactory instance, e.g. https://my.jfrog.io
* `access_token` (stirng) - Administrator token to access Artifactory
* `access_token` (string) - Optional. Administrator token to access Artifactory
* `username_template` (string) - Optional. Vault Username Template for dynamically generating usernames.
* `use_expiring_tokens` (boolean) - Optional. If Artifactory version >= 7.50.3, set `expires_in` to `max_ttl` (admin token) or `ttl` (user token) and `force_revocable = true`. Default to `false`.
* `force_revocable` (boolean) - Optional. When set to true, we will add the `force_revocable` flag to the token's extension. In addition, a new configuration has been added that sets the default for setting the `force_revocable` default when creating a new token - the default of this configuration will be `false` to ensure that the Circle of Trust remains in place.
Expand Down Expand Up @@ -509,7 +509,7 @@ Configures default values for the `user_token/:user-name` path. The optional `us

#### Parameters

* `access_token` (stirng) - Optional. User identity token to access Artifactory. If `username` is not set then this token will be used for *all* users.
* `access_token` (string) - Optional. User identity token to access Artifactory. If `username` is not set then this token will be used for *all* users.
* `refresh_token` (string) - Optional. Refresh token for the user access token. If `username` is not set then this token will be used for *all* users.
* `audience` (string) - Optional. See the JFrog Platform REST documentation on [Create Token](https://jfrog.com/help/r/jfrog-rest-apis/create-token) for a full and up to date description. Service ID must begin with valid JFrog service type. Options: jfrt, jfxr, jfpip, jfds, jfmc, jfac, jfevt, jfmd, jfcon, or *. For instructions to retrieve the Artifactory Service ID see this [documentation](https://jfrog.com/help/r/jfrog-rest-apis/get-service-id)
* `refreshable` (boolean) - Optional. A refreshable access token gets replaced by a new access token, which is not what a consumer of tokens from this backend would be expecting; instead they'd likely just request a new token periodically. Set this to `true` only if your usage requires this. See the JFrog Platform documentation on [Generating Refreshable Tokens](https://jfrog.com/help/r/jfrog-platform-administration-documentation/generating-refreshable-tokens) for a full and up to date description. Defaults to `false`.
Expand Down Expand Up @@ -552,7 +552,7 @@ vault delete artifactory/config/user_token/myuser

#### Parameters

* `grant_type` (stirng) - Optional. Defaults to `client_credentials` when creating the access token. You likely don't need to change this.
* `grant_type` (string) - Optional. Defaults to `client_credentials` when creating the access token. You likely don't need to change this.
* `username` (string) - Optional. Defaults to using the username_template. The static username for which the access token is created. If the user does not exist, Artifactory will create a transient user. Note that non-administrative access tokens can only create tokens for themselves.
* `scope` (string) - Space-delimited list. See the JFrog Artifactory REST documentation on ["Create Token"](https://jfrog.com/help/r/jfrog-rest-apis/create-token) for a full and up to date description.
* `refreshable` (boolean) - Optional. A refreshable access token gets replaced by a new access token, which is not what a consumer of tokens from this backend would be expecting; instead they'd likely just request a new token periodically. Set this to `true` only if your usage requires this. See the JFrog Platform documentation on [Generating Refreshable Tokens](https://jfrog.com/help/r/jfrog-platform-administration-documentation/generating-refreshable-tokens) for a full and up to date description. Defaults to `false`.
Expand Down
Loading

0 comments on commit ac04491

Please sign in to comment.