Commit Graph

2935 Commits

Author SHA1 Message Date
Chris Karlof
34ef3af90d Bug 1056523 - Ensure sync credentials are reset during reauth flow. r=markh
This patch addresses a bug in the following scenario:

User has browser 1 connected to sync and open, and resets her password
on browser 2. Eventually the browser detects the need to reauthenticate
the user, and prompts the user. When the user entered her new password,
the browserid_identity module failed to re-derive a new syncKeyBundle
from the new password and happily used the old one. Chaos ensued.

This patch mitigate the problem by calling resetCredentials at the
start of initializeWithCurrentIdentity(), which will clear the
syncKeyBundle, along with other credentials. Previously this
function was only resetting this._shouldHaveSyncKeyBundle.

I also removed a misleading comment about the syncKeyBundle being
cleared when it wasn't.
2014-08-27 16:14:58 -07:00
Bill McCloskey
149c962f4c Bug 1046964 - Fix some JS warnings (r=ttaubert) 2014-08-19 17:27:58 -07:00
Nathan Froyd
3a53eb687e Bug 1054476 - move INSTALL_TARGETS in services/ Makefiles to EXTRA_{PP_,}JS_MODULES; r=gps 2014-07-28 15:24:01 -04:00
Nathan Froyd
297c5135ce Bug 1054476 - use PREF_JS_EXPORTS in services/ Makefiles; r=gps 2014-07-28 14:42:26 -04:00
Nathan Froyd
aa3167382a Bug 1042226 - move DEFINES += -DAB_CD=$(AB_CD) pattern into config.mk; r=mshal 2014-08-01 12:53:05 -04:00
Mark Hammond
6a1e989c2d Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
Mark Hammond
d59b09a390 Bug 1013064 (part 4) - browserid_identity and sync changes to support FxA credentials in the login manager. r=ckarlof,rnewman
From 9717484083e66b78eedfa14e539d51382aba760f Mon Sep 17 00:00:00 2001
---
 services/sync/modules/browserid_identity.js        | 61 ++++++++++++++++++++--
 services/sync/modules/identity.js                  | 19 +++++++
 services/sync/modules/service.js                   | 20 ++++---
 .../sync/tests/unit/test_browserid_identity.js     | 15 ++++++
 4 files changed, 102 insertions(+), 13 deletions(-)
2014-06-14 14:33:56 +10:00
Mark Hammond
6648f5b271 Bug 1013064 (part 2) - Store sensitive FxA credentials in the login manager. r=ckarlof,dveditz
From 4a92f9ee1ba35989f82a24bba18806f8616a5be8 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 | 170 ++++++++++++++++++
 services/fxaccounts/FxAccountsCommon.js            |  13 ++
 services/fxaccounts/moz.build                      |   5 +-
 .../tests/xpcshell/test_loginmgr_storage.js        | 196 +++++++++++++++++++++
 services/fxaccounts/tests/xpcshell/xpcshell.ini    |   2 +
 services/sync/modules/util.js                      |  12 +-
 6 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
2014-06-14 14:33:20 +10:00
Cosmin Malutan
1fdd21cd49 Bug 990509 - Wait a second after tabs opening before finishing the sync operation. r=aeftimie, r=rnewman 2014-07-31 00:54:00 -04:00
ffxbld
15412c0bcf Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-07-21 14:19:15 -07:00
Neil Deakin
dcd3ced492 Bug 1013064, backout e5dfe9801f76, 11f3a97d1d2c, e2374762f521, 91db8acb8d7e, d0050ba0b875 due to sync issues 2014-07-21 09:09:41 -04:00
Mark Hammond
f49b194318 Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
Mark Hammond
a325946ba2 Bug 1013064 (part 4) - browserid_identity and sync changes to support FxA credentials in the login manager. r=ckarlof,rnewman
From 9717484083e66b78eedfa14e539d51382aba760f Mon Sep 17 00:00:00 2001
---
 services/sync/modules/browserid_identity.js        | 61 ++++++++++++++++++++--
 services/sync/modules/identity.js                  | 19 +++++++
 services/sync/modules/service.js                   | 20 ++++---
 .../sync/tests/unit/test_browserid_identity.js     | 15 ++++++
 4 files changed, 102 insertions(+), 13 deletions(-)
2014-06-14 14:33:56 +10:00
Mark Hammond
1a71740dce Bug 1013064 (part 2) - Store sensitive FxA credentials in the login manager. r=ckarlof
From 4a92f9ee1ba35989f82a24bba18806f8616a5be8 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 | 170 ++++++++++++++++++
 services/fxaccounts/FxAccountsCommon.js            |  13 ++
 services/fxaccounts/moz.build                      |   5 +-
 .../tests/xpcshell/test_loginmgr_storage.js        | 196 +++++++++++++++++++++
 services/fxaccounts/tests/xpcshell/xpcshell.ini    |   2 +
 services/sync/modules/util.js                      |  12 +-
 6 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
2014-06-14 14:33:20 +10:00
Kartikaya Gupta
35136e5a31 Bug 1036444 - Kill touchenter and touchleave events. r=smaug 2014-07-09 10:27:00 -04:00
Gregory Szorc
2abc4b387d Bug 1033836 - Convert TESTING_JS_MODULES to moz.build; r=glandium
--HG--
extra : rebase_source : 1cd9e402c507260358af7a93c6fb2fc91c24994b
2014-07-02 16:43:41 -07:00
Gregory Szorc
a8fec952c2 Bug 1033836 - Rename services-common to services/common; rs=rnewman
The upcoming build system patches don't support hypthens in path names.
Changing this for that reason is kind of silly, but it's the easiest
way. Besides, nothing else uses hyphens in directory names.

--HG--
extra : rebase_source : 42dda2b1f16a3c0bfe17397a70092362e400530f
2014-07-02 16:49:36 -07:00
Andrew Comminos
0ed1a0f5e1 Bug 958868 - Add support for delta line and page accumulation; r=masayuki, sr=smaug 2014-07-07 18:54:14 +09:00
Jim Blandy
b6b202b6bb Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Mark Hammond
ab8b04c7ed Bug 995599 - prevent services tests hitting the network. r=rnewman
--HG--
extra : rebase_source : f38fefae031f4cbd94215ee61f89a553b1f5c272
2014-06-10 12:02:39 +10:00
ffxbld
cb593d0a06 Version bump. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release 2014-06-09 11:50:02 -07:00
Mark Hammond
6f9eaa8600 Bug 1014957 - add telemetry probe to indicate if custom servers are used for sync. r=rnewman 2014-05-30 14:56:25 +10:00
Gijs Kruitbosch
cdec1bcf56 Bug 1011343 - don't log username in sync log, r=markh 2014-05-29 12:47:24 +01:00
Paolo Amadini
09b1551f2c Bug 853549 - Use a JSON storage back-end in the Login Manager, except on Android. r=dolske 2014-01-07 17:29:41 +01:00
Carsten "Tomcat" Book
74c34d7401 Backed out changeset ca4caf0d721c (bug 853549) for valgrind testfailures 2014-05-28 15:53:13 +02:00
Paolo Amadini
ae7450d465 Bug 853549 - Use a JSON storage back-end in the Login Manager, except on Android. r=dolske 2014-01-07 17:29:41 +01:00
Mark Hammond
d6c6fce24b Bug 1010531 - Prevent async callback from throwing when a callback is made with an error. r=rnewman 2014-05-28 10:00:00 +10:00
Shashank Sabniveesu
abc711486f Bug 1014186 - Remove unused BookmarkJSONUtils from services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm. r=mak 2014-05-22 13:56:00 -04:00
Mark Hammond
1bd8a3fc48 Bug 1013448 - add telemetry probes for sync. r=rnewman 2014-05-27 10:39:51 +10:00
Carsten "Tomcat" Book
677f188d95 Backed out changeset 0acc877be680 (bug 1013448) 2014-05-26 10:11:59 +02:00
Mark Hammond
1de3177e5f Bug 1013448 (part 2) - add telemetry probes for sync. r=rnewman 2014-05-26 09:48:41 +10:00
Cosmin Malutan
d7d2656c2c Bug 982610 - Update TPS to use latest Mozmill 2.0.6. r=hskupin DONTBUILD
--HG--
extra : rebase_source : 6e967421250dd6093c0fcc89dcbd078c0812fcb6
2014-05-22 18:25:50 +02:00
Mark Hammond
0d7b238760 Bug 1009264 - Strip trailing slash from services.sync.tokenServerURI. r=ckarlof 2014-05-19 09:53:54 +10:00
Mark Hammond
b35270d063 Bug 1006943 - non-sensitive FxA log info is included with sync logs. r=rnewman 2014-05-15 12:00:59 +10:00
Mark Hammond
9bc08f07d4 Bug 1006360 - prevent failures backing up bookmarks from stopping sync completing. r=rnewman 2014-05-09 14:14:34 +10:00
Wes Kocher
8cc4ef2b69 Merge m-c to inbound 2014-05-05 21:15:33 -07:00
Henrik Skupin
779cf44c82 Bug 1003250 - Disable automatic sync for TPS tests. r=rnewman DONTBUILD 2014-05-05 23:07:52 +02:00
Ehsan Akhgari
50f04cbea2 Bug 1005710 - Avoid preprocessing the services JS exports files needlessly; r=mshal 2014-05-05 21:28:55 -04:00
Mark Hammond
15dd4b6c60 Bug 972100 - avoid an info/collections call as sync starts. r=rnewman 2014-04-30 17:42:51 +10:00
ffxbld
8b21a060c7 Version bump. CLOSED TREE NO BUG a=release 2014-04-28 14:18:37 -04:00
Sam Penrose
1a87791baa Bug 983445 - Verification causes logout on device. r=jedp 2014-04-21 16:45:58 -07:00
Carsten "Tomcat" Book
b5c721a037 merge fx-team to mozilla-central 2014-04-17 12:49:25 +02:00
Mark Hammond
c84abce384 Bug 985868 - only report prolonged sync errors once per application invocation. r=rnewman 2014-04-17 11:25:44 +10:00
Henrik Skupin
1f19603bc7 Bug 996027 - Ensure that TPS always fakes login into Weave. r=rnewman DONTBUILD 2014-04-14 18:22:23 +02:00
Roberto A. Vitillo
27b3061405 Bug 993468 - TypeError: callback is undefined in jsonSave(). r=rnewman 2014-04-13 14:28:20 -04:00
Ed Morley
a7f50452e1 Merge latest green inbound changeset and mozilla-central 2014-04-10 17:55:29 +01:00
Henrik Skupin
7cad0b30a2 Bug 992198 - TPS.Sync() fails for special options like 'wipeRemote' if the user is not logged in yet. r=jgriffin DONTBUILD
--HG--
extra : rebase_source : d4ff28171ebdd7d2a23e7cc395d7087831d30f96
2014-04-09 23:35:57 +02:00
Mark Hammond
fae2fec418 Bug 985145 - make node reassignment work correctly with FxA. r=rnewman 2014-04-10 12:18:24 +10:00
Mark Hammond
08a11b0e38 Bug 990834 (part 3) - Fix handling of hawk errors. r=ckarlof 2014-04-10 12:08:19 +10:00
Mark Hammond
0ca5780e06 Bug 990834 (part 2) - Add support/tweak retry and backoff header support to hawk and tokenserverclient. r=rnewman 2014-04-10 12:08:19 +10:00