Merge pull request #892 from whummer/fix/local-domain-names

Fix domain handling for local domain names in S3 API
getmoto · Apr 13, 2017 · a664af4 · a664af4
2 parents 03c4d9f + b8a41c5
commit a664af4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/moto/s3/responses.py b/moto/s3/responses.py
@@ -53,8 +53,8 @@ def subdomain_based_buckets(self, request):
         if not host:
             host = urlparse(request.url).netloc
 
-        if not host or host.startswith("localhost"):
-            # For localhost, default to path-based buckets
+        if not host or host.startswith("localhost") or re.match(r"^[^.]+$", host):
+            # For localhost or local domain names, default to path-based buckets
             return False
 
         match = re.match(r'^([^\[\]:]+)(:\d+)?$', host)