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

Simplify should_be_blocked_due_to_nosniff

Browse source
This commit is contained in:
Anthony Ramine 2017-03-27 14:14:34 +02:00
parent 3b79bc2582
commit d64aa9c5bf
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/net/fetch/methods.rs
View file

@ -11,7 +11,8 @@ use http_loader::{HttpState, determine_request_referrer, http_fetch, set_default
use hyper::Error; use hyper::Error;
use hyper::error::Result as HyperResult; use hyper::error::Result as HyperResult;
use hyper::header::{Accept, AcceptLanguage, ContentLanguage, ContentType}; use hyper::header::{Accept, AcceptLanguage, ContentLanguage, ContentType};
use hyper::header::{Header, HeaderFormat, HeaderView, QualityItem, Referer as RefererHeader, q, qitem}; use hyper::header::{Header, HeaderFormat, HeaderView, Headers, QualityItem};
use hyper::header::{Referer as RefererHeader, q, qitem};
use hyper::method::Method; use hyper::method::Method;
use hyper::mime::{Mime, SubLevel, TopLevel}; use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper::status::StatusCode; use hyper::status::StatusCode;
@ -282,7 +283,8 @@ pub fn main_fetch(request: Rc<Request>,
// Step 16 // Step 16
// TODO Blocking for CSP, mixed content, MIME type // TODO Blocking for CSP, mixed content, MIME type
let blocked_error_response; let blocked_error_response;
let internal_response = if !response.is_network_error() && should_block_nosniff(&request, &response) { let internal_response =
if !response.is_network_error() && should_be_blocked_due_to_nosniff(request.type_, &response.headers) {
// Defer rebinding result // Defer rebinding result
blocked_error_response = Response::network_error(NetworkError::Internal("Blocked by nosniff".into())); blocked_error_response = Response::network_error(NetworkError::Internal("Blocked by nosniff".into()));
&blocked_error_response &blocked_error_response
@ -525,7 +527,7 @@ fn is_null_body_status(status: &Option<StatusCode>) -> bool {
} }
/// https://fetch.spec.whatwg.org/#should-response-to-request-be-blocked-due-to-nosniff? /// https://fetch.spec.whatwg.org/#should-response-to-request-be-blocked-due-to-nosniff?
fn should_block_nosniff(request: &Request, response: &Response) -> bool { fn should_be_blocked_due_to_nosniff(request_type: Type, response_headers: &Headers) -> bool {
/// https://fetch.spec.whatwg.org/#x-content-type-options-header /// https://fetch.spec.whatwg.org/#x-content-type-options-header
/// This is needed to parse `X-Content-Type-Options` according to spec, /// This is needed to parse `X-Content-Type-Options` according to spec,
/// which requires that we inspect only the first value. /// which requires that we inspect only the first value.
@ -533,7 +535,7 @@ fn should_block_nosniff(request: &Request, response: &Response) -> bool {
/// A [unit-like struct](https://doc.rust-lang.org/book/structs.html#unit-like-structs) /// A [unit-like struct](https://doc.rust-lang.org/book/structs.html#unit-like-structs)
/// is sufficient since a valid header implies that we use `nosniff`. /// is sufficient since a valid header implies that we use `nosniff`.
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
struct XContentTypeOptions(); struct XContentTypeOptions;
impl Header for XContentTypeOptions { impl Header for XContentTypeOptions {
fn header_name() -> &'static str { fn header_name() -> &'static str {
@ -545,7 +547,7 @@ fn should_block_nosniff(request: &Request, response: &Response) -> bool {
raw.first() raw.first()
.and_then(|v| str::from_utf8(v).ok()) .and_then(|v| str::from_utf8(v).ok())
.and_then(|s| match s.trim().to_lowercase().as_str() { .and_then(|s| match s.trim().to_lowercase().as_str() {
"nosniff" => Some(XContentTypeOptions()), "nosniff" => Some(XContentTypeOptions),
_ => None _ => None
}) })
.ok_or(Error::Header) .ok_or(Error::Header)
@ -558,16 +560,14 @@ fn should_block_nosniff(request: &Request, response: &Response) -> bool {
} }
} }
match response.headers.get::<XContentTypeOptions>() { // Steps 1-3.
None => return false, // Step 1 if response_headers.get::<XContentTypeOptions>().is_none() {
_ => () // Step 2 & 3 are implemented by the XContentTypeOptions struct return false;
}; }
// Step 4 // Step 4
// Note: an invalid MIME type will produce a `None`. // Note: an invalid MIME type will produce a `None`.
let content_type_header = response.headers.get::<ContentType>(); let content_type_header = response_headers.get::<ContentType>();
// Step 5
let type_ = request.type_;
/// https://html.spec.whatwg.org/multipage/#scriptingLanguages /// https://html.spec.whatwg.org/multipage/#scriptingLanguages
#[inline] #[inline]
@ -596,7 +596,7 @@ fn should_block_nosniff(request: &Request, response: &Response) -> bool {
let text_css: Mime = mime!(Text / Css); let text_css: Mime = mime!(Text / Css);
// Assumes str::starts_with is equivalent to mime::TopLevel // Assumes str::starts_with is equivalent to mime::TopLevel
return match type_ { return match request_type {
// Step 6 // Step 6
Type::Script => { Type::Script => {
match content_type_header { match content_type_header {