Duplicate payment method identifiers in methodData and details.modififiers should throw TypeError.

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

 // Copyright 2016 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.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/modules/v8/V8PaymentDetails.h"
 #include "core/EventTypeNames.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/Event.h"
 #include "core/events/EventQueue.h"
 #include "modules/EventTargetModulesNames.h"
 #include "modules/payments/PaymentAddress.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentRequestUpdateEvent.h"
 #include "modules/payments/PaymentResponse.h"
 #include "modules/payments/PaymentShippingOption.h"
 #include "modules/payments/PaymentsValidators.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/wtf_array.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/ServiceRegistry.h"

[please use gerrit instead, 2016/07/06 07:31:56]

#include "wtf/HashSet.h"

[pals, 2016/07/07 05:14:13]

Done.

 #include <utility>
 
 namespace mojo {
 
 using blink::mojom::blink::PaymentCurrencyAmount;
 using blink::mojom::blink::PaymentCurrencyAmountPtr;
 using blink::mojom::blink::PaymentDetails;
 using blink::mojom::blink::PaymentDetailsModifier;
 using blink::mojom::blink::PaymentDetailsModifierPtr;
 using blink::mojom::blink::PaymentDetailsPtr;
@@ skipping 179 matching lines @@
     }
 }
 
 void validatePaymentDetailsModifiers(const HeapVector<PaymentDetailsModifier>& modifiers, ExceptionState& exceptionState)
 {
     if (modifiers.isEmpty()) {
         exceptionState.throwTypeError("Must specify at least one payment details modifier");
         return;
     }
 
+    HashSet<String> uniqueMethods;
     for (const auto& modifier : modifiers) {
         if (modifier.supportedMethods().isEmpty()) {
             exceptionState.throwTypeError("Must specify at least one payment method identifier");
             return;
+        } else {

[please use gerrit instead, 2016/07/06 07:31:56]

No need for "else", because the previous clause returns.

[pals, 2016/07/07 05:14:13]

Done.

+            for (const auto& method : modifier.supportedMethods()) {
+                if (uniqueMethods.contains(method)) {
+                    exceptionState.throwTypeError("Duplicate payment method identifiers are not allowed");
+                    return;
+                }
+                uniqueMethods.add(method);
+            }
         }
 
         if (modifier.hasTotal()) {
             validateShippingOptionOrPaymentItem(modifier.total(), exceptionState);
             if (exceptionState.hadException())
                 return;
 
             if (modifier.total().amount().value()[0] == '-') {
                 exceptionState.throwTypeError("Total amount value should be non-negative");
                 return;
@@ skipping 41 matching lines @@
     }
 }
 
 void validateAndConvertPaymentMethodData(const HeapVector<PaymentMethodData>& paymentMethodData, Vector<PaymentRequest::MethodData>* methodData, ExceptionState& exceptionState)
 {
     if (paymentMethodData.isEmpty()) {
         exceptionState.throwTypeError("Must specify at least one payment method identifier");
         return;
     }
 
+    HashSet<String> uniqueMethods;
     for (const auto& pmd : paymentMethodData) {
         if (pmd.supportedMethods().isEmpty()) {
             exceptionState.throwTypeError("Must specify at least one payment method identifier");
             return;
+        } else {

[please use gerrit instead, 2016/07/06 07:31:56]

Ditto.

[pals, 2016/07/07 05:14:13]

Done.

+            for (const auto& method : pmd.supportedMethods()) {
+                if (uniqueMethods.contains(method)) {
+                    exceptionState.throwTypeError("Duplicate payment method identifiers are not allowed");
+                    return;
+                }
+                uniqueMethods.add(method);
+            }
         }
 
         String stringifiedData = "";
         if (pmd.hasData() && !pmd.data().isEmpty()) {
             RefPtr<JSONValue> value = toJSONValue(pmd.data().context(), pmd.data().v8Value());
             if (!value) {
                 exceptionState.throwTypeError("Unable to parse payment method specific data");
                 return;
             }
             if (!value->isNull()) {
@@ skipping 301 matching lines @@
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     m_abortResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink