Disable dns support for buckets when "host_bucket" hostname doesn't have a %(bucket)s item in it.

S3/S3.py

@@ -208,7 +208,7 @@ def __init__(self, config):
         self.config = config
 
     def get_hostname(self, bucket):
-        if bucket and check_bucket_name_dns_conformity(bucket):
+        if bucket and check_bucket_name_dns_support(self.config.host_bucket, bucket):
             if self.redir_map.has_key(bucket):
                 host = self.redir_map[bucket]
             else:
@@ -222,7 +222,7 @@ def set_hostname(self, bucket, redir_hostname):
         self.redir_map[bucket] = redir_hostname
 
     def format_uri(self, resource):
-        if resource['bucket'] and not check_bucket_name_dns_conformity(resource['bucket']):
+        if resource['bucket'] and not check_bucket_name_dns_support(self.config.host_bucket, resource['bucket']):
             uri = "/%s%s" % (resource['bucket'], resource['uri'])
         else:
             uri = resource['uri']

S3/S3Uri.py

@@ -78,7 +78,7 @@ def uri(self):
         return u"/".join([u"s3:/", self._bucket, self._object])
 
     def is_dns_compatible(self):
-        return check_bucket_name_dns_conformity(self._bucket)
+        return check_bucket_name_dns_support(Config.Config().host_bucket, self._bucket)
 
     def public_url(self):
         if self.is_dns_compatible():

S3/Utils.py

@@ -447,6 +447,20 @@ def check_bucket_name_dns_conformity(bucket):
         return False
 __all__.append("check_bucket_name_dns_conformity")
 
+def check_bucket_name_dns_support(bucket_host, bucket_name):
+    """
+    Check whether either the host_bucket support buckets and
+    either bucket name is dns compatible
+    """
+    if "%(bucket)s" not in bucket_host:
+        return False
+
+    try:
+        return check_bucket_name(bucket_name, dns_strict = True)
+    except Exceptions.ParameterError:
+        return False
+__all__.append("check_bucket_name_dns_support")
+
 def getBucketFromHostname(hostname):
     """
     bucket, success = getBucketFromHostname(hostname)