Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 2adaaea4fb76 (bug 1758087) as per developer's request. CLOSED TREE

Browse Source
This commit is contained in:
Csoregi Natalia 2022-03-04 22:58:31 +02:00
parent f72f793143
commit ed39c78974
16 changed files with 0 additions and 531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser/components/BrowserGlue.jsm
View File

@ -186,21 +186,6 @@ let JSPROCESSACTORS = {
* available at https://firefox-source-docs.mozilla.org/dom/ipc/jsactors.html
*/
let JSWINDOWACTORS = {
AboutDoHError: {
parent: {
moduleURI: "resource:///actors/AboutDoHErrorParent.jsm",
},
child: {
moduleURI: "resource:///actors/AboutDoHErrorChild.jsm",
events: {
DoHAllowFallback: { wantUntrusted: true },
DoHRetry: { wantUntrusted: true },
},
},
matches: ["about:doherror?*"],
allFrames: true,
},
AboutLogins: {
parent: {
moduleURI: "resource:///actors/AboutLoginsParent.jsm",

4
browser/components/about/AboutRedirector.cpp
View File

@ -141,10 +141,6 @@ static const RedirEntry kRedirMap[] = {
{"ion", "chrome://browser/content/ion.html",
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
nsIAboutModule::IS_SECURE_CHROME_UI},
{"doherror", "chrome://browser/content/doh/aboutDoHError.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
nsIAboutModule::HIDE_FROM_ABOUTABOUT},
};
static nsAutoCString GetAboutModuleName(nsIURI* aURI) {

1
browser/components/about/components.conf
View File

@ -7,7 +7,6 @@
pages = [
'blocked',
'certerror',
'doherror',
'downloads',
'framecrashed',
'home',

22
browser/components/doh/AboutDoHErrorChild.jsm
View File

@ -1,22 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AboutDoHErrorChild"];
class AboutDoHErrorChild extends JSWindowActorChild {
handleEvent(event) {
switch (event.type) {
case "DoHAllowFallback": {
this.sendAsyncMessage("DoH:AllowFallback");
break;
}
case "DoHRetry": {
this.sendAsyncMessage("DoH:Retry");
break;
}
}
}
}

57
browser/components/doh/AboutDoHErrorParent.jsm
View File

@ -1,57 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AboutDoHErrorParent"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
XPCOMUtils.defineLazyModuleGetters(this, {
Services: "resource://gre/modules/Services.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
this,
"dnsService",
"@mozilla.org/network/dns-service;1",
"nsIDNSService"
);
XPCOMUtils.defineLazyGlobalGetters(this, ["URLSearchParams"]);
class AboutDoHErrorParent extends JSWindowActorParent {
receiveMessage({ name }) {
let params = new URLSearchParams(
this.browsingContext.currentWindowContext.documentURI.query
);
let url = params.get("u");
if (!url) {
return;
}
switch (name) {
case "DoH:AllowFallback": {
// Switch TRR to allow fallback and reload the url.
Services.prefs.setIntPref("network.trr.mode", 2);
dnsService.clearCache(true);
this.browsingContext.top.embedderElement.loadURI(url, {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
loadFlags: Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY,
});
break;
}
case "DoH:Retry": {
this.browsingContext.top.embedderElement.loadURI(url, {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
loadFlags: Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY,
});
break;
}
}
}
}

20
browser/components/doh/content/aboutDoHError.js
View File

@ -1,20 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
document.getElementById("retry").addEventListener("click", () => {
document.dispatchEvent(new CustomEvent("DoHRetry", { bubbles: true }));
});
document.getElementById("allowFallback").addEventListener("click", () => {
document.dispatchEvent(
new CustomEvent("DoHAllowFallback", { bubbles: true })
);
});
document.getElementById("learnMoreLink").addEventListener("click", () => {
let block = document.getElementById("learn-more-block");
block.hidden = !block.hidden;
});

43
browser/components/doh/content/aboutDoHError.xhtml
View File

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" />
<meta name="color-scheme" content="light dark" />
<link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" />
<link rel="stylesheet" href="chrome://browser/skin/aboutDoHError.css" />
<link rel="localization" href="branding/brand.ftl" />
<link rel="localization" href="browser/aboutDoHError.ftl" />
<link rel="icon" id="favicon" href="chrome://global/skin/icons/info.svg" />
<title data-l10n-id="doh-block-tracking-warning"></title>
</head>
<body>
<main class="container">
<div class="title">
<h2 data-l10n-id="doh-block-tracking-warning"></h2>
<h1 class="title-text" data-l10n-id="doh-block-block-headline"></h1>
</div>
<p id="insecure-explanation-unavailable" data-l10n-id="doh-block-explanation"></p>
<p id="learn-more-container">
<a id="learnMoreLink" target="_blank" data-l10n-id="doh-block-link-learn-more"></a>
</p>
<ul id="learn-more-block" hidden="true">
<li data-l10n-id="doh-block-details-1"></li>
<li data-l10n-id="doh-block-details-2"></li>
<li data-l10n-id="doh-block-details-3"></li>
<li data-l10n-id="doh-block-details-4"></li>
</ul>
<div class="button-container">
<button id="retry" data-l10n-id="doh-block-button-retry"></button>
<button id="allowFallback" data-l10n-id="doh-block-button-accept-tracking"></button>
</div>
</main>
<script src="chrome://browser/content/doh/aboutDoHError.js"></script>
</body>
</html>

7
browser/components/doh/jar.mn
View File

@ -1,7 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/doh/aboutDoHError.xhtml (content/aboutDoHError.xhtml)
content/browser/doh/aboutDoHError.js (content/aboutDoHError.js)

7
browser/components/doh/moz.build
View File

@ -14,13 +14,6 @@ EXTRA_JS_MODULES += [
"TRRPerformance.jsm",
]
FINAL_TARGET_FILES.actors += [
"AboutDoHErrorChild.jsm",
"AboutDoHErrorParent.jsm",
]
JAR_MANIFESTS += ["jar.mn"]
TESTING_JS_MODULES += [
"DoHTestUtils.jsm",
]

1
browser/components/doh/test/browser/browser.ini
View File

@ -5,7 +5,6 @@ head = head.js
skip-if = socketprocess_networking
[browser_dirtyEnable.js]
[browser_doorhangerUserReject.js]
[browser_errorPage.js]
[browser_localStorageMigration.js]
[browser_NextDNSMigration.js]
[browser_policyOverride.js]

263
browser/components/doh/test/browser/browser_errorPage.js
View File

@ -1,263 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
let dnsService = Cc["@mozilla.org/network/dns-service;1"].getService(
Ci.nsIDNSService
);
let dnsOverride = Cc["@mozilla.org/network/native-dns-override;1"].getService(
Ci.nsINativeDNSResolverOverride
);
let { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
let gPort;
function loadHandler(metadata, response) {
response.setStatusLine(metadata.httpVersion, 200, "Ok");
response.setHeader("Content-Type", "text/html", false);
let body = `
<!DOCTYPE HTML>
<html>
<head>
<meta charset='utf-8'>
<title>Ok</title>
</head>
<body>
Ok
</body>
</html>`;
response.bodyOutputStream.write(body, body.length);
}
add_setup(() => {
dnsOverride.addIPOverride("wubble.com", "127.0.0.1");
dnsOverride.addIPOverride("wibble.com", "127.0.0.1");
// Strict native fallback introduces a race condition we can ignore here.
Services.prefs.setBoolPref("network.trr.strict_native_fallback", false);
Services.prefs.setBoolPref("network.trr.show_error_page", true);
let httpServer = new HttpServer();
httpServer.registerPathHandler("/foo", loadHandler);
httpServer.start(-1);
gPort = httpServer.identity.primaryPort;
registerCleanupFunction(() => {
Services.prefs.clearUserPref("network.trr.mode");
Services.prefs.clearUserPref("network.trr.uri");
Services.prefs.clearUserPref("network.trr.strict_native_fallback");
Services.prefs.clearUserPref("network.trr.show_error_page");
dnsOverride.clearHostOverride("wubble.com");
dnsOverride.clearHostOverride("wibble.com");
httpServer.stop();
});
});
async function errorPageLoaded(browser) {
await BrowserTestUtils.browserLoaded(browser, false, null, true);
// Wait for the content to layout.
await SpecialPowers.spawn(browser, [], async () => {
await ContentTaskUtils.waitForCondition(() => {
let element = content.document.getElementById("learnMoreLink");
let { width } = element.getBoundingClientRect();
return width > 0;
});
await ContentTaskUtils.waitForCondition(() => {
let element = content.document.getElementById("retry");
let { width } = element.getBoundingClientRect();
return width > 0;
});
});
}
async function realPageLoaded(browser) {
await BrowserTestUtils.browserLoaded(browser);
}
add_task(async function test_reload() {
let TEST_URL = `http://wubble.com:${gPort}/foo`;
// Set TRR only mode and use our test server (which won't respond to TRR requests).
Services.prefs.setIntPref("network.trr.mode", 3);
Services.prefs.setCharPref("network.trr.uri", "https://example.com");
await BrowserTestUtils.withNewTab("about:blank", async browser => {
let loaded = errorPageLoaded(browser);
BrowserTestUtils.loadURI(browser, TEST_URL);
await loaded;
let { loadedPage, sourceUrl } = await SpecialPowers.spawn(
browser,
[],
async () => {
let documentURI = new content.URL(content.document.documentURI);
return {
loadedPage: content.document.documentURI.split("?")[0],
sourceUrl: documentURI.searchParams.get("u"),
};
}
);
Assert.equal(
loadedPage,
"about:doherror",
"Should have loaded the error page."
);
Assert.equal(
sourceUrl,
TEST_URL,
"Should have passed the right source page."
);
let sectionVisible = await SpecialPowers.spawn(browser, [], () =>
ContentTaskUtils.is_visible(
content.document.getElementById("learn-more-block")
)
);
Assert.ok(!sectionVisible, "Advanced section should be hidden.");
await BrowserTestUtils.synthesizeMouseAtCenter(
"#learnMoreLink",
{},
browser
);
await SpecialPowers.spawn(browser, [], () =>
ContentTaskUtils.waitForCondition(
() =>
ContentTaskUtils.is_visible(
content.document.getElementById("learn-more-block")
),
"Wait for section to show"
)
);
await BrowserTestUtils.synthesizeMouseAtCenter(
"#learnMoreLink",
{},
browser
);
await SpecialPowers.spawn(browser, [], () =>
ContentTaskUtils.waitForCondition(
() =>
ContentTaskUtils.is_hidden(
content.document.getElementById("learn-more-block")
),
"Wait for section to hide"
)
);
// Click to retry.
info("Retrying the load");
loaded = errorPageLoaded(browser);
await BrowserTestUtils.synthesizeMouseAtCenter("#retry", {}, browser);
await loaded;
({ loadedPage, sourceUrl } = await SpecialPowers.spawn(
browser,
[],
async () => {
let documentURI = new content.URL(content.document.documentURI);
return {
loadedPage: content.document.documentURI.split("?")[0],
sourceUrl: documentURI.searchParams.get("u"),
};
}
));
Assert.equal(
loadedPage,
"about:doherror",
"Should have loaded the error page."
);
Assert.equal(
sourceUrl,
TEST_URL,
"Should have passed the right source page."
);
// Manually allow fallback and try again
Services.prefs.setIntPref("network.trr.mode", 2);
dnsService.clearCache(true);
info("Retrying the load");
loaded = realPageLoaded(browser);
await BrowserTestUtils.synthesizeMouseAtCenter("#retry", {}, browser);
await loaded;
let loadedUrl = await SpecialPowers.spawn(
browser,
[],
() => content.document.documentURI
);
Assert.equal(loadedUrl, TEST_URL, "Should have loaded the right page.");
});
});
add_task(async () => {
let TEST_URL = `http://wibble.com:${gPort}/foo`;
// Set TRR only mode and use our test server (which won't respond to TRR requests).
Services.prefs.setIntPref("network.trr.mode", 3);
Services.prefs.setCharPref("network.trr.uri", "https://example.com");
await BrowserTestUtils.withNewTab("about:blank", async browser => {
let loaded = errorPageLoaded(browser);
BrowserTestUtils.loadURI(browser, TEST_URL);
await loaded;
let { loadedPage, sourceUrl } = await SpecialPowers.spawn(
browser,
[],
async () => {
let documentURI = new content.URL(content.document.documentURI);
return {
loadedPage: content.document.documentURI.split("?")[0],
sourceUrl: documentURI.searchParams.get("u"),
};
}
);
Assert.equal(
loadedPage,
"about:doherror",
"Should have loaded the error page."
);
Assert.equal(
sourceUrl,
TEST_URL,
"Should have passed the right source page."
);
// Allow the fallback and reload.
info("Retrying the load");
loaded = realPageLoaded(browser);
await BrowserTestUtils.synthesizeMouseAtCenter(
"#allowFallback",
{},
browser
);
await loaded;
let loadedUrl = await SpecialPowers.spawn(
browser,
[],
() => content.document.documentURI
);
Assert.equal(loadedUrl, TEST_URL, "Should have loaded the right page.");
Assert.equal(
Services.prefs.getIntPref("network.trr.mode"),
2,
"Should have configured TRR to allow the fallback"
);
});
});

17
browser/locales/en-US/browser/aboutDoHError.ftl
View File

@ -1,17 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
doh-block-tracking-warning = Tracking Warning
doh-block-block-headline = Part of { -brand-short-name }’s anti-tracking protection has been blocked
doh-block-explanation = To continue browsing you will need to turn this anti-tracking feature off. This means that ISPs and network providers will be able to see which websites you visit.
doh-block-link-learn-more = Advanced Details…
doh-block-details-1 = DNS is an initial setup step before you connect to any website
doh-block-details-2 = { -brand-short-name } has enabled “DNS over HTTPS” which encrypts this initial step
doh-block-details-3 = However DNS over HTTPS is unable to connect
doh-block-details-4 = Unencrypted DNS is not blocked
doh-block-button-retry = Retry with anti-tracking
doh-block-button-accept-tracking = Accept tracking and continue

47
browser/themes/shared/aboutDoHError.css
View File

@ -1,47 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
.title > h2 {
padding: 0;
margin: 0;
font-size: 17px;
font-weight: 500;
}
.title {
background-image: url("chrome://global/content/httpsonlyerror/secure-broken.svg");
}
em {
font-style: normal;
font-weight: 600;
}
#insecure-explanation-unavailable {
margin-bottom: 0.5em;
}
#learn-more-container {
margin-block: 0 2em;
}
.button-container {
display: flex;
flex-flow: row wrap;
justify-content: end;
}
@media only screen and (max-width: 480px) {
.button-container button {
width: 100%;
margin: 0.66em 0 0;
}
}
ul > li {
line-height: 1.5em;
}
.container {
position: relative;
}

1
browser/themes/shared/jar.inc.mn
View File

@ -7,7 +7,6 @@
# be specified once. As a result, the source file paths are relative
# to the location of the actual manifest.
skin/classic/browser/aboutDoHError.css (../shared/aboutDoHError.css)
skin/classic/browser/aboutFrameCrashed.css (../shared/aboutFrameCrashed.css)
skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css)
skin/classic/browser/aboutRestartRequired.css (../shared/aboutRestartRequired.css)

20
docshell/base/nsDocShell.cpp
View File

@ -42,7 +42,6 @@
#include "mozilla/StaticPrefs_docshell.h"
#include "mozilla/StaticPrefs_dom.h"
#include "mozilla/StaticPrefs_extensions.h"
#include "mozilla/StaticPrefs_network.h"
#include "mozilla/StaticPrefs_privacy.h"
#include "mozilla/StaticPrefs_security.h"
#include "mozilla/StaticPrefs_ui.h"
@ -111,7 +110,6 @@
#include "nsIContentSecurityPolicy.h"
#include "nsIContentViewer.h"
#include "nsIController.h"
#include "nsIDNSService.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeOwner.h"
#include "mozilla/dom/Document.h"
@ -3840,24 +3838,6 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
errorPage.AssignLiteral("httpsonlyerror");
}
// If the channel is in TRR only mode and this is a host error then use
// the DoH error page.
if ((aError == NS_ERROR_UNKNOWN_HOST ||
aError == NS_ERROR_UNKNOWN_PROXY_HOST) &&
StaticPrefs::network_trr_show_error_page()) {
nsIRequest::TRRMode mode = aFailedChannel ? aFailedChannel->GetTRRMode()
: nsIRequest::TRR_DEFAULT_MODE;
bool trrOnly = mode == nsIRequest::TRR_ONLY_MODE;
if (mode == nsIRequest::TRR_DEFAULT_MODE) {
trrOnly = Preferences::GetInt("network.trr.mode", 0) ==
nsIDNSService::MODE_TRRONLY;
}
if (trrOnly) {
errorPage.AssignLiteral("doherror");
}
}
if (nsCOMPtr<nsILoadURIDelegate> loadURIDelegate = GetLoadURIDelegate()) {
nsCOMPtr<nsIURI> errorPageURI;
rv = loadURIDelegate->HandleLoadError(

6
modules/libpref/init/StaticPrefList.yaml
View File

@ -10551,12 +10551,6 @@
value: false
mirror: always
# Whether to show an error in strict mode
- name: network.trr.show_error_page
type: bool
value: false
mirror: always
# Allow the network changed event to get sent when a network topology or setup
# change is noticed while running.
- name: network.notify.changed