mirror of
https://github.com/versity/versitygw.git
synced 2026-08-29 12:16:56 +00:00
Adds `TagOpenIDConnectProvider`, `UntagOpenIDConnectProvider` and `ListOpenIDConnectProviderTags` to the standalone IAM service, backed by both the internal and Vault storers. They follow the user and role tagging actions in most respects — the tag action merges into the provider's existing tags and rejects a repeated key, untag removal is idempotent, and the tag listing is sorted by key and paginated, with the per-request member count and the per-provider tag total enforced as separate quotas so replacing a tag on a provider already at the 50-tag cap still succeeds — but differ in the one respect IAM itself draws: OIDC provider tag keys are compared exactly, not case-insensitively. On a provider `env` and `ENV` are two independent tags, both may be supplied in a single request, only a byte-identical repeat is a duplicate (reported without the "Tag keys are case insensitive" note the user and role actions carry), and untagging `env` leaves `ENV` in place. That distinction is now carried by `iamutil.TagKeyCase`, which `ParseTags` uses for duplicate detection and which `mergeTags`, `removeTags` and the tag listing's marker lookup use for key matching. `CreateOpenIDConnectProvider` moves onto the exact comparison too, so a provider created with case-differing tag keys keeps both. All three actions are authorized against the target provider's ARN, so `aws:ResourceTag/<key>` reads the provider's own tags, and the tag and untag actions populate `aws:RequestTag/<key>` and `aws:TagKeys` respectively, so a tag-scoped policy Condition governs which tags a caller may set or remove. All three report a missing provider with the wording `DeleteOpenIDConnectProvider` uses rather than the one `GetOpenIDConnectProvider` uses, which is why the Vault provider read now takes the not-found error its calling action reports. The WebGUI gains a Tags section in the OIDC provider manage view, replacing the read-only tag row, and the shared tag editor gains a case-sensitive mode that changes its duplicate-key check, its diffing of an edited set into an untag and tag pair, and the wording of its guidance.
130 lines
5.5 KiB
Go
130 lines
5.5 KiB
Go
// Copyright 2026 Versity Software
|
|
// This file is licensed under the Apache License, Version 2.0
|
|
// (the "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
|
|
package storage
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/versity/versitygw/iamapi/types"
|
|
)
|
|
|
|
// Storer is the IAM API storage backend contract.
|
|
type Storer interface {
|
|
CreateUser(ctx context.Context, user types.User) (*types.User, error)
|
|
DeleteUser(ctx context.Context, username string) error
|
|
GetUser(ctx context.Context, username string) (*types.User, error)
|
|
GetUserByAccessKeyID(ctx context.Context, accessKeyID string) (*types.User, error)
|
|
ListUsers(ctx context.Context, input ListUsersInput) (*ListUsersOutput, error)
|
|
UpdateUser(ctx context.Context, input UpdateUserInput) (*types.User, error)
|
|
|
|
TagUser(ctx context.Context, userName string, tags []types.Tag) error
|
|
UntagUser(ctx context.Context, userName string, tagKeys []string) error
|
|
ListUserTags(ctx context.Context, input ListUserTagsInput) (*ListTagsOutput, error)
|
|
|
|
CreateAccessKey(ctx context.Context, input CreateAccessKeyInput) (*types.AccessKey, error)
|
|
UpdateAccessKey(ctx context.Context, input UpdateAccessKeyInput) error
|
|
DeleteAccessKey(ctx context.Context, username, accessKeyID string) error
|
|
GetAccessKeyLastUsed(ctx context.Context, accessKeyID string) (*GetAccessKeyLastUsedOutput, error)
|
|
ListAccessKeys(ctx context.Context, input ListAccessKeysInput) (*ListAccessKeysOutput, error)
|
|
// RecordAccessKeyUsage updates accessKeyID's GetAccessKeyLastUsed
|
|
// metadata (service, region, and timestamp) to reflect a successful
|
|
// authentication at when. Called best-effort/asynchronously by the auth
|
|
// middleware, so implementations should treat a lost update under
|
|
// concurrent use as acceptable rather than something worth retrying hard.
|
|
RecordAccessKeyUsage(ctx context.Context, accessKeyID, service, region string, when time.Time) error
|
|
|
|
PutUserPolicy(ctx context.Context, input PutUserPolicyInput) error
|
|
GetUserPolicy(ctx context.Context, userName, policyName string) (*types.PolicyEntry, error)
|
|
DeleteUserPolicy(ctx context.Context, userName, policyName string) error
|
|
ListUserPolicies(ctx context.Context, input ListUserPoliciesInput) (*ListUserPoliciesOutput, error)
|
|
|
|
CreateRole(ctx context.Context, role types.Role) (*types.Role, error)
|
|
GetRole(ctx context.Context, roleName string) (*types.Role, error)
|
|
ListRoles(ctx context.Context, input ListRolesInput) (*ListRolesOutput, error)
|
|
DeleteRole(ctx context.Context, roleName string) error
|
|
UpdateAssumeRolePolicy(ctx context.Context, input UpdateAssumeRolePolicyInput) (*types.Role, error)
|
|
|
|
TagRole(ctx context.Context, roleName string, tags []types.Tag) error
|
|
UntagRole(ctx context.Context, roleName string, tagKeys []string) error
|
|
ListRoleTags(ctx context.Context, input ListRoleTagsInput) (*ListTagsOutput, error)
|
|
|
|
PutRolePolicy(ctx context.Context, input PutRolePolicyInput) error
|
|
GetRolePolicy(ctx context.Context, roleName, policyName string) (*types.PolicyEntry, error)
|
|
DeleteRolePolicy(ctx context.Context, roleName, policyName string) error
|
|
ListRolePolicies(ctx context.Context, input ListRolePoliciesInput) (*ListRolePoliciesOutput, error)
|
|
|
|
// OIDC Provider CRUD
|
|
CreateOIDCProvider(ctx context.Context, provider types.OIDCProvider) (*types.OIDCProvider, error)
|
|
GetOIDCProvider(ctx context.Context, arn string) (*types.OIDCProvider, error)
|
|
ListOIDCProviders(ctx context.Context) (*ListOIDCProvidersOutput, error)
|
|
DeleteOIDCProvider(ctx context.Context, arn string) error
|
|
AddClientIDToOIDCProvider(ctx context.Context, arn, clientID string) error
|
|
RemoveClientIDFromOIDCProvider(ctx context.Context, arn, clientID string) error
|
|
UpdateOIDCProviderThumbprint(ctx context.Context, arn string, thumbprints []string) error
|
|
|
|
TagOIDCProvider(ctx context.Context, arn string, tags []types.Tag) error
|
|
UntagOIDCProvider(ctx context.Context, arn string, tagKeys []string) error
|
|
ListOIDCProviderTags(ctx context.Context, input ListOIDCProviderTagsInput) (*ListTagsOutput, error)
|
|
|
|
CreateSession(ctx context.Context, session types.Session) (*types.Session, error)
|
|
GetSession(ctx context.Context, accessKeyID string) (*types.Session, error)
|
|
}
|
|
|
|
type Config struct {
|
|
Dir string
|
|
Vault VaultConfig
|
|
}
|
|
|
|
func New(cfg Config) (Storer, error) {
|
|
dir := strings.TrimSpace(cfg.Dir)
|
|
vaultEndpoint := strings.TrimSpace(cfg.Vault.EndpointURL)
|
|
|
|
selected := make([]string, 0, 2)
|
|
if dir != "" {
|
|
selected = append(selected, "dir")
|
|
}
|
|
if vaultEndpoint != "" {
|
|
selected = append(selected, "vault")
|
|
}
|
|
|
|
switch len(selected) {
|
|
case 0:
|
|
return nil, fmt.Errorf("no IAM storer config specified")
|
|
case 1:
|
|
default:
|
|
return nil, fmt.Errorf("multiple IAM storer configs specified: %s", strings.Join(selected, ", "))
|
|
}
|
|
|
|
switch {
|
|
case dir != "":
|
|
store, err := NewInternal(dir)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("init internal IAM storer: %w", err)
|
|
}
|
|
return store, nil
|
|
case vaultEndpoint != "":
|
|
store, err := NewVault(cfg.Vault)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("init vault IAM storer: %w", err)
|
|
}
|
|
return store, nil
|
|
default:
|
|
return nil, fmt.Errorf("no IAM storer config specified")
|
|
}
|
|
}
|