Added 'about:sslfail' and a reftest for SSL failure

servo · wafflespeanut · Dec 31, 2015 · Feb 19, 2016 · Feb 19, 2016 · Feb 20, 2016
commit 5bec4d4ea2bf8bec5aec75d90d0aa818829dad4b
diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs
@@ -15,6 +15,13 @@ use std::sync::Arc;
 use url::Url;
 use util::resource_files::resources_dir_path;
 
+fn url_from_non_relative_scheme(load_data: &mut LoadData, filename: &str) {
+    let mut path = resources_dir_path();
+    path.push(filename);
+    assert!(path.exists());
+    load_data.url = Url::from_file_path(&*path).unwrap();
+}
+
 pub fn factory(mut load_data: LoadData,
                start_chan: LoadConsumer,
                classifier: Arc<MIMEClassifier>,
@@ -41,13 +48,9 @@ pub fn factory(mut load_data: LoadData,
             return
         }
         "crash" => panic!("Loading the about:crash URL."),
-        "failure" | "not-found" => {
-            let mut path = resources_dir_path();
-            let file_name = non_relative_scheme_data.to_owned() + ".html";
-            path.push(&file_name);
-            assert!(path.exists());
-            load_data.url = Url::from_file_path(&*path).unwrap();
-        }
+        "failure" | "not-found" =>
+            url_from_non_relative_scheme(&mut load_data, &(non_relative_scheme_data.to_owned() + ".html")),
+        "sslfail" => url_from_non_relative_scheme(&mut load_data, "badcert.html"),
         _ => {
             send_error(load_data.url, NetworkError::Internal("Unknown about: URL.".to_owned()), start_chan);
             return

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -5380,6 +5380,18 @@
             "url": "/_mozilla/mozilla/iframe/resize_after_load.html"
           }
         ],
+        "mozilla/sslfail.html": [
+          {
+            "path": "mozilla/sslfail.html",
+            "references": [
+              [
+                "/_mozilla/mozilla/sslfail-ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/mozilla/sslfail.html"
+          }
+        ],
         "mozilla/webgl/clearcolor.html": [
           {
             "path": "mozilla/webgl/clearcolor.html",
@@ -11538,6 +11550,18 @@
           "url": "/_mozilla/mozilla/iframe/resize_after_load.html"
         }
       ],
+      "mozilla/sslfail.html": [
+        {
+          "path": "mozilla/sslfail.html",
+          "references": [
+            [
+              "/_mozilla/mozilla/sslfail-ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/mozilla/sslfail.html"
+        }
+      ],
       "mozilla/webgl/clearcolor.html": [
         {
           "path": "mozilla/webgl/clearcolor.html",

diff --git a/tests/wpt/mozilla/tests/mozilla/sslfail-ref.html b/tests/wpt/mozilla/tests/mozilla/sslfail-ref.html
@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <meta charset=utf-8>
+        <title>SSL Failure Reference</title>
+    </head>
+    <body>
+        <iframe src="about:sslfail"></iframe>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/sslfail.html b/tests/wpt/mozilla/tests/mozilla/sslfail.html
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <meta charset=utf-8>
+        <title>SSL Failure</title>
+        <link rel=match href=sslfail-ref.html>
+    </head>
+    <body>
+        <iframe src="https://somesite.org/blah"></iframe>
+    </body>
+</html>