Changeset 202341 in webkit

Timestamp:

Jun 22, 2016 11:43:18 AM (8 years ago)

Author:

andersca@apple.com

Message:

Exception is not thrown when shipping method is an invalid amount
​https://bugs.webkit.org/show_bug.cgi?id=159029
rdar://problem/26700413

Reviewed by Tim Horton.

• Modules/applepay/PaymentRequest.h:

Change ShippingMethod::amount to be a signed 64-bit integer.

• Modules/applepay/PaymentRequestValidator.cpp:

(WebCore::PaymentRequestValidator::validate):
Call validateShippingMethods.

(WebCore::PaymentRequestValidator::validateShippingMethods):
Validate all the shipping methods.

(WebCore::PaymentRequestValidator::validateShippingMethod):
Check that the amount is >= 0.

• Modules/applepay/PaymentRequestValidator.h:

Add new members.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/PaymentRequest.h (modified) (1 diff)
• Modules/applepay/PaymentRequestValidator.cpp (modified) (3 diffs)
• Modules/applepay/PaymentRequestValidator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-22  Anders Carlsson  <andersca@apple.com>
+
+        Exception is not thrown when shipping method is an invalid amount
+        https://bugs.webkit.org/show_bug.cgi?id=159029
+        rdar://problem/26700413
+
+        Reviewed by Tim Horton.
+
+        * Modules/applepay/PaymentRequest.h:
+        Change ShippingMethod::amount to be a signed 64-bit integer.
+
+        * Modules/applepay/PaymentRequestValidator.cpp:
+        (WebCore::PaymentRequestValidator::validate):
+        Call validateShippingMethods.
+
+        (WebCore::PaymentRequestValidator::validateShippingMethods):
+        Validate all the shipping methods.
+
+        (WebCore::PaymentRequestValidator::validateShippingMethod):
+        Check that the amount is >= 0.
+
+        * Modules/applepay/PaymentRequestValidator.h:
+        Add new members.
+
 2016-06-22  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/WebCore/Modules/applepay/PaymentRequest.h

@@ -113 +113 @@
         String label;
         String detail;
-        uint64_t amount;
+        int64_t amount;
 
         String identifier;

trunk/Source/WebCore/Modules/applepay/PaymentRequestValidator.cpp

@@ -58 +58 @@
     if (!validateTotal(paymentRequest.total()))
         return false;
-
+    if (!validateShippingMethods(paymentRequest.shippingMethods()))
+        return false;
     return true;
 }
@@ -137 +138 @@
 }
 
+bool PaymentRequestValidator::validateShippingMethod(const PaymentRequest::ShippingMethod& shippingMethod) const
+{
+    if (shippingMethod.amount < 0) {
+        m_window.printErrorMessage("Shipping method amount must be greater than or equal to zero.");
+        return false;
+    }
+
+    return true;
+}
+
 bool PaymentRequestValidator::validateSupportedNetworks(const PaymentRequest::SupportedNetworks& supportedNetworks) const
 {
@@ -147 +158 @@
 }
 
+bool PaymentRequestValidator::validateShippingMethods(const Vector<PaymentRequest::ShippingMethod>& shippingMethods) const
+{
+    for (const auto& shippingMethod : shippingMethods) {
+        if (!validateShippingMethod(shippingMethod))
+            return false;
+    }
+
+    return true;
+}
+
 }
 

trunk/Source/WebCore/Modules/applepay/PaymentRequestValidator.h

@@ -48 +48 @@
     bool validateSupportedNetworks(const PaymentRequest::SupportedNetworks&) const;
 
+    bool validateShippingMethods(const Vector<PaymentRequest::ShippingMethod>&) const;
+    bool validateShippingMethod(const PaymentRequest::ShippingMethod&) const;
+
     DOMWindow& m_window;
 };