Skip to content

browser(firefox): delete Browser.setIgnoreHTTPSErrors #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yury-s merged 1 commit into from
Apr 1, 2020
Merged

browser(firefox): delete Browser.setIgnoreHTTPSErrors #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion browser_patches/firefox/BUILD_NUMBER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1067
1068
26 changes: 4 additions & 22 deletions browser_patches/firefox/patches/bootstrap.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5140,16 +5140,13 @@ index 0000000000000000000000000000000000000000..bf37558bccc48f4d90eadc971c1eb3e4
+this.AccessibilityHandler = AccessibilityHandler;
diff --git a/juggler/protocol/BrowserHandler.js b/juggler/protocol/BrowserHandler.js
new file mode 100644
index 0000000000000000000000000000000000000000..b26325857d87f714f1250a52f233644806a61ebf
index 0000000000000000000000000000000000000000..f63ee04a355e7426e13bd7095365bf44bb44648d
--- /dev/null
+++ b/juggler/protocol/BrowserHandler.js
@@ -0,0 +1,196 @@
@@ -0,0 +1,183 @@
+"use strict";
+
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { allowAllCerts } = ChromeUtils.import(
+ "chrome://marionette/content/cert.js"
+);
+const {TargetRegistry} = ChromeUtils.import("chrome://juggler/content/TargetRegistry.js");
+const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
+
Expand Down Expand Up @@ -5268,16 +5265,6 @@ index 0000000000000000000000000000000000000000..b26325857d87f714f1250a52f2336448
+ Services.startup.quit(Ci.nsIAppStartup.eForceQuit);
+ }
+
+ async setIgnoreHTTPSErrors({enabled}) {
+ if (!enabled) {
+ allowAllCerts.disable()
+ Services.prefs.setBoolPref('security.mixed_content.block_active_content', true);
+ } else {
+ allowAllCerts.enable()
+ Services.prefs.setBoolPref('security.mixed_content.block_active_content', false);
+ }
+ }
+
+ async grantPermissions({browserContextId, origin, permissions}) {
+ await this._targetRegistry.browserContextForId(browserContextId).grantPermissions(origin, permissions);
+ }
Expand Down Expand Up @@ -6146,10 +6133,10 @@ index 0000000000000000000000000000000000000000..78b6601b91d0b7fcda61114e6846aa07
+this.EXPORTED_SYMBOLS = ['t', 'checkScheme'];
diff --git a/juggler/protocol/Protocol.js b/juggler/protocol/Protocol.js
new file mode 100644
index 0000000000000000000000000000000000000000..41bd5059dafd9b9f192f8792110e8e3a5d1c7b20
index 0000000000000000000000000000000000000000..e5482da00da11c88b278164b148f44c724cb0c89
--- /dev/null
+++ b/juggler/protocol/Protocol.js
@@ -0,0 +1,780 @@
@@ -0,0 +1,775 @@
+const {t, checkScheme} = ChromeUtils.import('chrome://juggler/content/protocol/PrimitiveTypes.js');
+
+// Protocol-specific types.
Expand Down Expand Up @@ -6392,11 +6379,6 @@ index 0000000000000000000000000000000000000000..41bd5059dafd9b9f192f8792110e8e3a
+ version: t.String,
+ },
+ },
+ 'setIgnoreHTTPSErrors': {
+ params: {
+ enabled: t.Boolean,
+ },
+ },
+ 'setExtraHTTPHeaders': {
+ params: {
+ browserContextId: t.Optional(t.String),
Expand Down