mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-02 05:16:38 +00:00
* refactor(util): extract pgx OpenDB + DSN builder into shared pgxutil
The postgres filer store had OpenPGXDB plus duplicated key=value DSN
assembly across postgres/ and postgres2/. Move the connection helper to
weed/util/pgxutil and add BuildDSN so the credential postgres store can
land on the same code path.
filer/postgres/pgx_conn.go keeps OpenPGXDB as a thin alias so postgres2
keeps building unchanged.
* refactor(credential/postgres): use shared pgxutil for connection setup
Replace the bespoke fmt.Sprintf DSN + sql.Open("pgx", ...) path with
pgxutil.BuildDSN + pgxutil.OpenDB so the credential store mirrors the
postgres filer store. This also drops the leaky RegisterConnConfig-style
init in favor of stdlib.OpenDB(*config), which doesn't accumulate
entries in the global pgx config map.
Adds parity knobs the filer store already exposes: sslcrl, and
configurable connection_max_idle / connection_max_open /
connection_max_lifetime_seconds (with the previous hardcoded 25/5/5min
as defaults). Also moves the jsonbParam helper here so other store
files can reuse it. (Helper is also referenced by postgres_identity.go,
which is migrated to it in the next commit.)
* refactor(credential/postgres): use jsonbParam helper across all writers
Consolidate JSONB write handling on the new pgxutil-adjacent helper
jsonbParam(b []byte) interface{}, which returns nil (driver writes SQL
NULL) when the marshaled JSON is empty and string(b) otherwise.
postgres_identity.go: replace the inline 'var fooParam any' /
'fooParam = string(b)' pattern with the helper. Same in CreateUser
and UpdateUser.
postgres_inline_policy.go, postgres_policy.go, postgres_service_account.go,
postgres_group.go: every JSONB writer was still passing []byte. Under
pgx simple_protocol (pgbouncer_compatible=true), []byte is encoded as
bytea and Postgres rejects that against a JSONB column with "invalid
input syntax for type json". Route them through jsonbParam too.
* fix(credential/postgres): rework SaveConfiguration to handle rename + UNIQUE access keys
The IAM rename path (s3api UpdateUser) renames an identity in place
and keeps its access keys. With the previous flow — upsert each user,
then per-user delete-and-insert credentials, then prune absent users —
the renamed user's access keys were still owned by the old row when
the INSERT for the new name ran, tripping credentials.access_key's
global UNIQUE constraint and failing every rename of a user with
credentials.
Reorder the SaveConfiguration body so the prune step runs BEFORE the
credential replace. CASCADE on the old user releases its access keys
in the same transaction, and the new name can then claim them.
While here:
- Replace the per-user loop DELETE FROM users WHERE username = $1 with
a single DELETE ... WHERE username = ANY($1), one round trip instead
of N inside the transaction.
- Surface inline-policy CASCADE losses: count user_inline_policies for
the prune set and emit a Warningf when the count is non-zero so
rename-driven drops are visible in operator logs (the structural
fix for renames lives at the IAM layer in a follow-up commit).
- Two-pass credential replace: clear credentials for every user we are
about to rewrite first, then insert, so an access key can be moved
between two users in the same SaveConfiguration call.
- credErr := credRows.Err() before credRows.Close() in
LoadConfiguration — Err() is documented as safe after Close, but
the leading-capture pattern matches the rest of the file.
* fix(s3api/iam): preserve inline policies when renaming a user
EmbeddedIamApi.UpdateUser renames an identity in place and the caller
persists via SaveConfiguration, which prunes the old username and
CASCADE-drops its rows from user_inline_policies. GetUserPolicy and
ListUserPolicies then return nothing under the new name even though
the API reported success — silent data loss.
Before flipping sourceIdent.Name, list the user's stored inline
policies and re-attach each one under the new name. The subsequent
SaveConfiguration prune still CASCADE-removes the old-name rows; only
the duplicates we just wrote under the new name survive. Adds a
regression test that puts a policy on the old name, renames, and
asserts the policy is readable under the new name.
* perf(credential/postgres): batch the credential clear in SaveConfiguration
The two-pass credential replace was clearing each incoming user's
credentials with its own DELETE statement — N round-trips inside the
transaction. Match the pattern already used for the user prune and
issue a single DELETE FROM credentials WHERE username = ANY($1)
instead.
* refactor(s3api/iam): plumb context through UpdateUser
UpdateUser was synthesizing a fresh context.Background() inside the
inline-policy migration block, which discards the request deadline,
cancellation, and tracing carried by the caller. Add ctx as the first
parameter and pass r.Context() in via the ExecuteAction dispatcher,
mirroring the signature already used by CreatePolicy /
AttachUserPolicy / DetachUserPolicy.
* fix(util/pgxutil): quote DSN values per libpq rules
BuildDSN was concatenating values directly, so any password / cert path
/ database name with a space, single quote, or backslash produced a
malformed connection string and pgx.ParseConfig either errored or
mis-parsed the remainder. Critical now that the helper is shared with
the credential store: mTLS deployments routinely sourcing passwords or
secret-mounted cert paths from a vault are exactly the case where
spaces and quotes show up.
Add quoteDSNValue: empty values and values containing whitespace, `'`,
or `\` are wrapped in single quotes with `'` and `\` escaped per
PostgreSQL libpq rules; plain alphanumeric values pass through
unchanged. Apply it to every variable field in BuildDSN.
Adds a test that round-trips a password containing spaces, quotes and
backslashes through pgx.ParseConfig and confirms the parsed Config
matches the input.
* fix(credential,s3api/iam): atomic UserRenamer to avoid FK violation on rename
The previous IAM rename path called PutUserInlinePolicy(newName, ...)
before SaveConfiguration created the new users row. user_inline_policies
has a non-deferrable FOREIGN KEY (username) REFERENCES users(username),
which Postgres validates at statement time, so every rename of a user
that owned at least one inline policy failed with an FK violation. The
existing memory-store regression test missed it because the memory
backend has no FK enforcement.
Add an optional credential.UserRenamer interface plus a
CredentialManager.RenameUser thin shim that returns (supported, err).
Implement it on PostgresStore as an atomic in-transaction migration:
INSERT the new users row by SELECT-copying from the old, UPDATE
credentials.username and user_inline_policies.username to the new
name (FK satisfied because both rows now exist), then DELETE the old
row. ErrUserNotFound / ErrUserAlreadyExists are surfaced cleanly.
Implement it on MemoryStore by re-binding store.users / store.accessKeys
/ store.inlinePolicies under the new name. Also fixes a small leak in
DeleteUser, which was forgetting to drop the user's inline-policy
bucket.
EmbeddedIamApi.UpdateUser now calls RenameUser first; if the store
implements the interface, that's the whole migration. If it doesn't
(stores without FK enforcement), fall back to the previous
list / get / put copy.
Adds a focused test for MemoryStore.RenameUser that asserts the
identity, the access-key index, and the inline policies all land
under the new name.
442 lines
11 KiB
Go
442 lines
11 KiB
Go
package memory
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/credential"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/policy_engine"
|
|
)
|
|
|
|
func (store *MemoryStore) LoadConfiguration(ctx context.Context) (*iam_pb.S3ApiConfiguration, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
config := &iam_pb.S3ApiConfiguration{}
|
|
|
|
// Convert all users to identities
|
|
for _, user := range store.users {
|
|
config.Identities = append(config.Identities, store.deepCopyIdentity(user))
|
|
}
|
|
|
|
// Add all policies
|
|
for name, doc := range store.policies {
|
|
content, _ := json.Marshal(doc)
|
|
config.Policies = append(config.Policies, &iam_pb.Policy{
|
|
Name: name,
|
|
Content: string(content),
|
|
})
|
|
}
|
|
|
|
return config, nil
|
|
}
|
|
|
|
func (store *MemoryStore) SaveConfiguration(ctx context.Context, config *iam_pb.S3ApiConfiguration) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
// Clear existing data
|
|
store.users = make(map[string]*iam_pb.Identity)
|
|
store.accessKeys = make(map[string]string)
|
|
store.policies = make(map[string]policy_engine.PolicyDocument)
|
|
|
|
// Add all identities
|
|
for _, identity := range config.Identities {
|
|
store.users[identity.Name] = store.deepCopyIdentity(identity)
|
|
|
|
// Index access keys
|
|
for _, credential := range identity.Credentials {
|
|
store.accessKeys[credential.AccessKey] = identity.Name
|
|
}
|
|
}
|
|
|
|
// Add all policies
|
|
for _, policy := range config.Policies {
|
|
var doc policy_engine.PolicyDocument
|
|
if err := json.Unmarshal([]byte(policy.Content), &doc); err == nil {
|
|
store.policies[policy.Name] = doc
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *MemoryStore) CreateUser(ctx context.Context, identity *iam_pb.Identity) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if _, exists := store.users[identity.Name]; exists {
|
|
return credential.ErrUserAlreadyExists
|
|
}
|
|
|
|
// Check for duplicate access keys
|
|
for _, cred := range identity.Credentials {
|
|
if _, exists := store.accessKeys[cred.AccessKey]; exists {
|
|
return fmt.Errorf("access key %s already exists", cred.AccessKey)
|
|
}
|
|
}
|
|
|
|
// Deep copy to avoid mutation issues
|
|
identityCopy := store.deepCopyIdentity(identity)
|
|
store.users[identity.Name] = identityCopy
|
|
|
|
// Index access keys
|
|
for _, cred := range identity.Credentials {
|
|
store.accessKeys[cred.AccessKey] = identity.Name
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *MemoryStore) GetUser(ctx context.Context, username string) (*iam_pb.Identity, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return nil, credential.ErrUserNotFound
|
|
}
|
|
|
|
// Return a deep copy to avoid mutation issues
|
|
return store.deepCopyIdentity(user), nil
|
|
}
|
|
|
|
func (store *MemoryStore) UpdateUser(ctx context.Context, username string, identity *iam_pb.Identity) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
existingUser, exists := store.users[username]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
|
|
// Remove old access keys from index
|
|
for _, cred := range existingUser.Credentials {
|
|
delete(store.accessKeys, cred.AccessKey)
|
|
}
|
|
|
|
// Check for duplicate access keys (excluding current user)
|
|
for _, cred := range identity.Credentials {
|
|
if existingUsername, exists := store.accessKeys[cred.AccessKey]; exists && existingUsername != username {
|
|
return fmt.Errorf("access key %s already exists", cred.AccessKey)
|
|
}
|
|
}
|
|
|
|
// Deep copy to avoid mutation issues
|
|
identityCopy := store.deepCopyIdentity(identity)
|
|
store.users[username] = identityCopy
|
|
|
|
// Re-index access keys
|
|
for _, cred := range identity.Credentials {
|
|
store.accessKeys[cred.AccessKey] = username
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *MemoryStore) DeleteUser(ctx context.Context, username string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
|
|
// Remove access keys from index
|
|
for _, cred := range user.Credentials {
|
|
delete(store.accessKeys, cred.AccessKey)
|
|
}
|
|
|
|
// Remove user
|
|
delete(store.users, username)
|
|
delete(store.inlinePolicies, username)
|
|
|
|
return nil
|
|
}
|
|
|
|
// RenameUser implements credential.UserRenamer for the memory store.
|
|
// Renames the user and re-points access-key and inline-policy indexes
|
|
// to the new name. The whole operation is performed under the store
|
|
// lock so it is atomic with respect to concurrent reads.
|
|
func (store *MemoryStore) RenameUser(ctx context.Context, oldName, newName string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
if oldName == newName {
|
|
return nil
|
|
}
|
|
|
|
user, exists := store.users[oldName]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
if _, clash := store.users[newName]; clash {
|
|
return credential.ErrUserAlreadyExists
|
|
}
|
|
|
|
user.Name = newName
|
|
store.users[newName] = user
|
|
delete(store.users, oldName)
|
|
|
|
for _, cred := range user.Credentials {
|
|
store.accessKeys[cred.AccessKey] = newName
|
|
}
|
|
|
|
if policies, ok := store.inlinePolicies[oldName]; ok {
|
|
store.inlinePolicies[newName] = policies
|
|
delete(store.inlinePolicies, oldName)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *MemoryStore) ListUsers(ctx context.Context) ([]string, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
var usernames []string
|
|
for username := range store.users {
|
|
usernames = append(usernames, username)
|
|
}
|
|
|
|
return usernames, nil
|
|
}
|
|
|
|
func (store *MemoryStore) GetUserByAccessKey(ctx context.Context, accessKey string) (*iam_pb.Identity, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
username, exists := store.accessKeys[accessKey]
|
|
if !exists {
|
|
return nil, credential.ErrAccessKeyNotFound
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
// This should not happen, but handle it gracefully
|
|
return nil, credential.ErrUserNotFound
|
|
}
|
|
|
|
// Return a deep copy to avoid mutation issues
|
|
return store.deepCopyIdentity(user), nil
|
|
}
|
|
|
|
func (store *MemoryStore) CreateAccessKey(ctx context.Context, username string, cred *iam_pb.Credential) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
|
|
// Check if access key already exists
|
|
if _, exists := store.accessKeys[cred.AccessKey]; exists {
|
|
return fmt.Errorf("access key %s already exists", cred.AccessKey)
|
|
}
|
|
|
|
// Add credential to user
|
|
user.Credentials = append(user.Credentials, &iam_pb.Credential{
|
|
AccessKey: cred.AccessKey,
|
|
SecretKey: cred.SecretKey,
|
|
})
|
|
|
|
// Index the access key
|
|
store.accessKeys[cred.AccessKey] = username
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *MemoryStore) DeleteAccessKey(ctx context.Context, username string, accessKey string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
|
|
// Find and remove the credential
|
|
var newCredentials []*iam_pb.Credential
|
|
found := false
|
|
for _, cred := range user.Credentials {
|
|
if cred.AccessKey == accessKey {
|
|
found = true
|
|
// Remove from access key index
|
|
delete(store.accessKeys, accessKey)
|
|
} else {
|
|
newCredentials = append(newCredentials, cred)
|
|
}
|
|
}
|
|
|
|
if !found {
|
|
return credential.ErrAccessKeyNotFound
|
|
}
|
|
|
|
user.Credentials = newCredentials
|
|
return nil
|
|
}
|
|
|
|
// deepCopyIdentity creates a deep copy of an identity to avoid mutation issues
|
|
func (store *MemoryStore) deepCopyIdentity(identity *iam_pb.Identity) *iam_pb.Identity {
|
|
if identity == nil {
|
|
return nil
|
|
}
|
|
|
|
// Use JSON marshaling/unmarshaling for deep copy
|
|
// This is simple and safe for protobuf messages
|
|
data, err := json.Marshal(identity)
|
|
if err != nil {
|
|
// Fallback to shallow copy if JSON fails
|
|
return &iam_pb.Identity{
|
|
Name: identity.Name,
|
|
Account: identity.Account,
|
|
Credentials: identity.Credentials,
|
|
Actions: identity.Actions,
|
|
PolicyNames: identity.PolicyNames,
|
|
}
|
|
}
|
|
|
|
var copy iam_pb.Identity
|
|
if err := json.Unmarshal(data, ©); err != nil {
|
|
// Fallback to shallow copy if JSON fails
|
|
return &iam_pb.Identity{
|
|
Name: identity.Name,
|
|
Account: identity.Account,
|
|
Credentials: identity.Credentials,
|
|
Actions: identity.Actions,
|
|
PolicyNames: identity.PolicyNames,
|
|
}
|
|
}
|
|
|
|
return ©
|
|
}
|
|
|
|
// AttachUserPolicy attaches a managed policy to a user by policy name
|
|
func (store *MemoryStore) AttachUserPolicy(ctx context.Context, username string, policyName string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
|
|
// Verify policy exists
|
|
if _, exists := store.policies[policyName]; !exists {
|
|
return credential.ErrPolicyNotFound
|
|
}
|
|
|
|
// Check if already attached
|
|
for _, p := range user.PolicyNames {
|
|
if p == policyName {
|
|
return credential.ErrPolicyAlreadyAttached
|
|
}
|
|
}
|
|
|
|
user.PolicyNames = append(user.PolicyNames, policyName)
|
|
return nil
|
|
}
|
|
|
|
// DetachUserPolicy detaches a managed policy from a user
|
|
func (store *MemoryStore) DetachUserPolicy(ctx context.Context, username string, policyName string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
|
|
found := false
|
|
var newPolicies []string
|
|
for _, p := range user.PolicyNames {
|
|
if p == policyName {
|
|
found = true
|
|
} else {
|
|
newPolicies = append(newPolicies, p)
|
|
}
|
|
}
|
|
|
|
if !found {
|
|
return credential.ErrPolicyNotAttached
|
|
}
|
|
|
|
user.PolicyNames = newPolicies
|
|
return nil
|
|
}
|
|
|
|
// ListAttachedUserPolicies returns the list of policy names attached to a user
|
|
func (store *MemoryStore) ListAttachedUserPolicies(ctx context.Context, username string) ([]string, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
user, exists := store.users[username]
|
|
if !exists {
|
|
return nil, credential.ErrUserNotFound
|
|
}
|
|
|
|
// Return copy to prevent mutation
|
|
result := make([]string, len(user.PolicyNames))
|
|
copy(result, user.PolicyNames)
|
|
return result, nil
|
|
}
|