Add support for suffix in Range header

python · lyc8503 · May 11, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
commit ac7b0fa852fdbf542c0d6772e44f0984cd0a29f5
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -773,6 +773,12 @@ def send_head(self):
 
             if self.range:
                 start, end = self.range
+                if start is None:
+                    # `end` here means suffix length
+                    start = fs.st_size - end
+                    end = fs.st_size - 1
+                    if start < 0:
+                        start = 0
                 if start >= fs.st_size:
                     # 416 REQUESTED_RANGE_NOT_SATISFIABLE means that none of the range values overlap the extent of the resource
                     f.close()
@@ -953,15 +959,19 @@ def parse_range(self):
         range_header = self.headers.get('range')
         if not range_header:
             return None
-        m = re.match(r'bytes=(\d+)-(\d*)$', range_header)
+        m = re.match(r'bytes=(\d*)-(\d*)$', range_header)
         if not m:
             return None
-        start = int(m.group(1))
-        if not m.group(2):
-            return start, None
-        end = int(m.group(2))
-        if start > end:
+
+        start = int(m.group(1)) if m.group(1) else None
+        end = int(m.group(2)) if m.group(2) else None
+
+        if start is None and end is None:
+            return None
+
+        if start is not None and end is not None and start > end:
             return None
+
         return start, end
 
 

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
@@ -554,6 +554,11 @@ def test_range_get(self):
         self.assertEqual(response.getheader('content-length'), '27')
         self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[3:])
 
+        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=-5'})
+        self.assertEqual(response.getheader('content-range'), 'bytes 25-29/30')
+        self.assertEqual(response.getheader('content-length'), '5')
+        self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[25:])
+
         response = self.request(self.base_url + '/test', headers={'Range': 'bytes=100-200'})
         self.check_status_and_reason(response, HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)