gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

SaveInsideFiler S3 Configuration

Browse source
This commit is contained in:
Konstantin Lebedev 2020-12-10 21:03:25 +05:00
parent 9f26f2815c
commit 40938d6a47
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
weed/iamapi/iamapi_management_handlers.go
View file

@ -8,6 +8,8 @@ import (
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/filer"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/pb/iam_pb" "github.com/chrislusf/seaweedfs/weed/pb/iam_pb"
"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants" "github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
"github.com/chrislusf/seaweedfs/weed/s3api/s3err" "github.com/chrislusf/seaweedfs/weed/s3api/s3err"
@ -216,7 +218,7 @@ func GetActions(policy *PolicyDocument) (actions []string) {
// Parse "arn:aws:s3:::my-bucket/shared/*" // Parse "arn:aws:s3:::my-bucket/shared/*"
res := strings.Split(resource, ":") res := strings.Split(resource, ":")
if len(res) != 6 || res[0] != "arn" || res[1] != "aws" || res[2] != "s3" { if len(res) != 6 || res[0] != "arn" || res[1] != "aws" || res[2] != "s3" {
glog.Infof("not math resource: %s", res) glog.Infof("not match resource: %s", res)
continue continue
} }
for _, action := range statement.Action { for _, action := range statement.Action {
@ -237,7 +239,6 @@ func GetActions(policy *PolicyDocument) (actions []string) {
continue continue
} }
actions = append(actions, fmt.Sprintf("%s:%s", MapAction(act[1]), path[0])) actions = append(actions, fmt.Sprintf("%s:%s", MapAction(act[1]), path[0]))
} }
} }
} }
@ -360,14 +361,17 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
writeErrorResponse(w, s3err.ErrInternalError, r.URL) writeErrorResponse(w, s3err.ErrInternalError, r.URL)
return return
} }
if err := filer.SaveAs( err := pb.WithGrpcFilerClient(
iama.option.Filer, iama.option.FilerGrpcAddress,
0, iama.option.GrpcDialOption,
filer.IamConfigDirecotry, func(client filer_pb.SeaweedFilerClient) error {
filer.IamIdentityFile, if err := filer.SaveInsideFiler(client, filer.IamConfigDirecotry, filer.IamIdentityFile, buf.Bytes()); err != nil {
"text/plain; charset=utf-8", return err
&buf); err != nil { }
glog.Error("SaveAs: ", err) return nil
},
)
if err != nil {
writeErrorResponse(w, s3err.ErrInternalError, r.URL) writeErrorResponse(w, s3err.ErrInternalError, r.URL)
return return
} }