65 lines
2.5 KiB
Diff
65 lines
2.5 KiB
Diff
|
From d104ebf6120a9396df4977763ebaf3624deeb6cb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bastien Nocera <hadess@hadess.net>
|
||
|
|
Date: Thu, 18 May 2017 18:13:12 +0200
|
||
|
|
Subject: portalHelper: Don't go through proxies for captive portals
|
||
|
|
|
||
|
|
When using an SSH tunnel (through a SOCKS proxy) to funnel all
|
||
|
|
the outgoing traffic, we need the captive portal to not go through that
|
||
|
|
proxy, otherwise we can't go through the proxy because we're not
|
||
|
|
connected to the Internet and we can't go through the portal because
|
||
|
|
we're not connected through the proxy.
|
||
|
|
|
||
|
|
This fixes a blank captive portal window and no error reporting in that
|
||
|
|
particular configuration.
|
||
|
|
|
||
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=769692
|
||
|
|
---
|
||
|
|
js/portalHelper/main.js | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
|
||
|
|
index b721f6a..39e0c2b 100644
|
||
|
|
--- a/js/portalHelper/main.js
|
||
|
|
+++ b/js/portalHelper/main.js
|
||
|
|
@@ -143,6 +143,7 @@ const PortalWindow = new Lang.Class({
|
||
|
|
|
||
|
|
this._webContext = WebKit.WebContext.new_ephemeral();
|
||
|
|
this._webContext.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
|
||
|
|
+ this._webContext.set_network_proxy_settings(WebKit.NetworkProxyMode.NO_PROXY, null);
|
||
|
|
|
||
|
|
this._webView = WebKit.WebView.new_with_context(this._webContext);
|
||
|
|
this._webView.connect('decide-policy', Lang.bind(this, this._onDecidePolicy));
|
||
|
|
--
|
||
|
|
cgit v0.12
|
||
|
|
|
||
|
|
|
||
|
|
From aa08bd75d086d275aab41f829e3ea40dbce7e9e9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bastien Nocera <hadess@hadess.net>
|
||
|
|
Date: Wed, 31 May 2017 16:03:16 +0200
|
||
|
|
Subject: portalHelper: Fix auth URI not being passed to window
|
||
|
|
|
||
|
|
Gjs-Message: JS WARNING: [resource:///org/gnome/shell/portalHelper/main.js 360]: reference to undefined property top.uri
|
||
|
|
is caused by the URI variable actually being called "url".
|
||
|
|
|
||
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=783286
|
||
|
|
---
|
||
|
|
js/portalHelper/main.js | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
|
||
|
|
index 39e0c2b..31ae969 100644
|
||
|
|
--- a/js/portalHelper/main.js
|
||
|
|
+++ b/js/portalHelper/main.js
|
||
|
|
@@ -357,7 +357,7 @@ const WebPortalHelper = new Lang.Class({
|
||
|
|
if (top.window != null)
|
||
|
|
return;
|
||
|
|
|
||
|
|
- top.window = new PortalWindow(this, top.uri, top.timestamp, Lang.bind(this, function(result) {
|
||
|
|
+ top.window = new PortalWindow(this, top.url, top.timestamp, Lang.bind(this, function(result) {
|
||
|
|
this._dbusImpl.emit_signal('Done', new GLib.Variant('(ou)', [top.connection, result]));
|
||
|
|
}));
|
||
|
|
},
|
||
|
|
--
|
||
|
|
cgit v0.12
|
||
|
|
|