MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-28 05:04:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bucket policy propagation (Fixes #2930) (#2932)

Browse Source 
Fixes a serialisation bug - encoding/gob does not directly support
serializing `map[string]interface{}`, so we serialise to JSON and send a
byte array in the RPC call, and deserialize and update on the receiver.
This commit is contained in:
Aditya Manthramurthy
2016-10-14 22:49:51 -07:00
committed by Harshavardhana
parent 070d3610ff
commit 17eeec6895
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/s3-peer-rpc-handlers.go
View File

@@ -16,7 +16,10 @@
package cmd
import "time"
import (
"encoding/json"
"time"
)
func (s3 *s3PeerAPIHandlers) LoginHandler(args *RPCLoginArgs, reply *RPCLoginReply) error {
jwt, err := newJWT(defaultInterNodeJWTExpiry)
@@ -128,8 +131,8 @@ type SetBPPArgs struct {
Bucket string
// policy config
PCh policyChange
// Policy change (serialized to JSON)
PChBytes []byte
}
// tell receiving server to update a bucket policy
@@ -145,5 +148,10 @@ func (s3 *s3PeerAPIHandlers) SetBucketPolicyPeer(args SetBPPArgs, reply *Generic
return errServerNotInitialized
}
return globalBucketPolicies.SetBucketPolicy(args.Bucket, args.PCh)
var pCh policyChange
if err := json.Unmarshal(args.PChBytes, &pCh); err != nil {
return err
}
return globalBucketPolicies.SetBucketPolicy(args.Bucket, pCh)
}