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

PortalHelper: fix portals that don't redirect properly

Browse Source 
We assumed that either a portal would give us a target URI, or we
would eventually reach the URI of our choice (which is http://www.gnome.org)

This is not always the case: even after a successful login we may
stay in a confirmation page, so make sure that every time we see a
redirect we trigger a connectivity check (or queue one for when
the user closes the window)

https://bugzilla.gnome.org/show_bug.cgi?id=733848
This commit is contained in:
Giovanni Campagna 2014-07-28 09:36:40 +02:00
parent 3842981c35
commit b6e6e097b7
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/portalHelper/main.js
View File

@ -49,13 +49,14 @@ const PortalWindow = new Lang.Class({
_init: function(application, url, timestamp, doneCallback) { _init: function(application, url, timestamp, doneCallback) {
this.parent({ application: application }); this.parent({ application: application });
if (url) { if (!url) {
this._uri = new Soup.URI(uri);
} else {
url = 'http://www.gnome.org'; url = 'http://www.gnome.org';
this._uri = null; this._originalUrlWasGnome = true;
this._everSeenRedirect = false; } else {
this._originalUrlWasGnome = false;
} }
this._uri = new Soup.URI(url);
this._everSeenRedirect = false;
this._originalUrl = url; this._originalUrl = url;
this._doneCallback = doneCallback; this._doneCallback = doneCallback;
this._lastRecheck = 0; this._lastRecheck = 0;
@ -110,12 +111,21 @@ const PortalWindow = new Lang.Class({
let request = decision.get_request(); let request = decision.get_request();
let uri = new Soup.URI(request.get_uri()); let uri = new Soup.URI(request.get_uri());
if (this._uri != null) { if (!uri.host_equal(this._uri) && this._originalUrlWasGnome) {
if (!uri.host_equal(uri, this._uri)) { if (uri.get_host() == 'www.gnome.org' && this._everSeenRedirect) {
// Yay, we got to gnome!
decision.ignore();
this._doneCallback(PortalHelperResult.COMPLETED);
return true;
} else if (uri.get_host() != 'www.gnome.org') {
this._everSeenRedirect = true;
}
}
// We *may* have finished here, but we don't know for // We *may* have finished here, but we don't know for
// sure. Tell gnome-shell to run another connectivity check // sure. Tell gnome-shell to run another connectivity check
// (but ratelimit the checks, we don't want to spam // (but ratelimit the checks, we don't want to spam
// gnome.org for portals that have 10 or more internal // nmcheck.gnome.org for portals that have 10 or more internal
// redirects - and unfortunately they exist) // redirects - and unfortunately they exist)
// If we hit the rate limit, we also queue a recheck // If we hit the rate limit, we also queue a recheck
// when the window is closed, just in case we miss the // when the window is closed, just in case we miss the
@ -135,21 +145,10 @@ const PortalWindow = new Lang.Class({
} else { } else {
this._recheckAtExit = true; this._recheckAtExit = true;
} }
}
// Update the URI, in case of chained redirects, so we still // Update the URI, in case of chained redirects, so we still
// think we're doing the login until gnome-shell kills us // think we're doing the login until gnome-shell kills us
this._uri = uri; this._uri = uri;
} else {
if (uri.get_host() == 'www.gnome.org' && this._everSeenRedirect) {
// Yay, we got to gnome!
decision.ignore();
this._doneCallback(PortalHelperResult.COMPLETED);
return true;
} else if (uri.get_host() != 'www.gnome.org') {
this._everSeenRedirect = true;
}
}
decision.use(); decision.use();
return true; return true;