Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
04477264
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
04477264
编写于
10月 08, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
HttpRange validates requested ranges
Issue: SPR-17318
上级
d15abfdb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
78 addition
and
8 deletion
+78
-8
spring-web/src/main/java/org/springframework/http/HttpRange.java
...web/src/main/java/org/springframework/http/HttpRange.java
+30
-7
spring-web/src/test/java/org/springframework/http/HttpRangeTests.java
...rc/test/java/org/springframework/http/HttpRangeTests.java
+48
-1
未找到文件。
spring-web/src/main/java/org/springframework/http/HttpRange.java
浏览文件 @
04477264
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
8
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -43,6 +43,9 @@ import org.springframework.util.StringUtils;
*/
public
abstract
class
HttpRange
{
/** Maximum ranges per request. */
private
static
final
int
MAX_RANGES
=
100
;
private
static
final
String
BYTE_RANGE_PREFIX
=
"bytes="
;
...
...
@@ -58,16 +61,23 @@ public abstract class HttpRange {
// Note: custom InputStreamResource subclasses could provide a pre-calculated content length!
Assert
.
isTrue
(
resource
.
getClass
()
!=
InputStreamResource
.
class
,
"Cannot convert an InputStreamResource to a ResourceRegion"
);
long
contentLength
=
getLengthFor
(
resource
);
Assert
.
isTrue
(
contentLength
>
0
,
"Resource content length should be > 0"
);
long
start
=
getRangeStart
(
contentLength
);
long
end
=
getRangeEnd
(
contentLength
);
return
new
ResourceRegion
(
resource
,
start
,
end
-
start
+
1
);
}
private
static
long
getLengthFor
(
Resource
resource
)
{
long
contentLength
;
try
{
long
contentLength
=
resource
.
contentLength
();
contentLength
=
resource
.
contentLength
();
Assert
.
isTrue
(
contentLength
>
0
,
"Resource content length should be > 0"
);
long
start
=
getRangeStart
(
contentLength
);
long
end
=
getRangeEnd
(
contentLength
);
return
new
ResourceRegion
(
resource
,
start
,
end
-
start
+
1
);
}
catch
(
IOException
ex
)
{
throw
new
IllegalArgumentException
(
"Failed to
convert Resource to ResourceRegion
"
,
ex
);
throw
new
IllegalArgumentException
(
"Failed to
obtain Resource content length
"
,
ex
);
}
return
contentLength
;
}
/**
...
...
@@ -121,7 +131,8 @@ public abstract class HttpRange {
* <p>This method can be used to parse an {@code Range} header.
* @param ranges the string to parse
* @return the list of ranges
* @throws IllegalArgumentException if the string cannot be parsed
* @throws IllegalArgumentException if the string cannot be parsed, or if
* the number of ranges is greater than 100.
*/
public
static
List
<
HttpRange
>
parseRanges
(
String
ranges
)
{
if
(!
StringUtils
.
hasLength
(
ranges
))
{
...
...
@@ -133,6 +144,7 @@ public abstract class HttpRange {
ranges
=
ranges
.
substring
(
BYTE_RANGE_PREFIX
.
length
());
String
[]
tokens
=
StringUtils
.
tokenizeToStringArray
(
ranges
,
","
);
Assert
.
isTrue
(
tokens
.
length
<=
MAX_RANGES
,
"Too many ranges "
+
tokens
.
length
);
List
<
HttpRange
>
result
=
new
ArrayList
<
HttpRange
>(
tokens
.
length
);
for
(
String
token
:
tokens
)
{
result
.
add
(
parseRange
(
token
));
...
...
@@ -169,6 +181,8 @@ public abstract class HttpRange {
* @param resource the resource to select the regions from
* @return the list of regions for the given resource
* @since 4.3
* @throws IllegalArgumentException if the sum of all ranges exceeds the
* resource length.
*/
public
static
List
<
ResourceRegion
>
toResourceRegions
(
List
<
HttpRange
>
ranges
,
Resource
resource
)
{
if
(
CollectionUtils
.
isEmpty
(
ranges
))
{
...
...
@@ -178,6 +192,15 @@ public abstract class HttpRange {
for
(
HttpRange
range
:
ranges
)
{
regions
.
add
(
range
.
toResourceRegion
(
resource
));
}
if
(
ranges
.
size
()
>
1
)
{
long
length
=
getLengthFor
(
resource
);
long
total
=
0
;
for
(
ResourceRegion
region
:
regions
)
{
total
+=
region
.
getCount
();
}
Assert
.
isTrue
(
total
<
length
,
"The sum of all ranges ("
+
total
+
") "
+
"should be less than the resource length ("
+
length
+
")"
);
}
return
regions
;
}
...
...
spring-web/src/test/java/org/springframework/http/HttpRangeTests.java
浏览文件 @
04477264
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -18,6 +18,7 @@ package org.springframework.http;
import
java.io.IOException
;
import
java.nio.charset.Charset
;
import
java.nio.charset.StandardCharsets
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -101,6 +102,31 @@ public class HttpRangeTests {
assertEquals
(
999
,
ranges
.
get
(
2
).
getRangeEnd
(
1000
));
}
@Test
public
void
parseRangesValidations
()
{
// 1. At limit..
StringBuilder
sb
=
new
StringBuilder
(
"bytes=0-0"
);
for
(
int
i
=
0
;
i
<
99
;
i
++)
{
sb
.
append
(
","
).
append
(
i
).
append
(
"-"
).
append
(
i
+
1
);
}
List
<
HttpRange
>
ranges
=
HttpRange
.
parseRanges
(
sb
.
toString
());
assertEquals
(
100
,
ranges
.
size
());
// 2. Above limit..
sb
=
new
StringBuilder
(
"bytes=0-0"
);
for
(
int
i
=
0
;
i
<
100
;
i
++)
{
sb
.
append
(
","
).
append
(
i
).
append
(
"-"
).
append
(
i
+
1
);
}
try
{
HttpRange
.
parseRanges
(
sb
.
toString
());
fail
();
}
catch
(
IllegalArgumentException
ex
)
{
// Expected
}
}
@Test
public
void
rangeToString
()
{
List
<
HttpRange
>
ranges
=
new
ArrayList
<>();
...
...
@@ -145,4 +171,25 @@ public class HttpRangeTests {
range
.
toResourceRegion
(
resource
);
}
@Test
public
void
toResourceRegionsValidations
()
{
byte
[]
bytes
=
"12345"
.
getBytes
(
StandardCharsets
.
UTF_8
);
ByteArrayResource
resource
=
new
ByteArrayResource
(
bytes
);
// 1. Below full length
List
<
HttpRange
>
ranges
=
HttpRange
.
parseRanges
(
"bytes=0-1,2-3"
);
List
<
ResourceRegion
>
regions
=
HttpRange
.
toResourceRegions
(
ranges
,
resource
);
assertEquals
(
2
,
regions
.
size
());
// 2. At full length
ranges
=
HttpRange
.
parseRanges
(
"bytes=0-1,2-4"
);
try
{
HttpRange
.
toResourceRegions
(
ranges
,
resource
);
fail
();
}
catch
(
IllegalArgumentException
ex
)
{
// Expected..
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录