Merge branch '1_bucket_write' into 10_acl_merged

# Conflicts:
#	weed/s3api/s3api_acp.go

weed/s3api/s3api_acp.go

@@ -399,11 +399,10 @@ func getObjectEntry(s3a *S3ApiServer, bucket, object string) (*filer_pb.Entry, e
 	return s3a.getEntry(util.Join(s3a.option.BucketsPath, bucket), object)
 }
 
-func (s3a *S3ApiServer) ExtractBucketAcp(r *http.Request) (owner string, grants []*s3.Grant, errCode s3err.ErrorCode) {
+func (s3a *S3ApiServer) ExtractBucketAcp(r *http.Request, objectOwnership string) (owner string, grants []*s3.Grant, errCode s3err.ErrorCode) {
 	accountId := s3acl.GetAccountId(r)
 
-	ownership := s3_constants.DefaultOwnershipForCreate
-	if ownership == s3_constants.OwnershipBucketOwnerEnforced {
+	if objectOwnership == s3_constants.OwnershipBucketOwnerEnforced {
 		return accountId, []*s3.Grant{
 			{
 				Permission: &s3_constants.PermissionFullControl,
@@ -414,6 +413,6 @@ func (s3a *S3ApiServer) ExtractBucketAcp(r *http.Request) (owner string, grants
 			},
 		}, s3err.ErrNone
 	} else {
-		return s3acl.ParseAndValidateAclHeadersOrElseDefault(r, s3a.accountManager, ownership, accountId, accountId, false)
+		return s3acl.ParseAndValidateAclHeadersOrElseDefault(r, s3a.accountManager, objectOwnership, accountId, accountId, false)
 	}
 }

weed/s3api/s3api_bucket_handlers.go

@@ -123,7 +123,11 @@ func (s3a *S3ApiServer) PutBucketHandler(w http.ResponseWriter, r *http.Request)
 		}
 	}
 
-	acpOwner, acpGrants, errCode := s3a.ExtractBucketAcp(r)
+	objectOwnership := r.Header.Get("ObjectOwnership")
+	if objectOwnership == "" {
+		objectOwnership = s3_constants.DefaultOwnershipForCreate
+	}
+	acpOwner, acpGrants, errCode := s3a.ExtractBucketAcp(r, objectOwnership)
 	if errCode != s3err.ErrNone {
 		s3err.WriteErrorResponse(w, r, errCode)
 		return
@@ -135,6 +139,7 @@ func (s3a *S3ApiServer) PutBucketHandler(w http.ResponseWriter, r *http.Request)
 				entry.Extended = make(map[string][]byte)
 			}
 			entry.Extended[s3_constants.AmzIdentityId] = []byte(identityId)
+			entry.Extended[s3_constants.ExtOwnershipKey] = []byte(objectOwnership)
 		}
 		s3acl.AssembleEntryWithAcp(entry, acpOwner, acpGrants)
 	}