mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Check all ancestor navigable trustworthiness for mixed content (#36157)
Propagate through documents a flag that represents if any of the ancestor navigables has a potentially trustworthy origin. The "potentially trustworthy origin" concept appears to have gotten confused in a couple of places and we were instead testing if a URL had "potentially trustworthy" properties. The main test for the ancestor navigables is [mixed-content/nested-iframes](https://github.com/web-platform-tests/wpt/blob/master/mixed-content/nested-iframes.window.js) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #36108 <!-- Either: --> - [X] There are tests for these changes --------- Signed-off-by: Sebastian C <sebsebmc@gmail.com>
This commit is contained in:
parent
478e876f6d
commit
76edcff202
84 changed files with 384 additions and 525 deletions
|
@ -224,33 +224,7 @@ impl ServoUrl {
|
|||
return true;
|
||||
}
|
||||
// Step 3
|
||||
self.is_origin_trustworthy()
|
||||
}
|
||||
|
||||
/// <https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy>
|
||||
pub fn is_origin_trustworthy(&self) -> bool {
|
||||
// Step 1
|
||||
if !self.origin().is_tuple() {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Step 3
|
||||
if self.scheme() == "https" || self.scheme() == "wss" {
|
||||
true
|
||||
// Steps 4-5
|
||||
} else if self.host().is_some() {
|
||||
let host = self.host_str().unwrap();
|
||||
// Step 4
|
||||
if let Ok(ip_addr) = host.parse::<IpAddr>() {
|
||||
ip_addr.is_loopback()
|
||||
// Step 5
|
||||
} else {
|
||||
host == "localhost" || host.ends_with(".localhost")
|
||||
}
|
||||
// Step 6
|
||||
} else {
|
||||
self.scheme() == "file"
|
||||
}
|
||||
self.origin().is_potentially_trustworthy()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue