@@ -1,5 +1,12 @@

 2009-01-07  Michal Ludvig  <michal@logix.cz>

+	* s3cmd: New command 'setacl'.

+	* S3/S3.py: Implemented set_acl().

+	* S3/ACL.py: Fill in <Owner/> tag in ACL XML.

+	* NEWS: Info about 'setacl'.

+

+2009-01-07  Michal Ludvig  <michal@logix.cz>

+

 	* s3cmd: Factored remote_keys generation from cmd_object_get()

 	  to fetch_remote_keys().

 	* s3cmd: Display Public URL in 'info' for AnonRead objects.

@@ -1,3 +1,7 @@

+s3cmd 0.9.9-pre5

+================

+* New command 'setacl' for setting ACL on existing objects.

+

 s3cmd 0.9.9-pre4 - 2008-12-30

 ================

 * Support for non-recursive [ls]

@@ -51,18 +51,25 @@ class GranteeAnonRead(Grantee):

 	permission = "READ"

 class ACL(object):

-	EMPTY_ACL = "<AccessControlPolicy><AccessControlList></AccessControlList></AccessControlPolicy>"

+	EMPTY_ACL = "<AccessControlPolicy><Owner><ID></ID></Owner><AccessControlList></AccessControlList></AccessControlPolicy>"

 	grantees = []

+	owner_id = ""

+	owner_nick = ""

 	def __init__(self, xml = None):

 		if not xml:

 			xml = ACL.EMPTY_ACL

-		self.tree = getTreeFromXml(xml)

-		self.parseGrants()

-	

-	def parseGrants(self):

-		for grant in self.tree.findall(".//Grant"):

+		tree = getTreeFromXml(xml)

+		self.parseOwner(tree)

+		self.parseGrants(tree)

+

+	def parseOwner(self, tree):

+		self.owner_id = tree.findtext(".//Owner//ID")

+		self.owner_nick = tree.findtext(".//Owner//DisplayName")

+

+	def parseGrants(self, tree):

+		for grant in tree.findall(".//Grant"):

 			grantee = Grantee()

 			g = grant.find(".//Grantee")

 			grantee.xsi_type = g.attrib['{http://www.w3.org/2001/XMLSchema-instance}type']

@@ -87,6 +94,9 @@ class ACL(object):

 			acl[user] = grantee.permission

 		return acl

+	def getOwner(self):

+		return { 'id' : self.owner_id, 'nick' : self.owner_nick }

+

 	def isAnonRead(self):

 		for grantee in self.grantees:

 			if grantee.isAnonRead():

@@ -103,6 +113,8 @@ class ACL(object):

 	def __str__(self):

 		tree = getTreeFromXml(ACL.EMPTY_ACL)

 		tree.attrib['xmlns'] = "http://s3.amazonaws.com/doc/2006-03-01/"

+		owner = tree.find(".//Owner//ID")

+		owner.text = self.owner_id

 		acl = tree.find(".//AccessControlList")

 		for grantee in self.grantees:

 			acl.append(grantee.getElement())

@@ -256,6 +256,17 @@ class S3(object):

 		acl = ACL(response['data'])

 		return acl

+	def set_acl(self, uri, acl):

+		if uri.has_object():

+			request = self.create_request("OBJECT_PUT", uri = uri, extra = "?acl")

+		else:

+			request = self.create_request("BUCKET_CREATE", bucket = uri.bucket(), extra = "?acl")

+

+		body = str(acl)

+		debug(u"set_acl(%s): acl-xml: %s" % (uri, body))

+		response = self.send_request(request, body)

+		return response

+

 	## Low level methods

 	def urlencode_string(self, string):

 		if type(string) == unicode:

@@ -884,7 +884,34 @@ def cmd_sync(args):

 		return cmd_sync_local2remote(src, dst)

 	if S3Uri(src).type == "s3" and S3Uri(dst).type == "file":

 		return cmd_sync_remote2local(src, dst)

-	

+

+def cmd_setacl(args):

+	s3 = S3(cfg)

+

+	set_to_acl = cfg.acl_public and "Public" or "Private"

+

+	remote_keys = fetch_remote_keys(args)

+	total_keys = len(remote_keys)

+	seq = 0

+	for key in remote_keys:

+		seq += 1

+		seq_label = "[%d of %d]" % (seq, total_keys)

+		uri = key['remote_uri']

+		acl = s3.get_acl(uri)

+		if cfg.acl_public:

+			if acl.isAnonRead():

+				info(u"%s: already Public, skippingi %s" % (uri, seq_label))

+				continue

+			acl.grantAnonRead()

+		else:

+			if not acl.isAnonRead():

+				info(u"%s: already Private, skipping %s" % (uri, seq_label))

+				continue

+			acl.revokeAnonRead()

+		retsponse = s3.set_acl(uri, acl)

+		if retsponse['status'] == 200:

+			output(u"%s: ACL set to %s  %s" % (uri, set_to_acl, seq_label))

+

 def resolve_list(lst, args):

 	retval = []

 	for item in lst:

@@ -1085,7 +1112,7 @@ commands_list = [

 	{"cmd":"info", "label":"Get various information about Buckets or Objects", "param":"s3://BUCKET[/OBJECT]", "func":cmd_info, "argc":1},

 	{"cmd":"cp", "label":"Copy object", "param":"s3://BUCKET1/OBJECT1 s3://BUCKET2[/OBJECT2]", "func":cmd_cp, "argc":2},

 	{"cmd":"mv", "label":"Move object", "param":"s3://BUCKET1/OBJECT1 s3://BUCKET2[/OBJECT2]", "func":cmd_mv, "argc":2},

-	#{"cmd":"setacl", "label":"Modify Access control list for Bucket or Object", "param":"s3://BUCKET[/OBJECT]", "func":cmd_setacl, "argc":1},

+	{"cmd":"setacl", "label":"Modify Access control list for Bucket or Object", "param":"s3://BUCKET[/OBJECT]", "func":cmd_setacl, "argc":1},

 	]

 def format_commands(progname):