Skip to content

Ignore a Range header whose value is not well-formed #1672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
17krishna8 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ignore a Range header whose value is not well-formed #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...s/src/test/java/org/apache/wicket/core/request/resource/PackageResourceReferenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,14 @@ void testContentRange()
assertEquals("var_style_en.txt", makeRangeRequest("bytes=9-"));
assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-"));
assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=-25"));

// malformed ranges are ignored
assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=5"));
assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=abc"));
assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes=1-x"));
assertEquals("resource_var_style_en.txt",
makeRangeRequest("bytes=99999999999999999999-"));
assertEquals("resource_var_style_en.txt", makeRangeRequest("bytes 5-10"));
}

private String makeRangeRequest(String range)
Expand Down
43 changes: 28 additions & 15 deletions wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,25 +732,38 @@ protected void setRequestRangeMetaData(WebRequest webRequest)
// fixing white spaces
rangeHeader = rangeHeader.replaceAll(" ", "");

String range = rangeHeader.substring(rangeHeader.indexOf('=') + 1,
rangeHeader.length());

// support only the first range (WICKET-5995)
final int idxOfComma = range.indexOf(',');
String firstRange = idxOfComma > -1 ? range.substring(0, idxOfComma) : range;
int eqIndex = rangeHeader.indexOf('=');

String[] rangeParts = Strings.split(firstRange, '-');
String range = eqIndex > -1 ? rangeHeader.substring(eqIndex + 1) : null;

String startByteString = rangeParts[0];
String endByteString = rangeParts[1];
if (range != null)
{
// support only the first range (WICKET-5995)
final int idxOfComma = range.indexOf(',');
String firstRange = idxOfComma > -1 ? range.substring(0, idxOfComma) : range;

long startbyte = !Strings.isEmpty(startByteString) ? Long.parseLong(startByteString) : 0;
long endbyte = !Strings.isEmpty(endByteString) ? Long.parseLong(endByteString) : -1;
String[] rangeParts = Strings.split(firstRange, '-');

// Make the content range information available for the whole request cycle
RequestCycle requestCycle = RequestCycle.get();
requestCycle.setMetaData(CONTENT_RANGE_STARTBYTE, startbyte);
requestCycle.setMetaData(CONTENT_RANGE_ENDBYTE, endbyte);
if (rangeParts.length == 2)
{
try
{
long startbyte = !Strings.isEmpty(rangeParts[0])
? Long.parseLong(rangeParts[0]) : 0;
long endbyte = !Strings.isEmpty(rangeParts[1])
? Long.parseLong(rangeParts[1]) : -1;

// Make the content range information available for the whole request cycle
RequestCycle requestCycle = RequestCycle.get();
requestCycle.setMetaData(CONTENT_RANGE_STARTBYTE, startbyte);
requestCycle.setMetaData(CONTENT_RANGE_ENDBYTE, endbyte);
}
catch (NumberFormatException e)
{
// a malformed range is ignored and the whole resource is served
}
}
}
}
}

Expand Down