ensure that incoming request to set_bucket_policy() is of type str

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_policy_name,
                       get_s3_region_from_endpoint,
                       mkdir_p, dump_http, amzprefix_user_metadata,
                       is_supported_header,is_amz_header)
@@ -382,14 +382,15 @@ def delete_bucket_policy(self, bucket_name):
                         bucket_name=bucket_name,
                         query={"policy": ""})
 
-    def set_bucket_policy(self, bucket_name, policy):
+    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 in string.
         """
         is_valid_bucket_name(bucket_name)
+        is_valid_bucket_policy_name(policy)
 
         headers = {
             'Content-Length': str(len(policy)),

minio/helpers.py

@@ -375,6 +375,19 @@ def is_non_empty_string(input_string):
 
     return True
 
+def is_valid_bucket_policy_name(policy):
+    """
+    Validates bucket policy
+    :param policy: S3 style Bucket policy.
+    :return: True if input is a valid policy structure.
+        Raise :exc: `TypeError` otherwise.
+    """
+    if not isinstance(policy, str):
+        raise TypeError('policy can only be of type str')
+
+    is_non_empty_string(policy)
+
+    return True
 
 def is_valid_bucket_notification_config(notifications):
     """