wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 543784: don't login automatically, prompt for master password. r=philiKON

Browse Source
This commit is contained in:
Richard Newman 2010-12-20 20:01:34 -08:00
parent 870bf49033
commit 8592007dc3
2 changed files with 111 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
services/sync/modules/service.js
View File

@ -529,7 +529,6 @@ WeaveSvc.prototype = {
this._handleSyncError();
if (Status.sync == CREDENTIALS_CHANGED) {
this.logout();
Utils.delay(function() this.login(), 0, this);
}
break;
case "weave:service:sync:finish":
@ -951,7 +950,6 @@ WeaveSvc.prototype = {
CollectionKeys.clear();
/* Login and sync. This also generates new keys. */
this.login();
this.sync(true);
return true;
}))(),
@ -991,9 +989,23 @@ WeaveSvc.prototype = {
},
_autoConnect: let (attempts = 0) function _autoConnect() {
let reason =
Utils.mpLocked() ? "master password still locked"
: this._checkSync([kSyncNotLoggedIn, kFirstSyncChoiceNotMade]);
let isLocked = Utils.mpLocked();
if (isLocked) {
// There's no reason to back off if we're locked: we'll just try to login
// during sync. Clear our timer, see if we should go ahead and sync, then
// just return.
this._log.trace("Autoconnect skipped: master password still locked.");
if (this._autoTimer)
this._autoTimer.clear();
this._checkSyncStatus();
Svc.Prefs.set("autoconnect", true);
return;
}
let reason = this._checkSync([kSyncNotLoggedIn, kFirstSyncChoiceNotMade]);
// Can't autoconnect if we're missing these values.
if (!reason) {
@ -1315,6 +1327,19 @@ WeaveSvc.prototype = {
}
},
/**
* Return whether we should attempt login at the start of a sync.
*
* Note that this function has strong ties to _checkSync: callers
* of this function should typically use _checkSync to verify that
* any necessary login took place.
*/
_shouldLogin: function _shouldLogin() {
return this.enabled &&
!Svc.IO.offline &&
!this.isLoggedIn;
},
/**
* Determine if a sync should run.
*
@ -1366,7 +1391,16 @@ WeaveSvc.prototype = {
_checkSyncStatus: function WeaveSvc__checkSyncStatus() {
// Should we be syncing now, if not, cancel any sync timers and return
// if we're in backoff, we'll schedule the next sync
if (this._checkSync([kSyncBackoffNotMet])) {
let ignore = [kSyncBackoffNotMet];
// We're ready to sync even if we're not logged in... so long as the
// master password isn't locked.
if (Utils.mpLocked())
ignore.push(kSyncNotLoggedIn);
let skip = this._checkSync(ignore);
this._log.trace("_checkSync returned \"" + skip + "\".");
if (skip) {
this._clearSyncTriggers();
return;
}
@ -1527,7 +1561,15 @@ WeaveSvc.prototype = {
// see Bug 616568.
sync: function sync() {
try {
return this._lockedSync();
// Make sure we're logged in.
if (this._shouldLogin()) {
this._log.trace("In sync: should login.");
this.login();
}
else {
this._log.trace("In sync: no need to login.");
}
return this._lockedSync.apply(this, arguments);
} catch (ex) {
this._log.debug("Exception: " + Utils.exceptionStr(ex));
if (Utils.isLockException(ex)) {

62
services/sync/tests/unit/test_service_login.js
View File

@ -111,6 +111,68 @@ function run_test() {
Service.logout();
do_check_false(Service.isLoggedIn);
do_check_false(Svc.Prefs.get("autoconnect"));
/*
* Testing login-on-sync.
*/
_("Sync calls login.");
let oldLogin = Service.login;
let loginCalled = false;
Service.login = function() {
loginCalled = true;
Status.login = LOGIN_SUCCEEDED;
this._loggedIn = false; // So that sync aborts.
return true;
}
try {
Service.sync();
} catch (ex) {}
do_check_true(loginCalled);
Service.login = oldLogin;
// Stub mpLocked.
let mpLockedF = Utils.mpLocked;
let mpLocked = true;
Utils.mpLocked = function() mpLocked;
// Stub scheduleNextSync. This gets called within checkSyncStatus if we're
// ready to sync, so use it as an indicator.
let scheduleNextSyncF = Service._scheduleNextSync;
let scheduleCalled = false;
Service._scheduleNextSync = function(wait) {
scheduleCalled = true;
scheduleNextSyncF.call(this, wait);
}
// Autoconnect still tries to connect in the background (useful behavior:
// for non-MP users and unlocked MPs, this will detect version expiry
// earlier).
//
// Consequently, non-MP users will be logged in as in the pre-Bug 543784 world,
// and checkSyncStatus reflects that by waiting for login.
//
// This process doesn't apply if your MP is still locked, so we make
// checkSyncStatus accept a locked MP in place of being logged in.
//
// This test exercises these two branches.
_("We're ready to sync if locked.");
Service.enabled = true;
Svc.IO.offline = false;
Service._checkSyncStatus();
do_check_true(scheduleCalled);
scheduleCalled = false;
mpLocked = false;
_("... and not if not.");
Service._checkSyncStatus();
do_check_false(scheduleCalled);
Service._scheduleNextSync = scheduleNextSyncF;
// TODO: need better tests around master password prompting. See Bug 620583.
} finally {
Svc.Prefs.resetBranch("");