Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: use saturating_sub when substracting durations to prevent underflows (#33341)

Browse source 
* net: use saturating_sub when substracting durations to prevent underflows

Signed-off-by: webbeef <me@webbeef.org>

* Add regression test. (#1)

* Add regression test.

Signed-off-by: Josh Matthews <josh@joshmatthews.net>

---------

Signed-off-by: webbeef <me@webbeef.org>
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Co-authored-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
webbeef 2024-09-08 00:36:27 -07:00 • committed by GitHub
parent 85823edd01
commit f6ae050077
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/net/http_cache.rs
View file

@ -198,10 +198,7 @@ fn get_response_expiry(response: &Response) -> Duration {
return Duration::ZERO; return Duration::ZERO;
} }
if let Some(max_age) = directives.max_age().or(directives.s_max_age()) { if let Some(max_age) = directives.max_age().or(directives.s_max_age()) {
if max_age < age { return max_age.saturating_sub(age);
return Duration::ZERO;
}
return max_age - age;
} }
} }
match response.headers.typed_get::<Expires>() { match response.headers.typed_get::<Expires>() {
@ -221,7 +218,7 @@ fn get_response_expiry(response: &Response) -> Duration {
// <https://tools.ietf.org/html/rfc7234#section-5.5.4> // <https://tools.ietf.org/html/rfc7234#section-5.5.4>
// Since presently we do not generate a Warning header field with a 113 warn-code, // Since presently we do not generate a Warning header field with a 113 warn-code,
// 24 hours minus response age is the max for heuristic calculation. // 24 hours minus response age is the max for heuristic calculation.
let max_heuristic = Duration::from_secs(24 * 60 * 60) - age; let max_heuristic = Duration::from_secs(24 * 60 * 60).saturating_sub(age);
let heuristic_freshness = if let Some(last_modified) = let heuristic_freshness = if let Some(last_modified) =
// If the response has a Last-Modified header field, // If the response has a Last-Modified header field,
// caches are encouraged to use a heuristic expiration value // caches are encouraged to use a heuristic expiration value

15
tests/wpt/mozilla/meta/MANIFEST.json vendored
View file

@ -1,5 +1,16 @@
{ {
"items": { "items": {
"crashtest": {
"mozilla": {
"cache_old_response-crash.html": [
"d14e7c830f52bb77e81d91b533e0ce6d4a1ede82",
[
null,
{}
]
]
}
},
"reftest": { "reftest": {
"css": { "css": {
"abs-overflow-stackingcontext.html": [ "abs-overflow-stackingcontext.html": [
@ -10507,6 +10518,10 @@
"59562a8c9c39130cad411815059513c4ce0a7c04", "59562a8c9c39130cad411815059513c4ce0a7c04",
[] []
], ],
"old_page.py": [
"3f096b6f5a6611f97f625d8a0420aaa96f2e2b01",
[]
],
"partial_shadow_dom_layout_style_ref.html": [ "partial_shadow_dom_layout_style_ref.html": [
"bf40d2cc35b6b2c1e32afffa0651cb1b26e41fe8", "bf40d2cc35b6b2c1e32afffa0651cb1b26e41fe8",
[] []

8
tests/wpt/mozilla/tests/mozilla/cache_old_response-crash.html vendored Normal file
View file

@ -0,0 +1,8 @@
<!DOCTYPE html>
<html>
<meta charset="utf-8">
<link rel="author" href="mailto:jdm@servo.org">
<link rel="help" href="https://github.com/servo/servo/issues/33340">
<meta name="assert" content="The http cache should not panic.">
<iframe src="old_page.py"></iframe>

14
tests/wpt/mozilla/tests/mozilla/old_page.py vendored Normal file
View file

@ -0,0 +1,14 @@
# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution.
#
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
# option. This file may not be copied, modified, or distributed
# except according to those terms.
def main(request, response):
response.headers.set(b"Age", b"90000")
response.headers.set(b"Last-Modified", b"Wed, 21 Oct 2015 07:28:00 GMT")
response.write_status_headers()
response.writer.write_content(b"Body")