Send site certificate chain to android payment app

chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Parcelable;
 import android.os.RemoteException;
 import android.util.JsonWriter;
 
 import org.chromium.IsReadyToPayService;
 import org.chromium.IsReadyToPayServiceCallback;
 import org.chromium.chrome.R;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;
@@ skipping 13 matching lines @@
 public class AndroidPaymentApp extends PaymentInstrument implements PaymentApp,
         WindowAndroid.IntentCallback {
     /** The action name for the Pay Intent. */
     public static final String ACTION_PAY = "org.chromium.intent.action.PAY";
 
     private static final String EXTRA_METHOD_NAME = "methodName";
     private static final String EXTRA_DATA = "data";
     private static final String EXTRA_ORIGIN = "origin";
     private static final String EXTRA_DETAILS = "details";
     private static final String EXTRA_INSTRUMENT_DETAILS = "instrumentDetails";
+    private static final String EXTRA_CERTIFICATE_CHAIN = "certificateChain";
+    private static final String EXTRA_CERTIFICATE = "certificate";
     private static final String EMPTY_JSON_DATA = "{}";
     private final Handler mHandler;
     private final WebContents mWebContents;
     private final Intent mIsReadyToPayIntent;
     private final Intent mPayIntent;
     private final Set<String> mMethodNames;
     private IsReadyToPayService mIsReadyToPayService;
     private InstrumentsCallback mInstrumentsCallback;
     private InstrumentDetailsCallback mInstrumentDetailsCallback;
     private final ServiceConnection mServiceConnection = new ServiceConnection() {
@@ skipping 38 matching lines @@
     /** @param methodName A payment method that this app supports, e.g., "https://bobpay.com". */
     public void addMethodName(String methodName) {
         mMethodNames.add(methodName);
     }
 
     /** @param className The class name of the "is ready to pay" service in the payment app. */
     public void setIsReadyToPayAction(String className) {
         mIsReadyToPayIntent.setClassName(mIsReadyToPayIntent.getPackage(), className);
     }
 
+    private void addCertificateChain(Bundle extras, byte[][] certificateChain) {
+        if (certificateChain != null && certificateChain.length > 0) {
+            Parcelable[] certificateArray = new Parcelable[certificateChain.length];
+            for (int i = 0; i < certificateChain.length; i++) {
+                Bundle bundle = new Bundle();
+                bundle.putByteArray(EXTRA_CERTIFICATE, certificateChain[i]);
+                certificateArray[i] = bundle;
+            }
+            extras.putParcelableArray(EXTRA_CERTIFICATE_CHAIN, certificateArray);
+        }
+    }
+
     @Override
     public void getInstruments(Map<String, PaymentMethodData> methodData, String origin,
-            InstrumentsCallback callback) {
+            byte[][] certificateChain, InstrumentsCallback callback) {
         mInstrumentsCallback = callback;
         if (mIsReadyToPayIntent.getPackage() == null) {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
                     respondToGetInstrumentsQuery(AndroidPaymentApp.this);
                 }
             });
             return;
         }
         Bundle extras = new Bundle();
         extras.putString(EXTRA_METHOD_NAME, mMethodNames.iterator().next());
         extras.putString(EXTRA_ORIGIN, origin);
         PaymentMethodData data = methodData.get(mMethodNames.iterator().next());
         extras.putString(EXTRA_DATA, data == null ? EMPTY_JSON_DATA : data.stringifiedData);
+        addCertificateChain(extras, certificateChain);
         mIsReadyToPayIntent.putExtras(extras);
 
         if (mIsReadyToPayService != null) {
             sendIsReadyToPayIntentToPaymentApp();
         } else {
             ContentViewCore contentView = ContentViewCore.fromWebContents(mWebContents);
             if (contentView == null) {
                 notifyError();
                 return;
             }
@@ skipping 60 matching lines @@
     public Set<String> getAppMethodNames() {
         return Collections.unmodifiableSet(mMethodNames);
     }
 
     @Override
     public Set<String> getInstrumentMethodNames() {
         return getAppMethodNames();
     }
 
     @Override
-    public void invokePaymentApp(String merchantName, String origin,
+    public void invokePaymentApp(String merchantName, String origin, byte[][] certificateChain,
             Map<String, PaymentMethodData> methodDataMap, PaymentItem total,
             List<PaymentItem> displayItems, Map<String, PaymentDetailsModifier> modifiers,
             InstrumentDetailsCallback callback) {
         assert !mMethodNames.isEmpty();
         Bundle extras = new Bundle();
         extras.putString(EXTRA_ORIGIN, origin);
+        addCertificateChain(extras, certificateChain);
 
         String methodName = mMethodNames.iterator().next();
         extras.putString(EXTRA_METHOD_NAME, methodName);
 
         PaymentMethodData methodData = methodDataMap.get(methodName);
         extras.putString(
                 EXTRA_DATA, methodData == null ? EMPTY_JSON_DATA : methodData.stringifiedData);
 
         String details = serializeDetails(total, displayItems);
         extras.putString(EXTRA_DETAILS, details == null ? EMPTY_JSON_DATA : details);
@@ skipping 83 matching lines @@
             mInstrumentDetailsCallback.onInstrumentDetailsReady(
                     data.getExtras().getString(EXTRA_METHOD_NAME),
                     data.getExtras().getString(EXTRA_INSTRUMENT_DETAILS));
         }
         mInstrumentDetailsCallback = null;
     }
 
     @Override
     public void dismissInstrument() {}
 }