@@ -521,15 +521,27 @@ class S3(object):

         response = self.send_request(request, body)

         return response

-    def set_policy(self, uri, policy):

-        if uri.has_object():

-            request = self.create_request("OBJECT_PUT", uri = uri, extra = "?policy")

-        else:

-            request = self.create_request("BUCKET_CREATE", bucket = uri.bucket(), extra = "?policy")

+    def get_policy(self, uri):

+        request = self.create_request("BUCKET_LIST", bucket = uri.bucket(), extra = "?policy")

+        response = self.send_request(request)

+        return response['data']

-        body = str(policy)

+    def set_policy(self, uri, policy):

+        headers = {}

+        # TODO check policy is proper json string

+        headers['content-type'] = 'application/json'

+        request = self.create_request("BUCKET_CREATE", uri = uri,

+                                      extra = "?policy", headers=headers)

+        body = policy

         debug(u"set_policy(%s): policy-json: %s" % (uri, body))

-        response = self.send_request(request, body)

+        request.sign()

+        response = self.send_request(request, body=body)

+        return response

+

+    def delete_policy(self, uri):

+        request = self.create_request("BUCKET_DELETE", uri = uri, extra = "?policy")

+        debug(u"delete_policy(%s)" % uri)

+        response = self.send_request(request)

         return response

     def get_accesslog(self, uri):

@@ -602,10 +602,18 @@ def cmd_info(args):

                 output(u"   Location:  %s" % info['bucket-location'])

             acl = s3.get_acl(uri)

             acl_grant_list = acl.getGrantList()

+

+            try:

+                policy = s3.get_policy(uri)

+                output(u"   policy: %s" % policy)

+            except:

+                output(u"   policy: none")

+            

             for grant in acl_grant_list:

                 output(u"   ACL:       %s: %s" % (grant['grantee'], grant['permission']))

             if acl.isAnonRead():

                 output(u"   URL:       %s" % uri.public_url())

+

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

@@ -1211,15 +1219,30 @@ def cmd_setacl(args):

 def cmd_setpolicy(args):

     s3 = S3(cfg)

-    uri = args.pop(0)

-    bucket_uri = S3Uri(uri)

-    if bucket_uri.object():

-        raise ParameterError("Only bucket name is required for [setpolicy] command")

-    policy = args.pop()

-    info("Setting access policy for bucket %s to:\n\n%s" % (bucket_uri.uri(), policy))

-    response = s3.set_policy(bucket_uri, policy)

+    uri = S3Uri(args[1])

+    policy_file = args[0]

+    policy = open(policy_file, 'r').read()

+

+    if cfg.dry_run: return

+

+    response = s3.set_policy(uri, policy)

+

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

+    debug(u"response - %s" % response['status'])

     if response['status'] == 204:

-          output(u"%s: Policy updated" % uri)

+        output(u"%s: Policy updated" % uri)

+

+def cmd_delpolicy(args):

+    s3 = S3(cfg)

+    uri = S3Uri(args[0])

+    if cfg.dry_run: return

+

+    response = s3.delete_policy(uri)

+

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

+    debug(u"response - %s" % response['status'])

+    output(u"%s: Policy deleted" % uri)

+

 def cmd_accesslog(args):

     s3 = S3(cfg)

@@ -1571,7 +1594,10 @@ def get_commands_list():

     {"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 Files", "param":"s3://BUCKET[/OBJECT]", "func":cmd_setacl, "argc":1},

-    {"cmd":"setpolicy", "label":"Set an access policy for a bucket", "param":"s3://BUCKET POLICY_STRING", "func":cmd_setpolicy, "argc":2},

+

+    {"cmd":"setpolicy", "label":"Modify Bucket Policy", "param":"FILE s3://BUCKET", "func":cmd_setpolicy, "argc":2},

+    {"cmd":"delpolicy", "label":"Delete Bucket Policy", "param":"s3://BUCKET", "func":cmd_delpolicy, "argc":1},

+

     {"cmd":"accesslog", "label":"Enable/disable bucket access logging", "param":"s3://BUCKET", "func":cmd_accesslog, "argc":1},

     {"cmd":"sign", "label":"Sign arbitrary string using the secret key", "param":"STRING-TO-SIGN", "func":cmd_sign, "argc":1},

     {"cmd":"signurl", "label":"Sign an S3 URL to provide limited public access with expiry", "param":"s3://BUCKET/OBJECT expiry_epoch", "func":cmd_signurl, "argc":2},