Skip to content

Commit ba0851e

Browse files
sdogruyolsdogruyol
committed
Implement multiple partial ranges
1 parent 4352774 commit ba0851e

File tree

3 files changed

+172
-27
lines changed

3 files changed

+172
-27
lines changed

‎spec/helpers_spec.cr

+110
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,116 @@ describe "Macros" do
145145
response.status_code.should eq(200)
146146
response.headers["Content-Disposition"].should eq("attachment; filename=\"image.jpg\"")
147147
end
148+
149+
it "handles multiple range requests" do
150+
get "/" do |env|
151+
send_file env, "#{__DIR__}/asset/hello.ecr"
152+
end
153+
154+
headers = HTTP::Headers{"Range" => "bytes=0-4,7-11"}
155+
request = HTTP::Request.new("GET", "/", headers)
156+
response = call_request_on_app(request)
157+
158+
response.status_code.should eq(206)
159+
response.headers["Content-Type"].should match(/^multipart\/byteranges; boundary=kemal-/)
160+
response.headers["Accept-Ranges"].should eq("bytes")
161+
162+
# Verify multipart response structure
163+
body = response.body
164+
boundary = response.headers["Content-Type"].split("boundary=")[1]
165+
parts = body.split("--#{boundary}")
166+
# Parts structure:
167+
# 1. Empty part before first boundary
168+
# 2. First content part (0-4)
169+
# 3. Second content part (7-11)
170+
# 4. Trailing part after last boundary
171+
parts.size.should eq(4)
172+
173+
# First part (0-4)
174+
first_part = parts[1]
175+
first_part.should contain("Content-Type: multipart/byteranges")
176+
first_part.should contain("Content-Range: bytes 0-4/18")
177+
first_part.split("\r\n\r\n")[1].strip.should eq("Hello")
178+
179+
# Second part (7-11)
180+
second_part = parts[2]
181+
second_part.should contain("Content-Type: multipart/byteranges")
182+
second_part.should contain("Content-Range: bytes 7-11/18")
183+
second_part.split("\r\n\r\n")[1].strip.should eq("%= na")
184+
end
185+
186+
it "handles invalid range requests" do
187+
get "/" do |env|
188+
send_file env, "#{__DIR__}/asset/hello.ecr"
189+
end
190+
191+
# Invalid range format
192+
headers = HTTP::Headers{"Range" => "invalid"}
193+
request = HTTP::Request.new("GET", "/", headers)
194+
response = call_request_on_app(request)
195+
response.status_code.should eq(200)
196+
response.body.should eq(File.read("#{__DIR__}/asset/hello.ecr"))
197+
198+
# Range out of bounds
199+
headers = HTTP::Headers{"Range" => "bytes=100-200"}
200+
request = HTTP::Request.new("GET", "/", headers)
201+
response = call_request_on_app(request)
202+
response.status_code.should eq(200)
203+
response.body.should eq(File.read("#{__DIR__}/asset/hello.ecr"))
204+
205+
# Invalid range values
206+
headers = HTTP::Headers{"Range" => "bytes=5-3"}
207+
request = HTTP::Request.new("GET", "/", headers)
208+
response = call_request_on_app(request)
209+
response.status_code.should eq(200)
210+
response.body.should eq(File.read("#{__DIR__}/asset/hello.ecr"))
211+
end
212+
213+
it "handles empty range requests" do
214+
get "/" do |env|
215+
send_file env, "#{__DIR__}/asset/hello.ecr"
216+
end
217+
218+
headers = HTTP::Headers{"Range" => "bytes="}
219+
request = HTTP::Request.new("GET", "/", headers)
220+
response = call_request_on_app(request)
221+
response.status_code.should eq(200)
222+
response.body.should eq(File.read("#{__DIR__}/asset/hello.ecr"))
223+
end
224+
225+
it "handles overlapping ranges" do
226+
get "/" do |env|
227+
send_file env, "#{__DIR__}/asset/hello.ecr"
228+
end
229+
230+
headers = HTTP::Headers{"Range" => "bytes=0-5,3-8"}
231+
request = HTTP::Request.new("GET", "/", headers)
232+
response = call_request_on_app(request)
233+
234+
response.status_code.should eq(206)
235+
response.headers["Content-Type"].should match(/^multipart\/byteranges; boundary=kemal-/)
236+
237+
# Verify both ranges are included
238+
body = response.body
239+
boundary = response.headers["Content-Type"].split("boundary=")[1]
240+
parts = body.split("--#{boundary}")
241+
# Parts structure:
242+
# 1. Empty part before first boundary
243+
# 2. First content part (0-5)
244+
# 3. Second content part (3-8)
245+
# 4. Trailing part after last boundary
246+
parts.size.should eq(4)
247+
248+
# First part (0-5)
249+
first_part = parts[1]
250+
first_part.should contain("Content-Range: bytes 0-5/18")
251+
first_part.split("\r\n\r\n")[1].strip.should eq("Hello")
252+
253+
# Second part (3-8)
254+
second_part = parts[2]
255+
second_part.should contain("Content-Range: bytes 3-8/18")
256+
second_part.split("\r\n\r\n")[1].strip.should eq("lo <%=")
257+
end
148258
end
149259

150260
describe "#gzip" do

‎spec/static_file_handler_spec.cr

+14-16
Original file line numberDiff line numberDiff line change
@@ -113,29 +113,27 @@ describe Kemal::StaticFileHandler do
113113

114114
it "should send part of files when requested (RFC7233)" do
115115
%w(POST PUT DELETE HEAD).each do |method|
116-
headers = HTTP::Headers{"Range" => "0-100"}
116+
headers = HTTP::Headers{"Range" => "bytes=0-4"}
117117
response = handle HTTP::Request.new(method, "/dir/test.txt", headers)
118118
response.status_code.should_not eq(206)
119119
response.headers.has_key?("Content-Range").should eq(false)
120120
end
121121

122122
%w(GET).each do |method|
123-
headers = HTTP::Headers{"Range" => "0-100"}
123+
headers = HTTP::Headers{"Range" => "bytes=0-4"}
124124
response = handle HTTP::Request.new(method, "/dir/test.txt", headers)
125-
response.status_code.should eq(206 || 200)
126-
if response.status_code == 206
127-
response.headers.has_key?("Content-Range").should eq true
128-
match = response.headers["Content-Range"].match(/bytes (\d+)-(\d+)\/(\d+)/)
129-
match.should_not be_nil
130-
if match
131-
start_range = match[1].to_i { 0 }
132-
end_range = match[2].to_i { 0 }
133-
range_size = match[3].to_i { 0 }
134-
135-
range_size.should eq file_size
136-
(end_range < file_size).should eq true
137-
(start_range < end_range).should eq true
138-
end
125+
response.status_code.should eq(206)
126+
response.headers.has_key?("Content-Range").should eq true
127+
match = response.headers["Content-Range"].match(/bytes (\d+)-(\d+)\/(\d+)/)
128+
match.should_not be_nil
129+
if match
130+
start_range = match[1].to_i { 0 }
131+
end_range = match[2].to_i { 0 }
132+
range_size = match[3].to_i { 0 }
133+
134+
range_size.should eq file_size
135+
(end_range < file_size).should eq true
136+
(start_range < end_range).should eq true
139137
end
140138
end
141139
end

‎src/kemal/helpers/helpers.cr

+48-11
Original file line numberDiff line numberDiff line change
@@ -205,31 +205,68 @@ end
205205
private def multipart(file, env : HTTP::Server::Context)
206206
# See http://httpwg.org/specs/rfc7233.html
207207
fileb = file.size
208-
startb = endb = 0_i64
208+
ranges = parse_ranges(env.request.headers["Range"]?, fileb)
209209

210-
if match = env.request.headers["Range"].match /bytes=(\d{1,})-(\d{0,})/
211-
startb = match[1].to_i64 { 0_i64 } if match.size >= 2
212-
endb = match[2].to_i64 { 0_i64 } if match.size >= 3
210+
if ranges.empty?
211+
env.response.content_length = fileb
212+
env.response.status_code = 200 # Range not satisfiable
213+
IO.copy(file, env.response)
214+
return
213215
end
214216

215-
endb = fileb - 1 if endb == 0
216-
217-
if startb < endb < fileb
217+
if ranges.size == 1
218+
# Single range - send as regular partial content
219+
startb, endb = ranges[0]
218220
content_length = 1_i64 + endb - startb
219221
env.response.status_code = 206
220222
env.response.content_length = content_length
221223
env.response.headers["Accept-Ranges"] = "bytes"
222-
env.response.headers["Content-Range"] = "bytes #{startb}-#{endb}/#{fileb}" # MUST
224+
env.response.headers["Content-Range"] = "bytes #{startb}-#{endb}/#{fileb}"
223225

224226
file.seek(startb)
225227
IO.copy(file, env.response, content_length)
226228
else
227-
env.response.content_length = fileb
228-
env.response.status_code = 200 # Range not satisfable, see 4.4 Note
229-
IO.copy(file, env.response)
229+
# Multiple ranges - send as multipart/byteranges
230+
boundary = "kemal-#{Random::Secure.hex(16)}"
231+
env.response.content_type = "multipart/byteranges; boundary=#{boundary}"
232+
env.response.status_code = 206
233+
env.response.headers["Accept-Ranges"] = "bytes"
234+
235+
ranges.each do |start_byte, end_byte|
236+
env.response.print "--#{boundary}\r\n"
237+
env.response.print "Content-Type: #{env.response.headers["Content-Type"]}\r\n"
238+
env.response.print "Content-Range: bytes #{start_byte}-#{end_byte}/#{fileb}\r\n"
239+
env.response.print "\r\n"
240+
241+
file.seek(start_byte)
242+
IO.copy(file, env.response, 1_i64 + end_byte - start_byte)
243+
env.response.print "\r\n"
244+
end
245+
env.response.print "--#{boundary}--\r\n"
230246
end
231247
end
232248

249+
private def parse_ranges(range_header : String?, file_size : Int64) : Array({Int64, Int64})
250+
return [] of {Int64, Int64} unless range_header
251+
252+
ranges = [] of {Int64, Int64}
253+
return ranges unless range_header.starts_with?("bytes=")
254+
255+
range_header[6..].split(",").each do |range|
256+
if match = range.match /(\d{1,})-(\d{0,})/
257+
startb = match[1].to_i64 { 0_i64 }
258+
endb = match[2].to_i64 { 0_i64 }
259+
endb = file_size - 1 if endb == 0
260+
261+
if startb < endb && endb < file_size
262+
ranges << {startb, endb}
263+
end
264+
end
265+
end
266+
267+
ranges
268+
end
269+
233270
# Set the Content-Disposition to "attachment" with the specified filename,
234271
# instructing the user agents to prompt to save.
235272
private def attachment(env : HTTP::Server::Context, filename : String? = nil, disposition : String? = nil)

0 commit comments

Comments
 (0)