brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

portalHelper: Replace Soup.URI with GLib.Uri

Browse Source 
GLib.Uri was added a while ago, and can replace our usage of Soup.URI.
In fact, the upcoming Soup3 drops its own URI type in favor of GLib.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1940>
This commit is contained in:
Florian Müllner 2021-08-07 03:38:15 +02:00
parent 6bf20837c0
commit 50a14caf1b
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/portalHelper/main.js
View File

@ -1,10 +1,9 @@
/* exported main */ /* exported main */
imports.gi.versions.Gtk = '3.0'; imports.gi.versions.Gtk = '3.0';
imports.gi.versions.Soup = '2.4';
const Format = imports.format; const Format = imports.format;
const Gettext = imports.gettext; const Gettext = imports.gettext;
const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi; const { Gio, GLib, GObject, Gtk, Pango, WebKit2: WebKit } = imports.gi;
const _ = Gettext.gettext; const _ = Gettext.gettext;
@ -23,6 +22,14 @@ const PortalHelperSecurityLevel = {
INSECURE: 2, INSECURE: 2,
}; };
const HTTP_URI_FLAGS =
GLib.UriFlags.HAS_PASSWORD |
GLib.UriFlags.ENCODED_PATH |
GLib.UriFlags.ENCODED_QUERY |
GLib.UriFlags.ENCODED_FRAGMENT |
GLib.UriFlags.SCHEME_NORMALIZE |
GLib.UriFlags.PARSE_RELAXED;
const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org'; const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC; const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
@ -108,7 +115,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
} else { } else {
this._originalUrlWasGnome = false; this._originalUrlWasGnome = false;
} }
this._uri = new Soup.URI(url); this._uri = GLib.Uri.parse(url, HTTP_URI_FLAGS);
this._everSeenRedirect = false; this._everSeenRedirect = false;
this._originalUrl = url; this._originalUrl = url;
this._doneCallback = doneCallback; this._doneCallback = doneCallback;
@ -186,7 +193,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
_onLoadFailedWithTlsErrors(view, failingURI, certificate, _errors) { _onLoadFailedWithTlsErrors(view, failingURI, certificate, _errors) {
this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE); this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
let uri = new Soup.URI(failingURI); let uri = GLib.Uri.parse(failingURI, HTTP_URI_FLAGS);
this._webContext.allow_tls_certificate_for_host(certificate, uri.get_host()); this._webContext.allow_tls_certificate_for_host(certificate, uri.get_host());
this._webView.load_uri(failingURI); this._webView.load_uri(failingURI);
return true; return true;
@ -214,9 +221,9 @@ class PortalWindow extends Gtk.ApplicationWindow {
return false; return false;
let request = decision.get_request(); let request = decision.get_request();
let uri = new Soup.URI(request.get_uri()); const uri = GLib.Uri.parse(request.get_uri(), HTTP_URI_FLAGS);
if (!uri.host_equal(this._uri) && this._originalUrlWasGnome) { if (uri.get_host() !== this._uri.get_host() && this._originalUrlWasGnome) {
if (uri.get_host() == CONNECTIVITY_CHECK_HOST && this._everSeenRedirect) { if (uri.get_host() == CONNECTIVITY_CHECK_HOST && this._everSeenRedirect) {
// Yay, we got to gnome! // Yay, we got to gnome!
decision.ignore(); decision.ignore();