MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-13 07:53:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: support user/groups with '/' character (#11127)

Browse Source 
NOTE: user/groups with `//` shall be normalized to `/`

fixes #11126
This commit is contained in:
Harshavardhana 2020-12-19 09:36:37 -08:00 committed by GitHub
parent e5d378931d
commit 3e16ec457a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
cmd/iam-object-store.go
View File

@ -21,6 +21,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"path"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -82,13 +83,12 @@ func (iamOS *IAMObjectStore) migrateUsersConfigToV1(ctx context.Context, isSTS b
basePrefix = iamConfigSTSPrefix basePrefix = iamConfigSTSPrefix
} }
for item := range listIAMConfigItems(ctx, iamOS.objAPI, basePrefix, true) { for item := range listIAMConfigItems(ctx, iamOS.objAPI, basePrefix) {
if item.Err != nil { if item.Err != nil {
return item.Err return item.Err
} }
user := item.Item user := path.Dir(item.Item)
{ {
// 1. check if there is policy file in old location. // 1. check if there is policy file in old location.
oldPolicyPath := pathJoin(basePrefix, user, iamPolicyFile) oldPolicyPath := pathJoin(basePrefix, user, iamPolicyFile)
@ -250,12 +250,12 @@ func (iamOS *IAMObjectStore) loadPolicyDoc(ctx context.Context, policy string, m
} }
func (iamOS *IAMObjectStore) loadPolicyDocs(ctx context.Context, m map[string]iampolicy.Policy) error { func (iamOS *IAMObjectStore) loadPolicyDocs(ctx context.Context, m map[string]iampolicy.Policy) error {
for item := range listIAMConfigItems(ctx, iamOS.objAPI, iamConfigPoliciesPrefix, true) { for item := range listIAMConfigItems(ctx, iamOS.objAPI, iamConfigPoliciesPrefix) {
if item.Err != nil { if item.Err != nil {
return item.Err return item.Err
} }
policyName := item.Item policyName := path.Dir(item.Item)
if err := iamOS.loadPolicyDoc(ctx, policyName, m); err != nil && err != errNoSuchPolicy { if err := iamOS.loadPolicyDoc(ctx, policyName, m); err != nil && err != errNoSuchPolicy {
return err return err
} }
@ -319,12 +319,12 @@ func (iamOS *IAMObjectStore) loadUsers(ctx context.Context, userType IAMUserType
basePrefix = iamConfigUsersPrefix basePrefix = iamConfigUsersPrefix
} }
for item := range listIAMConfigItems(ctx, iamOS.objAPI, basePrefix, true) { for item := range listIAMConfigItems(ctx, iamOS.objAPI, basePrefix) {
if item.Err != nil { if item.Err != nil {
return item.Err return item.Err
} }
userName := item.Item userName := path.Dir(item.Item)
if err := iamOS.loadUser(ctx, userName, userType, m); err != nil && err != errNoSuchUser { if err := iamOS.loadUser(ctx, userName, userType, m); err != nil && err != errNoSuchUser {
return err return err
} }
@ -346,12 +346,12 @@ func (iamOS *IAMObjectStore) loadGroup(ctx context.Context, group string, m map[
} }
func (iamOS *IAMObjectStore) loadGroups(ctx context.Context, m map[string]GroupInfo) error { func (iamOS *IAMObjectStore) loadGroups(ctx context.Context, m map[string]GroupInfo) error {
for item := range listIAMConfigItems(ctx, iamOS.objAPI, iamConfigGroupsPrefix, true) { for item := range listIAMConfigItems(ctx, iamOS.objAPI, iamConfigGroupsPrefix) {
if item.Err != nil { if item.Err != nil {
return item.Err return item.Err
} }
group := item.Item group := path.Dir(item.Item)
if err := iamOS.loadGroup(ctx, group, m); err != nil && err != errNoSuchGroup { if err := iamOS.loadGroup(ctx, group, m); err != nil && err != errNoSuchGroup {
return err return err
} }
@ -388,7 +388,7 @@ func (iamOS *IAMObjectStore) loadMappedPolicies(ctx context.Context, userType IA
basePath = iamConfigPolicyDBUsersPrefix basePath = iamConfigPolicyDBUsersPrefix
} }
} }
for item := range listIAMConfigItems(ctx, iamOS.objAPI, basePath, false) { for item := range listIAMConfigItems(ctx, iamOS.objAPI, basePath) {
if item.Err != nil { if item.Err != nil {
return item.Err return item.Err
} }
@ -566,49 +566,29 @@ type itemOrErr struct {
// prefix. If dirs is true, only directories are listed, otherwise // prefix. If dirs is true, only directories are listed, otherwise
// only objects are listed. All returned items have the pathPrefix // only objects are listed. All returned items have the pathPrefix
// removed from their names. // removed from their names.
func listIAMConfigItems(ctx context.Context, objAPI ObjectLayer, pathPrefix string, dirs bool) <-chan itemOrErr { func listIAMConfigItems(ctx context.Context, objAPI ObjectLayer, pathPrefix string) <-chan itemOrErr {
ch := make(chan itemOrErr) ch := make(chan itemOrErr)
dirList := func(lo ListObjectsInfo) []string {
return lo.Prefixes
}
filesList := func(lo ListObjectsInfo) (r []string) {
for _, o := range lo.Objects {
r = append(r, o.Name)
}
return r
}
go func() { go func() {
defer close(ch) defer close(ch)
marker := "" // Allocate new results channel to receive ObjectInfo.
for { objInfoCh := make(chan ObjectInfo)
lo, err := objAPI.ListObjects(ctx,
minioMetaBucket, pathPrefix, marker, SlashSeparator, maxObjectList)
if err != nil {
select {
case ch <- itemOrErr{Err: err}:
case <-ctx.Done():
}
return
}
marker = lo.NextMarker if err := objAPI.Walk(ctx, minioMetaBucket, pathPrefix, objInfoCh, ObjectOptions{}); err != nil {
lister := dirList(lo) select {
if !dirs { case ch <- itemOrErr{Err: err}:
lister = filesList(lo) case <-ctx.Done():
} }
for _, itemPrefix := range lister { return
item := strings.TrimPrefix(itemPrefix, pathPrefix) }
item = strings.TrimSuffix(item, SlashSeparator)
select { for obj := range objInfoCh {
case ch <- itemOrErr{Item: item}: item := strings.TrimPrefix(obj.Name, pathPrefix)
case <-ctx.Done(): item = strings.TrimSuffix(item, SlashSeparator)
return select {
} case ch <- itemOrErr{Item: item}:
} case <-ctx.Done():
if !lo.IsTruncated {
return return
} }
} }