moto 4.2.3.dev16__py2.py3-none-any.whl → 4.2.3.dev17__py2.py3-none-any.whl

moto/__init__.py

@@ -211,7 +211,7 @@ mock_all = MockAll
 # logging.getLogger('boto').setLevel(logging.CRITICAL)
 
 __title__ = "moto"
-__version__ = "4.2.3.dev16"
+__version__ = "4.2.3.dev17"
 
 
 try:

moto/s3/responses.py

@@ -1169,25 +1169,35 @@ class S3Response(BaseResponse):
     ) -> TYPE_RESPONSE:
         length = len(response_content)
         last = length - 1
+
         _, rspec = request.headers.get("range").split("=")
         if "," in rspec:
-            raise NotImplementedError("Multiple range specifiers not supported")
+            return 200, response_headers, response_content
+
+        try:
+            begin, end = [int(i) if i else None for i in rspec.split("-")]
+        except ValueError:
+            # if we can't parse the Range header, S3 just treat the request as a non-range request
+            return 200, response_headers, response_content
 
-        def toint(i: Any) -> Optional[int]:
-            return int(i) if i else None
+        if (begin is None and end == 0) or (begin is not None and begin > last):
+            raise InvalidRange(
+                actual_size=str(length), range_requested=request.headers.get("range")
+            )
 
-        begin, end = map(toint, rspec.split("-"))
         if begin is not None:  # byte range
             end = last if end is None else min(end, last)
         elif end is not None:  # suffix byte range
             begin = length - min(end, length)
             end = last
         else:
-            return 400, response_headers, ""
-        if begin < 0 or end > last or begin > min(end, last):
-            raise InvalidRange(
-                actual_size=str(length), range_requested=request.headers.get("range")
-            )
+            # Treat as non-range request
+            return 200, response_headers, response_content
+
+        if begin > min(end, last):
+            # Treat as non-range request if after the logic is applied, the start of the range is greater than the end
+            return 200, response_headers, response_content
+
         response_headers["content-range"] = f"bytes {begin}-{end}/{length}"
         content = response_content[begin : end + 1]
         response_headers["content-length"] = len(content)

{moto-4.2.3.dev16.dist-info → moto-4.2.3.dev17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 4.2.3.dev16
+Version: 4.2.3.dev17
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: "spulec@gmail.com"

{moto-4.2.3.dev16.dist-info → moto-4.2.3.dev17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-moto/__init__.py,sha256=kCcZiaceHIsAsT9Wln067PpnaHjzIsCIJTA0dMBej7Y,9630
+moto/__init__.py,sha256=WsqX_B-R7otRD54x6Vob_NTV2IiwJEGdqe7Nqv_-7N0,9630
 moto/backend_index.py,sha256=CXt1WInpx_9a2USMqIkiEoWFqRdsASOuE7AzbVp5a6A,10629
 moto/backends.py,sha256=rC9WUMUUWmVmX7ZEfXpVKAQAw6oI8qYobCEPxP2Zv9U,1805
 moto/server.py,sha256=cp8kIe5jVOm7Z2BlNN2AMbTfrRvLBEKSb4mt7O8nu34,2858
@@ -807,7 +807,7 @@ moto/s3/config.py,sha256=xrV-Uj3BMBz40lbyjmktbaLg5UR7Z6Rx8W5yyw7kIUg,4810
 moto/s3/exceptions.py,sha256=iIrIq5QfR5LVFIyCULhZfJuOx0jyXdgAyBmXw_CRFgM,15785
 moto/s3/models.py,sha256=koKn0vyVyNbYcv6SDEhggrt5RSDVqs1f0XHfiFhE9Zo,95206
 moto/s3/notifications.py,sha256=0C-jJXnNKApy6TX0jLL8esx7xzQ251a76fwGmdod-FA,4012
-moto/s3/responses.py,sha256=fP7ZVv8RShW6y3hBVfgagZlnPdF6WWr-4E_o1rEjoXk,124677
+moto/s3/responses.py,sha256=gnHN9DShMfoWGTLRwplGQplfXLQRpYcJduaeZCyAsiI,125084
 moto/s3/select_object_content.py,sha256=NxQLKVML2_bqMRO4vQCMVkaKsV7XCE4kUFnMGVzi8h4,2184
 moto/s3/urls.py,sha256=XI4Z2_A7R4Z0I9o5pQ-9NNtkHvbyH0xgzJ__KbJG4hc,1005
 moto/s3/utils.py,sha256=T7eKBz3xDR20af9CxoJQHNgX3PElnHuIhxnr7Dr7neI,7137
@@ -1030,10 +1030,10 @@ moto/xray/mock_client.py,sha256=nYl8JVJbl3OY-tnUafkVOG4K4-cFm5bsft3Hxo7fKwI,3809
 moto/xray/models.py,sha256=0QL6nmhpVVwAiyi9aw4pBwVTRhqPW9oIy2uwPDhPKug,11179
 moto/xray/responses.py,sha256=p2xsg2-P9h_1DCyuBC7GenmC5L64tXAX6a-XCb2j5-o,6316
 moto/xray/urls.py,sha256=R6T3gMwobWipukWcC1DQ36CU1Rjt6oqBDoe-7HqaIZU,393
-moto-4.2.3.dev16.dist-info/AUTHORS.md,sha256=dDUhasV8HGSkzb7zj7a0b3alnqY0P1LPOyOUNoo8Mpo,2976
-moto-4.2.3.dev16.dist-info/LICENSE,sha256=8S75_TlqE-kIeGMLG0-rRxxu2ct6SM8quyUWKBYyIY4,10834
-moto-4.2.3.dev16.dist-info/METADATA,sha256=p9m3u6vE3ZTIbgcg3Dwp57PSY0lgfNKTZKni-F3u7mM,12102
-moto-4.2.3.dev16.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-moto-4.2.3.dev16.dist-info/entry_points.txt,sha256=aPovbZuFXCwt8_m2vcolpH4Qr3rOF3yXeRElP9Zkauo,49
-moto-4.2.3.dev16.dist-info/top_level.txt,sha256=TETRKAPcAAvoZDkSkwQiZtTSr-1gzaEAXVm9FmZKj8s,5
-moto-4.2.3.dev16.dist-info/RECORD,,
+moto-4.2.3.dev17.dist-info/AUTHORS.md,sha256=dDUhasV8HGSkzb7zj7a0b3alnqY0P1LPOyOUNoo8Mpo,2976
+moto-4.2.3.dev17.dist-info/LICENSE,sha256=8S75_TlqE-kIeGMLG0-rRxxu2ct6SM8quyUWKBYyIY4,10834
+moto-4.2.3.dev17.dist-info/METADATA,sha256=m1eAV_rSN_gUua1snLkMDTY2pswEyFq1k7_AAEC062g,12102
+moto-4.2.3.dev17.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+moto-4.2.3.dev17.dist-info/entry_points.txt,sha256=aPovbZuFXCwt8_m2vcolpH4Qr3rOF3yXeRElP9Zkauo,49
+moto-4.2.3.dev17.dist-info/top_level.txt,sha256=TETRKAPcAAvoZDkSkwQiZtTSr-1gzaEAXVm9FmZKj8s,5
+moto-4.2.3.dev17.dist-info/RECORD,,