Issue 17970003: New encryption/escrow endpoints for Wallet

Issue 17970003: New encryption/escrow endpoints for Wallet (Closed)

Created:
7 years, 5 months ago by ahutter

Modified:
7 years, 5 months ago

Reviewers:
ramankk, Dan Beam, benquan, Dane Wallinga, Raman Kakilate, Ilya Sherman

CC:
chromium-reviews, Raman Kakilate, benquan, jam, browser-components-watch_chromium.org, joi+watch-content_chromium.org, darin-cc_chromium.org, Dane Wallinga, dyu1, estade+watch_chromium.org, Albert Bodenhamer, Ilya Sherman, rouslan+autofillwatch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

New encryption/escrow endpoints for Wallet No more EncryptionEscrowClient! Updates Wallet client to use new endpoints for AuthenticateInstrument, GetFullWallet, and SaveToWallet and reduces all those calls to just one roundtrip. No more confusing Save/Update... calls, just one SaveToWallet call. Still need to manually test SaveToWallet and AuthenticateInstrument. TEST=unit tests all still pass with minimal changes, manual testing of GetFullWallet BUG=249958, 245341, 238807 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=212754

Patch Set 1 #

Patch Set 2 : Clean up #

Patch Set 3 : Deleting old escrow unit tests #

Total comments: 11

Patch Set 4 : Raman's review #

Total comments: 9

Patch Set 5 : Dane's review #

Total comments: 60

Patch Set 6 : Dan's review #

Patch Set 7 : No !! #

Total comments: 21

Patch Set 8 : Dan's review part deux #

Patch Set 9 : Updated histograms.xml #

Total comments: 7

Patch Set 10 : Ilya's review #

Patch Set 11 : Forgot to commit a change #

Patch Set 12 : And fixing comment #

Total comments: 4

Patch Set 13 : Removing old enum values #

Total comments: 1

Patch Set 14 : Unnecessary comment #

Patch Set 15 : Rebasing #

Patch Set 16 : Tests and making sure calls without escrow don't hit escrow endpoints #

Patch Set 17 : Rebasing #

Patch Set 18 : Rebasing #

Patch Set 19 : Rebasing again... #

Patch Set 20 : Rebasing #

Patch Set 21 : Rebasing again... #

Created: 7 years, 5 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+683 lines, -1908 lines)			Patch
M	chrome/browser/ui/autofill/autofill_dialog_controller_impl.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	3 chunks	+1 line, -26 lines	0 comments	Download
M	chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	6 chunks	+16 lines, -107 lines	0 comments	Download
M	chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	13 chunks	+48 lines, -42 lines	0 comments	Download
M	chrome/chrome_tests_unit.gypi	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	1 chunk	+0 lines, -1 line	0 comments	Download
M	components/autofill.gypi	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	1 chunk	+0 lines, -3 lines	0 comments	Download
M	components/autofill/content/browser/autocheckout_request_manager.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16	1 chunk	+1 line, -17 lines	0 comments	Download
M	components/autofill/content/browser/autocheckout_request_manager.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16	2 chunks	+1 line, -28 lines	0 comments	Download
D	components/autofill/content/browser/wallet/encryption_escrow_client.h	View		1 chunk	+0 lines, -100 lines	0 comments	Download
D	components/autofill/content/browser/wallet/encryption_escrow_client_observer.h	View		1 chunk	+0 lines, -53 lines	0 comments	Download
D	components/autofill/content/browser/wallet/encryption_escrow_client_unittest.cc	View	1 2	1 chunk	+0 lines, -196 lines	0 comments	Download
M	components/autofill/content/browser/wallet/instrument.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17	3 chunks	+6 lines, -5 lines	0 comments	Download
M	components/autofill/content/browser/wallet/instrument.cc	View	1 2 3 4 5	3 chunks	+2 lines, -18 lines	0 comments	Download
M	components/autofill/content/browser/wallet/instrument_unittest.cc	View	1	1 chunk	+0 lines, -122 lines	0 comments	Download
M	components/autofill/content/browser/wallet/mock_wallet_client.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17	2 chunks	+12 lines, -29 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_client.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17	10 chunks	+17 lines, -88 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_client.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	14 chunks	+161 lines, -374 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_client_delegate.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16	1 chunk	+2 lines, -40 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_client_unittest.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16	49 chunks	+329 lines, -605 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_service_url.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15	1 chunk	+1 line, -2 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_service_url.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15	3 chunks	+18 lines, -27 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_service_url_unittest.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15	2 chunks	+7 lines, -10 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_test_util.h	View		1 chunk	+3 lines, -0 lines	0 comments	Download
M	components/autofill/content/browser/wallet/wallet_test_util.cc	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17	1 chunk	+33 lines, -0 lines	0 comments	Download
M	components/autofill/core/browser/autofill_metrics.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17	1 chunk	+1 line, -5 lines	0 comments	Download
M	components/autofill/core/browser/autofill_metrics.cc	View	1 2 3 4 5 11 12	1 chunk	+2 lines, -10 lines	0 comments	Download
M	tools/metrics/histograms/histograms.xml	View	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	5 chunks	+22 lines, -0 lines	0 comments	Download

Messages

Total messages: 37 (0 generated)

Expand Messages | Collapse Messages

Raman Kakilate

https://codereview.chromium.org/17970003/diff/4001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc File chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (right): https://codereview.chromium.org/17970003/diff/4001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc#newcode1988 chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc:1988: if (active_address_id_.empty() && !address_id.empty()) Is this good? Address ID's ...

7 years, 5 months ago (2013-07-01 19:37:56 UTC) #2

ahutter

7 years, 5 months ago (2013-07-01 21:37:45 UTC) #3

Dane Wallinga

https://codereview.chromium.org/17970003/diff/13001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc File chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (right): https://codereview.chromium.org/17970003/diff/13001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc#newcode2073 chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc:2073: active_instrument_id_ = instrument_id; weird indentation is weird. https://codereview.chromium.org/17970003/diff/13001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc File ...

7 years, 5 months ago (2013-07-01 23:00:06 UTC) #4

ahutter

7 years, 5 months ago (2013-07-01 23:15:15 UTC) #5

Dane Wallinga

lgtm Everything looks fairly reasonable, and I assume you've tested this against sandbox. https://codereview.chromium.org/17970003/diff/13001/components/autofill/content/browser/wallet/wallet_client.cc File ...

7 years, 5 months ago (2013-07-01 23:33:13 UTC) #6

Dan Beam

https://codereview.chromium.org/17970003/diff/21001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc File chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (left): https://codereview.chromium.org/17970003/diff/21001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc#oldcode2069 chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc:2069: DCHECK(is_submitting_ && IsPayingWithWallet()); why did you remove? https://codereview.chromium.org/17970003/diff/21001/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc File ...

7 years, 5 months ago (2013-07-02 01:25:52 UTC) #8

Raman Kakilate

https://codereview.chromium.org/17970003/diff/21001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc File chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (right): https://codereview.chromium.org/17970003/diff/21001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc#newcode1250 chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1250: // HUH?? ?? https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode244 components/autofill/content/browser/wallet/wallet_client.cc:244: ...

7 years, 5 months ago (2013-07-02 01:41:24 UTC) #9

Dan Beam

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode244 components/autofill/content/browser/wallet/wallet_client.cc:244: void UpdateInstrument(const Instrument& instrument, On 2013/07/02 01:41:24, Raman Kakilate ...

7 years, 5 months ago (2013-07-02 01:53:17 UTC) #10

ahutter

7 years, 5 months ago (2013-07-02 15:44:23 UTC) #11

Dan Beam

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode261 components/autofill/content/browser/wallet/wallet_client.cc:261: if (instrument.expiration_month() > 0 && instrument.expiration_year() > 0) { ...

7 years, 5 months ago (2013-07-02 19:06:04 UTC) #12

Ilya Sherman

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode527 components/autofill/content/browser/wallet/wallet_client.cc:527: return !!request_; On 2013/07/02 19:06:04, Dan Beam wrote: > ...

7 years, 5 months ago (2013-07-02 19:10:48 UTC) #13

ahutter

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode261 components/autofill/content/browser/wallet/wallet_client.cc:261: if (instrument.expiration_month() > 0 && instrument.expiration_year() > 0) { ...

7 years, 5 months ago (2013-07-02 19:22:07 UTC) #14

https://codereview.chromium.org/17970003/diff/21001/components/autofill/conte...
File components/autofill/content/browser/wallet/wallet_client.cc (right):

https://codereview.chromium.org/17970003/diff/21001/components/autofill/conte...
components/autofill/content/browser/wallet/wallet_client.cc:261: if
(instrument.expiration_month() > 0 && instrument.expiration_year() > 0) {
On 2013/07/02 19:06:04, Dan Beam wrote:
> On 2013/07/02 15:44:23, ahutter wrote:
> > On 2013/07/02 01:25:52, Dan Beam wrote:
> > > are there cases where we actually don't update every part of an instrument
> at
> > > once (and require CVC)?
> > 
> > I think so.  Expiration date updates .
> 
> this requires your CVC in at least the rAc() case to validate client side

Confused.

https://codereview.chromium.org/17970003/diff/21001/components/autofill/conte...
components/autofill/content/browser/wallet/wallet_client.cc:527: return
!!request_;
On 2013/07/02 19:06:04, Dan Beam wrote:
> On 2013/07/02 15:44:23, ahutter wrote:
> > On 2013/07/02 01:25:52, Dan Beam wrote:
> > > nit: what's the benefit of "!!"?
> > 
> > umm. i thought doing the actual conversion to bool was better than returning
a
> > raw pointer.
> 
> you're not returning a raw pointer as the return type is bool, you can talk to
> isherman@ about this

Done.

https://codereview.chromium.org/17970003/diff/21001/components/autofill/conte...
components/autofill/content/browser/wallet/wallet_client.cc:527: return
!!request_;
On 2013/07/02 19:10:48, Ilya Sherman wrote:
> On 2013/07/02 19:06:04, Dan Beam wrote:
> > On 2013/07/02 15:44:23, ahutter wrote:
> > > On 2013/07/02 01:25:52, Dan Beam wrote:
> > > > nit: what's the benefit of "!!"?
> > > 
> > > umm. i thought doing the actual conversion to bool was better than
returning
> a
> > > raw pointer.
> > 
> > you're not returning a raw pointer as the return type is bool, you can talk
to
> > isherman@ about this
> 
> You might want to double-check this to convince yourself, but IIRC Dan and I
> looked into this and found that scoped_ptr is implemented so that the implicit
> conversion to a boolean also forces the converted value to be either 0 or 1
> (i.e. |false| or |true|).

Done.

Dan Beam

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode261 components/autofill/content/browser/wallet/wallet_client.cc:261: if (instrument.expiration_month() > 0 && instrument.expiration_year() > 0) { ...

7 years, 5 months ago (2013-07-02 19:26:53 UTC) #15

ahutter

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode261 components/autofill/content/browser/wallet/wallet_client.cc:261: if (instrument.expiration_month() > 0 && instrument.expiration_year() > 0) { ...

7 years, 5 months ago (2013-07-02 19:59:22 UTC) #16

Dan Beam

https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/21001/components/autofill/content/browser/wallet/wallet_client.cc#newcode261 components/autofill/content/browser/wallet/wallet_client.cc:261: if (instrument.expiration_month() > 0 && instrument.expiration_year() > 0) { ...

7 years, 5 months ago (2013-07-02 20:27:34 UTC) #17

Dan Beam

closer, sorry for misunderstanding how cvc is used https://codereview.chromium.org/17970003/diff/40001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc File chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (right): https://codereview.chromium.org/17970003/diff/40001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc#newcode1250 chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1250: // ...

7 years, 5 months ago (2013-07-02 21:03:11 UTC) #18

ahutter

https://codereview.chromium.org/17970003/diff/40001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc File chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (right): https://codereview.chromium.org/17970003/diff/40001/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc#newcode1250 chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1250: // HUH?? On 2013/07/02 21:03:11, Dan Beam wrote: > ...

7 years, 5 months ago (2013-07-02 21:15:56 UTC) #19

Dan Beam

https://codereview.chromium.org/17970003/diff/40001/components/autofill/content/browser/wallet/wallet_client.cc File components/autofill/content/browser/wallet/wallet_client.cc (right): https://codereview.chromium.org/17970003/diff/40001/components/autofill/content/browser/wallet/wallet_client.cc#newcode388 components/autofill/content/browser/wallet/wallet_client.cc:388: request_type_ = SAVE_TO_WALLET; On 2013/07/02 21:15:56, ahutter wrote: > ...

7 years, 5 months ago (2013-07-02 21:17:45 UTC) #20

Dan Beam

lgtm, probably still need isherman@ for something https://codereview.chromium.org/17970003/diff/40001/components/autofill/content/browser/wallet/wallet_client.h File components/autofill/content/browser/wallet/wallet_client.h (right): https://codereview.chromium.org/17970003/diff/40001/components/autofill/content/browser/wallet/wallet_client.h#newcode195 components/autofill/content/browser/wallet/wallet_client.h:195: SAVE_TO_WALLET, On ...

7 years, 5 months ago (2013-07-02 21:23:07 UTC) #21

Dan Beam

you should also file a bug to remove the metrics from histograms.xml that no longer ...

7 years, 5 months ago (2013-07-02 21:24:21 UTC) #22

ahutter

On 2013/07/02 21:24:21, Dan Beam wrote: > you should also file a bug to remove ...

7 years, 5 months ago (2013-07-02 21:25:53 UTC) #23

ahutter

+isherman for ownership of anything not in chrome/ or components/autofill/content/browser/wallet. Thanks.

7 years, 5 months ago (2013-07-02 21:27:19 UTC) #24

Ilya Sherman

https://codereview.chromium.org/17970003/diff/16005/components/autofill/core/browser/autofill_metrics.h File components/autofill/core/browser/autofill_metrics.h (right): https://codereview.chromium.org/17970003/diff/16005/components/autofill/core/browser/autofill_metrics.h#newcode291 components/autofill/core/browser/autofill_metrics.h:291: // deprecated and removed. Please keep them in the ...

7 years, 5 months ago (2013-07-02 21:40:37 UTC) #25

Dan Beam

7 years, 5 months ago (2013-07-02 21:41:34 UTC) #26

Dan Beam

7 years, 5 months ago (2013-07-02 21:42:14 UTC) #27

Ilya Sherman

7 years, 5 months ago (2013-07-02 21:49:06 UTC) #28

ahutter

7 years, 5 months ago (2013-07-02 21:56:53 UTC) #29

Ilya Sherman

LGTM. https://codereview.chromium.org/17970003/diff/44002/components/autofill/core/browser/autofill_metrics.cc File components/autofill/core/browser/autofill_metrics.cc (right): https://codereview.chromium.org/17970003/diff/44002/components/autofill/core/browser/autofill_metrics.cc#newcode189 components/autofill/core/browser/autofill_metrics.cc:189: case AutofillMetrics::DEPRECATED_SAVE_ADDRESS: On 2013/07/02 21:56:54, ahutter wrote: > ...

7 years, 5 months ago (2013-07-02 22:13:42 UTC) #30

Ilya Sherman

https://codereview.chromium.org/17970003/diff/44002/components/autofill/core/browser/autofill_metrics.h File components/autofill/core/browser/autofill_metrics.h (right): https://codereview.chromium.org/17970003/diff/44002/components/autofill/core/browser/autofill_metrics.h#newcode303 components/autofill/core/browser/autofill_metrics.h:303: DEPRECATED_UPDATE_INSTRUMENT, Actually, I'm realizing that these constants are only ...

7 years, 5 months ago (2013-07-02 22:17:45 UTC) #31

ahutter

https://codereview.chromium.org/17970003/diff/44002/components/autofill/core/browser/autofill_metrics.h File components/autofill/core/browser/autofill_metrics.h (right): https://codereview.chromium.org/17970003/diff/44002/components/autofill/core/browser/autofill_metrics.h#newcode303 components/autofill/core/browser/autofill_metrics.h:303: DEPRECATED_UPDATE_INSTRUMENT, On 2013/07/02 22:17:45, Ilya Sherman wrote: > Actually, ...

7 years, 5 months ago (2013-07-02 22:26:14 UTC) #32

Ilya Sherman

Thanks, LEBTM :) https://codereview.chromium.org/17970003/diff/63003/components/autofill/core/browser/autofill_metrics.h File components/autofill/core/browser/autofill_metrics.h (right): https://codereview.chromium.org/17970003/diff/63003/components/autofill/core/browser/autofill_metrics.h#newcode291 components/autofill/core/browser/autofill_metrics.h:291: // deprecated and removed. nit: I'd ...

7 years, 5 months ago (2013-07-02 22:31:19 UTC) #33

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ahutter@chromium.org/17970003/91001

7 years, 5 months ago (2013-07-19 18:17:42 UTC) #34

commit-bot: I haz the power

Failed to apply patch for components/autofill/content/browser/wallet/wallet_client.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

7 years, 5 months ago (2013-07-19 22:08:25 UTC) #35

Failed to apply patch for
components/autofill/content/browser/wallet/wallet_client.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file components/autofill/content/browser/wallet/wallet_client.cc
  Hunk #3 succeeded at 33 (offset 1 line).
  Hunk #4 succeeded at 260 (offset 1 line).
  Hunk #5 succeeded at 288 (offset 1 line).
  Hunk #6 succeeded at 330 (offset 1 line).
  Hunk #7 succeeded at 353 (offset 1 line).
  Hunk #8 succeeded at 395 (offset 1 line).
  Hunk #9 succeeded at 531 (offset 1 line).
  Hunk #10 FAILED at 577.
  Hunk #11 succeeded at 718 (offset 1 line).
  Hunk #12 succeeded at 728 (offset 1 line).
  Hunk #13 succeeded at 803 (offset 34 lines).
  Hunk #14 succeeded at 824 (offset 34 lines).
  1 out of 14 hunks FAILED -- saving rejects to file
components/autofill/content/browser/wallet/wallet_client.cc.rej

Patch:       components/autofill/content/browser/wallet/wallet_client.cc
Index: components/autofill/content/browser/wallet/wallet_client.cc
diff --git a/components/autofill/content/browser/wallet/wallet_client.cc
b/components/autofill/content/browser/wallet/wallet_client.cc
index
e2189b5e515d32191027284d71967c38028a7df4..bb3a296071d3796b640476c3c9d0473cea73ee25
100644
--- a/components/autofill/content/browser/wallet/wallet_client.cc
+++ b/components/autofill/content/browser/wallet/wallet_client.cc
@@ -9,7 +9,10 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/browser/wallet/form_field_error.h"
 #include "components/autofill/content/browser/wallet/instrument.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
@@ -19,6 +22,7 @@
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "crypto/random.h"
 #include "google_apis/google_api_keys.h"
+#include "net/base/escape.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -28,9 +32,24 @@ namespace wallet {
 
 namespace {
 
+const char kFormEncodedMimeType[] = "application/x-www-form-urlencoded";
 const char kJsonMimeType[] = "application/json";
+const char kEscrowNewInstrumentFormat[] =
+    "request_content_type=application/json&request=%s&cvn=%s&card_number=%s";
+const char kEscrowCardVerificationNumberFormat[] =
+    "request_content_type=application/json&request=%s&cvn=%s";
+const char kGetFullWalletRequestFormat[] =
+    "request_content_type=application/json&request=%s&otp=%s:%s";
 const size_t kOneTimePadLength = 6;
 
+// The maximum number of bits in the one time pad that the server is willing to
+// accept.
+const size_t kMaxBits = 56;
+
+// The minimum number of bits in the one time pad that the server is willing to
+// accept.
+const size_t kMinBits = 40;
+
 std::string AutocheckoutStatusToString(AutocheckoutStatus status) {
   switch (status) {
     case MISSING_FIELDMAPPING:
@@ -240,23 +259,12 @@ WalletClient::FullWalletRequest::FullWalletRequest(
 
 WalletClient::FullWalletRequest::~FullWalletRequest() {}
 
-WalletClient::UpdateInstrumentRequest::UpdateInstrumentRequest(
-    const std::string& instrument_id,
-    const GURL& source_url)
-    : instrument_id(instrument_id),
-      expiration_month(0),
-      expiration_year(0),
-      source_url(source_url) {}
-
-WalletClient::UpdateInstrumentRequest::~UpdateInstrumentRequest() {}
-
 WalletClient::WalletClient(net::URLRequestContextGetter* context_getter,
                            WalletClientDelegate* delegate)
     : context_getter_(context_getter),
       delegate_(delegate),
       request_type_(NO_PENDING_REQUEST),
-      one_time_pad_(kOneTimePadLength),
-      encryption_escrow_client_(context_getter, this) {
+      one_time_pad_(kOneTimePadLength) {
   DCHECK(context_getter_.get());
   DCHECK(delegate_);
 }
@@ -279,27 +287,37 @@ void WalletClient::AcceptLegalDocuments(
 
 void WalletClient::AuthenticateInstrument(
     const std::string& instrument_id,
-    const std::string& card_verification_number,
-    const std::string& obfuscated_gaia_id) {
+    const std::string& card_verification_number) {
   if (HasRequestInProgress()) {
     pending_requests_.push(base::Bind(&WalletClient::AuthenticateInstrument,
                                       base::Unretained(this),
                                       instrument_id,
-                                      card_verification_number,
-                                      obfuscated_gaia_id));
+                                      card_verification_number));
     return;
   }
 
   DCHECK_EQ(NO_PENDING_REQUEST, request_type_);
-  DCHECK(pending_request_body_.empty());
   request_type_ = AUTHENTICATE_INSTRUMENT;
 
-  pending_request_body_.SetString(kApiKeyKey, google_apis::GetAPIKey());
-  pending_request_body_.SetString(kRiskParamsKey, delegate_->GetRiskData());
-  pending_request_body_.SetString(kInstrumentIdKey, instrument_id);
+  base::DictionaryValue request_dict;
+  request_dict.SetString(kApiKeyKey, google_apis::GetAPIKey());
+  request_dict.SetString(kRiskParamsKey, delegate_->GetRiskData());
+  request_dict.SetString(kInstrumentIdKey, instrument_id);
+
+  std::string json_payload;
+  base::JSONWriter::Write(&request_dict, &json_payload);
+
+  std::string escaped_card_verification_number = net::EscapeUrlEncodedData(
+      card_verification_number, true);
+
+  std::string post_body = base::StringPrintf(
+      kEscrowCardVerificationNumberFormat,
+      net::EscapeUrlEncodedData(json_payload, true).c_str(),
+      escaped_card_verification_number.c_str());
 
-  encryption_escrow_client_.EscrowCardVerificationNumber(
-      card_verification_number, obfuscated_gaia_id);
+  MakeWalletRequest(GetAuthenticateInstrumentUrl(),
+                    post_body,
+                    kFormEncodedMimeType);
 }
 
 void WalletClient::GetFullWallet(const FullWalletRequest& full_wallet_request)
{
@@ -311,23 +329,21 @@ void WalletClient::GetFullWallet(const FullWalletRequest&
full_wallet_request) {
   }
 
   DCHECK_EQ(NO_PENDING_REQUEST, request_type_);
-  DCHECK(pending_request_body_.empty());
   request_type_ = GET_FULL_WALLET;
 
-  pending_request_body_.SetString(kApiKeyKey, google_apis::GetAPIKey());
-  pending_request_body_.SetString(kRiskParamsKey, delegate_->GetRiskData());
-  pending_request_body_.SetString(kSelectedInstrumentIdKey,
-                                  full_wallet_request.instrument_id);
-  pending_request_body_.SetString(kSelectedAddressIdKey,
-                                  full_wallet_request.address_id);
-  pending_request_body_.SetString(
+  base::DictionaryValue request_dict;
+  request_dict.SetString(kApiKeyKey, google_apis::GetAPIKey());
+  request_dict.SetString(kRiskParamsKey, delegate_->GetRiskData());
+  request_dict.SetString(kSelectedInstrumentIdKey,
+                         full_wallet_request.instrument_id);
+  request_dict.SetString(kSelectedAddressIdKey,
full_wallet_request.address_id);
+  request_dict.SetString(
       kMerchantDomainKey,
       full_wallet_request.source_url.GetWithEmptyPath().spec());
-  pending_request_body_.SetString(kGoogleTransactionIdKey,
-                                  full_wallet_request.google_transaction_id);
-  pending_request_body_.SetString(
-      kFeatureKey,
-      DialogTypeToFeatureString(delegate_->GetDialogType()));
+  request_dict.SetString(kGoogleTransactionIdKey,
+                         full_wallet_request.google_transaction_id);
+  request_dict.SetString(kFeatureKey,
+                        
DialogTypeToFeatureString(delegate_->GetDialogType()));
 
   scoped_ptr<base::ListValue> risk_capabilities_list(new base::ListValue());
   for (std::vector<RiskCapability>::const_iterator it =
@@ -336,47 +352,41 @@ void WalletClient::GetFullWallet(const FullWalletRequest&
full_wallet_request) {
        ++it) {
     risk_capabilities_list->AppendString(RiskCapabilityToString(*it));
   }
-  pending_request_body_.Set(kRiskCapabilitiesKey,
-                            risk_capabilities_list.release());
+  request_dict.Set(kRiskCapabilitiesKey, risk_capabilities_list.release());
 
-  crypto::RandBytes(&(one_time_pad_[0]), one_time_pad_.size());
-  encryption_escrow_client_.EncryptOneTimePad(one_time_pad_);
-}
+  std::string json_payload;
+  base::JSONWriter::Write(&request_dict, &json_payload);
 
-void WalletClient::GetWalletItems(const GURL& source_url) {
-  if (HasRequestInProgress()) {
-    pending_requests_.push(base::Bind(&WalletClient::GetWalletItems,
-                                      base::Unretained(this),
-                                      source_url));
-    return;
-  }
+  crypto::RandBytes(&(one_time_pad_[0]), one_time_pad_.size());
 
-  DCHECK_EQ(NO_PENDING_REQUEST, request_type_);
-  request_type_ = GET_WALLET_ITEMS;
+  size_t num_bits = one_time_pad_.size() * 8;
+  DCHECK_LE(num_bits, kMaxBits);
+  DCHECK_GE(num_bits, kMinBits);
 
-  base::DictionaryValue request_dict;
-  request_dict.SetString(kApiKeyKey, google_apis::GetAPIKey());
-  request_dict.SetString(kMerchantDomainKey,
-                         source_url.GetWithEmptyPath().spec());
-
-  std::string post_body;
-  base::JSONWriter::Write(&request_dict, &post_body);
+  std::string post_body = base::StringPrintf(
+      kGetFullWalletRequestFormat,
+      net::EscapeUrlEncodedData(json_payload, true).c_str(),
+      base::HexEncode(&num_bits, 1).c_str(),
+      base::HexEncode(&(one_time_pad_[0]), one_time_pad_.size()).c_str());
 
-  MakeWalletRequest(GetGetWalletItemsUrl(), post_body);
+  MakeWalletRequest(GetGetFullWalletUrl(), post_body, kFormEncodedMimeType);
 }
 
-void WalletClient::SaveAddress(const Address& shipping_address,
-                               const GURL& source_url) {
+void WalletClient::SaveToWallet(sco…
(message too large)

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ahutter@chromium.org/17970003/112001

7 years, 5 months ago (2013-07-19 22:24:41 UTC) #36

Message was sent while issue was closed.

Change committed as 212754

Expand Messages | Collapse Messages