Commit Graph

3541 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
75e6151d92 Merge mozilla-central to mozilla-inbound 2014-08-28 16:13:13 +02:00
Wes Kocher
7c9c4378df Merge m-c to fx-team a=merge 2014-08-27 17:07:39 -07:00
Chris Karlof
2a436941d9 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
Cosmin Malutan
3b2bdcafa8 Bug 682446 - Wait a little before we trigger the Sync call to be sure elements are ready to be synced. r=hskupin DONTBUILD
---
 services/sync/tps/extensions/tps/resource/tps.jsm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
2014-08-28 11:24:01 +02:00
Florian Quèze
528c7343e7 Bug 838458 - Fix 'rest.js - setting a property that has only a getter' warnings, r=rnewman. 2014-08-27 16:52:21 +02:00
Birunthan Mohanathas
6019b31af3 Bug 1024672 - Part 4: Add workaround to continue providing submission data using DailyCrashesMeasurement. r=gps 2014-08-21 15:43:54 -07:00
Birunthan Mohanathas
b86bfef458 Bug 1024672 - Part 3: Remove CrashManager.addSubmission in favor of CrashManager.addSubmission{Attempt,Result}. r=gps 2014-08-21 15:43:50 -07:00
Ed Morley
64c4bef1c1 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-20 15:14:31 +01:00
Bill McCloskey
0f6b688b48 Bug 1046964 - Fix some JS warnings (r=ttaubert) 2014-08-19 17:27:58 -07:00
Gregory Szorc
8ea5c183d9 Bug 1055102 - Properly handle Unicode in Bagheera payloads; r=bsmedberg
It was observed that FHR was sending invalid JSON payloads to the
server. Specifically, JSON payloads contained invalid Unicode strings.

Investigation revealed that the culprint was CommonUtils.convertString()
silently swallowing high bytes. When the Bagheera client went to gzip
the JSON payload, the input buffer into gzip was missing high bytes.

This patch changes the bagheera client to UTF-8 encode strings before
gzip, thus ensuring all data is preserved. A corresponding change was
also added to the mock bagheera server implementation.

Alternatively, we could have changed CommonUtils.convertString() to
be high byte aware. However, many consumers rely on this function.
This patch is written with the intent of being uplifted and the change
performed is targeted at the specific problem.

Tests for Unicode preserving behavior have been added to both the
generic Bagheera client and to FHR. The latter test is arguably
not necessary, but peace of mind is a good thing, especially with
FHR.

See also bug 915850.

--HG--
extra : rebase_source : 4efddea7767c2e5f8cf19df247c3aba07c40eec6
extra : amend_source : ae3b6d89efa54fc9ed1794404476622946ad4b22
2014-08-19 09:12:12 -07:00
Daniel Holbert
83b68bc241 Bug 1055643: Drop "let" keyword to fix JS warning about redeclaring argument, in stripHeaderAttributes(). r=ckarlof 2014-08-19 12:29:34 -07:00
Ed Morley
d7c0cf5802 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-19 14:32:54 +01:00
Mark Hammond
fe5cb5a31c Bug 1053948 - declare AccountState in fxAccounts. r=gavin 2014-08-19 08:47:37 +10:00
Matthew Noorenberghe
a3dff5bee3 Bug 1047130 - Implement desktop backend to login to FxA via OAuth for Loop. r=vladikoff,ckarlof,mikedeboer
This implements the OAuth authorization phase.
2014-08-18 14:32:34 -07:00
Nathan Froyd
a9ceaeb4dd Bug 1045617 - move services's run_server.py Makefile rules into mach; r=gps 2014-07-30 15:44:13 -04:00
Nathan Froyd
cd91df4210 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
4c895ecac4 Bug 1054476 - use PREF_JS_EXPORTS in services/ Makefiles; r=gps 2014-07-28 14:42:26 -04:00
Georg Fritzsche
db980a370f Bug 862563 - Remove implicit acceptance for data reporting notification and notify on first run. r=gps
The data reporting notification was over-complicated. It wasn't
displayed for +24hr after first run and it had a weird, non-required
policy around what constituted acceptance of the policy.

The notification is now shown shortly after first startup.

The logic around "notification accepted" has been greatly simplified by
rolling it into "notification shown." Where we once were checking
whether the notification has been "accepted," we now check whether it
has been displayed. The overly complicated logic around the implicit
acceptance of the policy has also been removed.

The end result is the code for managing the state of the notification is
greatly simplified.
2014-07-09 14:32:29 -07:00
Gregory Szorc
7bf9c63052 Bug 1053315 - Catch more errors during upload; r=bsmedberg
If recording FHR data during uploading raised an exception, it could
potentially abort the upload. This would appear to Mozilla as clients
that suddenly stopped using Firefox.

This patch adds explicit exception trapping around event record to
ensure this doesn't happen.

--HG--
extra : rebase_source : 7cd207b08a4f62be55093c71cb56e28832fd39d8
extra : amend_source : 9144ecea16a013370fffa5c2e833af4ec528ef5b
2014-08-13 11:18:22 -07:00
Drew Willcoxon
807f12f4d6 Bug 1009765 - Add GMP plugin crashes to FHR crash reporting (part 2: FHR, toolkit/components/crashes). r=gps 2014-08-08 15:41:07 -07:00
Birunthan Mohanathas
c8bac35511 Bug 1048989 - Fix 'useless expression' warnings with MERGED_COMPONENT. r=gps 2014-08-07 21:52:05 -07:00
Nathan Froyd
e1583db863 Bug 1042226 - move DEFINES += -DAB_CD=$(AB_CD) pattern into config.mk; r=mshal 2014-08-01 12:53:05 -04:00
Daniel Holbert
ca2360d064 Bug 1049035: Don't redeclare arg 'msg', in health report function '_recordProviderError'. r=gps 2014-08-05 22:35:30 -07:00
Mark Hammond
1dec47d185 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
0ed9ea0fa6 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
b9a255998a Bug 1013064 (part 3) - only migrate data into the loginmgr when it is unlocked. r=ckarlof
From 86c67f9b9081ce905442c86b38575b3422c8dce3 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 |  25 ++++-
 .../tests/xpcshell/test_loginmgr_storage.js        | 113 +++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
2014-06-18 15:07:41 +10:00
Mark Hammond
15fe2e0f21 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
Mark Hammond
6e95b5893a Bug 1013064 (part 1) - prompt for master-password unlock when interacting with about:accounts. r=ttaubert
From 18f9d132020afee6004e63c9006245e4d3b04e18 Mon Sep 17 00:00:00 2001
---
 browser/base/content/aboutaccounts/aboutaccounts.js | 9 +++++++++
 1 file changed, 9 insertions(+)
2014-06-11 17:34:24 +10:00
Ryan VanderMeulen
ec828371c8 Merge m-c to fx-team. a=merge 2014-08-01 16:08:39 -04:00
Vlad Filippov
d39fe7ffd8 Bug 1022064 - Add WebChannel Communication API and FxAccountsOAuthClient API to facilitate Firefox Accounts OAuth authentication. r=MattN, sr=gavin 2014-08-01 01:42:00 -04:00
Cosmin Malutan
7c0f8cfac6 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
Carsten "Tomcat" Book
93574c6c52 Merge mozilla-central to mozilla-inbound 2014-07-30 14:10:53 +02:00
Nathan Froyd
542214c4df Bug 1044162 - part 1 - make EXTRA_{PP_,}JS_MODULES communicate their installation path; r=mshal
This patch makes EXTRA_{PP_,}JS_MODULES similar in functionality to
TESTING_JS_MODULES: we indicate the path relative to
$(FINAL_TARGET)/modules with an appropriate hierarchy of paths.
2014-07-25 13:40:07 -04:00
Wes Kocher
b1f20f9c54 Merge m-c to fx-team 2014-07-29 17:21:24 -07:00
Wes Kocher
c3fdde7659 Merge b2g-inbound to m-c a=merge 2014-07-29 16:42:15 -07:00
Gregory Szorc
3fc79058a2 Bug 1014524 - Add HotfixProvider to XPCOM manifest; r=rnewman
--HG--
extra : rebase_source : 09108f61288d86f2739945ffa9efc79b9587c72a
2014-07-29 11:11:51 -07:00
Gregory Szorc
93ba218ccc Bug 1014524 - Report update hotfix results in FHR; r=rnewman
The v20140527.01 update hotfix deposited a JSON file in the profile
directory containing state. This file was purposefully not deleted
during hotfix uninstall so its contents could be later reported in
FHR.

This patch adds that reporting to FHR.

Currently, we only report a subset of the available fields. The
remaining "public" fields could be added easily enough. For now, it is
important that we capture the important ones.

--HG--
extra : rebase_source : 925d6ea04118296108327dc843323b150b87b208
2014-07-25 12:25:06 -07:00
Mike Hommey
2bab6202af Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
Nathan Froyd
92e83c5795 Bug 1044041 - remove now-unnecessary rule from services/healthreport/Makefile.in; r=gps 2014-07-25 11:11:28 -04:00
Alexandre Poirot
7ea4dd517f Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files; fix previous bustage on a CLOSED TREE, r=ahal 2014-07-02 15:40:56 -07:00
ffxbld
13e1f93153 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-07-21 14:19:15 -07:00
Neil Deakin
f191a1b74f Bug 1013064, backout e5dfe9801f76, 11f3a97d1d2c, e2374762f521, 91db8acb8d7e, d0050ba0b875 due to sync issues 2014-07-21 09:09:41 -04:00
Fernando Jiménez
17d1a2d5f3 Bug 1044792 - Send MCC and MNC on POST /sms/mt/verify. r=spenrose 2014-07-29 14:27:03 +02:00
Mark Hammond
2702b1e946 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
0a9a6684a2 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
12436672a3 Bug 1013064 (part 3) - only migrate data into the loginmgr when it is unlocked. r=ckarlof
From 86c67f9b9081ce905442c86b38575b3422c8dce3 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 |  25 ++++-
 .../tests/xpcshell/test_loginmgr_storage.js        | 113 +++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
2014-06-18 15:07:41 +10:00
Mark Hammond
e520f78577 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
Ryan VanderMeulen
7fbee60fc9 Merge fx-team to m-c. a=merge 2014-07-11 16:22:36 -04:00
Fernando Jiménez
f40d884f09 Bug 1028398 - FxA will silently provide user's email to privileged apps in 2.0. Part 2: Trigger forceAuth when new privileged app tries to get a FxA assertion. r=jedp" 2014-07-11 16:13:32 +02:00
Steven MacLeod
0b8072e06c Bug 1035337 - Introduce API to record when the infobar is hidden due to "Never translate this language/site". r=felipe
--HG--
extra : rebase_source : 04dd1e060efad6160997194ba1b128c7f8a5db36
extra : histedit_source : be5f46896497e1bef1aa5ace5850793c4556527d
2014-07-10 18:31:56 -04:00