adds check to set_bucket_policy

Author: smouli

minio/api.py

@@ -72,7 +72,7 @@
                       get_sha256_hexdigest, get_md5_base64digest, Hasher,
                       optimal_part_info,
                       is_valid_bucket_name, PartMetadata, read_full,
-                      is_valid_bucket_notification_config,
+                      is_valid_bucket_notification_config, is_valid_bucket_type_policy,
                       get_s3_region_from_endpoint,
                       mkdir_p, dump_http, amzprefix_user_metadata,
                       is_supported_header,is_amz_header)
@@ -387,8 +387,9 @@ def set_bucket_policy(self, bucket_name, policy):
         Set bucket policy of given bucket name.
 
         :param bucket_name: Bucket name.
-        :param policy: Access policy/ies in JSON format.
+        :param policy: Access policy/ies in string format.
         """
+        is_valid_bucket_type_policy(policy)
         is_valid_bucket_name(bucket_name)
 
         headers = {

minio/helpers.py

@@ -39,7 +39,7 @@
 import math
 
 from .compat import (urlsplit, urlencode, queryencode,
-                     str, bytes, basestring)
+                     str, bytes, basestring, _is_py2, _is_py3)
 from .error import (InvalidBucketError, InvalidEndpointError,
                     InvalidArgumentError)
 
@@ -375,6 +375,23 @@ def is_non_empty_string(input_string):
 
     return True
 
+def is_valid_bucket_type_policy(policy):
+    """
+    Validate if policy is type str
+
+    :param policy: S3 style Bucket policy.
+    :return: True if policy parameter is of a valid type, 'string'.
+       Raise :exc:`TypeError` otherwise.
+    """
+    if _is_py3:
+        string_types = str,
+    elif _is_py2:
+        string_types = basestring
+
+    if not isinstance(policy, string_types):
+        raise TypeError('policy can only be of type str')
+    is_non_empty_string(policy)
+    return True
 
 def is_valid_bucket_notification_config(notifications):
     """