AC-1271: Add rate limiting for payment information endpoint and mutation

Author: arhiopterecs

lib/internal/Magento/Framework/App/Backpressure/BackpressureExceededException.php

@@ -9,17 +9,8 @@
 namespace Magento\Framework\App\Backpressure;
 
 /**
- * Thrown when backpressure is exceeded.
+ * Thrown when backpressure is exceeded
  */
 class BackpressureExceededException extends \RuntimeException
 {
-    /**
-     * @param \Throwable|null $prev
-     * @param string $message
-     * @param int $code
-     */
-    public function __construct(?\Throwable $prev = null, string $message = 'Backpressure exceeded', int $code = 0)
-    {
-        parent::__construct($message, $code, $prev);
-    }
 }

lib/internal/Magento/Framework/App/Backpressure/ContextInterface.php

@@ -11,7 +11,7 @@
 use Magento\Framework\App\RequestInterface;
 
 /**
- * Request context.
+ * Request context
  */
 interface ContextInterface
 {
@@ -22,30 +22,30 @@ interface ContextInterface
     public const IDENTITY_TYPE_ADMIN = 2;
 
     /**
-     * Current request.
+     * Current request
      *
      * @return RequestInterface
      */
     public function getRequest(): RequestInterface;
 
     /**
-     * Unique ID for request issuer.
+     * Unique ID for request issuer
      *
      * @return string
      */
     public function getIdentity(): string;
 
     /**
-     * Type of identity detected.
+     * Type of identity detected
      *
      * @return int
      */
     public function getIdentityType(): int;
 
     /**
-     * Request type ID.
+     * Request type ID
      *
-     * String ID of the functionality that requires backpressure enforcement.
+     * String ID of the functionality that requires backpressure enforcement
      *
      * @return string
      */

lib/internal/Magento/Framework/App/Backpressure/IdentityProviderInterface.php

@@ -14,14 +14,14 @@
 interface IdentityProviderInterface
 {
     /**
-     * One of ContextInterface constants.
+     * One of ContextInterface constants
      *
      * @return int
      */
     public function fetchIdentityType(): int;
 
     /**
-     * Identity string representation.
+     * Identity string representation
      *
      * @return string
      */

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/CacheRequestLogger.php

@@ -13,7 +13,7 @@
 use Magento\Framework\Cache\FrontendInterface;
 
 /**
- * Logging requests to cache.
+ * Logging requests to cache
  */
 class CacheRequestLogger implements RequestLoggerInterface
 {
@@ -43,13 +43,13 @@ public function incrAndGetFor(ContextInterface $context, int $timeSlot, int $dis
             $cache = $this->cache->getBackend();
 
             return $cache->updateByAndGet($id, 1, time() + $discardAfter);
-        } else {
-            //Non-atomic way
-            $n = (int) ($this->cache->load($id) ?? 0);
-            $this->cache->save((string) ++$n, $id, [], $discardAfter);
-
-            return $n;
         }
+
+        //Non-atomic way
+        $n = (int) ($this->cache->load($id) ?? 0);
+        $this->cache->save((string) ++$n, $id, [], $discardAfter);
+
+        return $n;
     }
 
     /**

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/CompositeLimitConfigManager.php

@@ -9,9 +9,10 @@
 namespace Magento\Framework\App\Backpressure\SlidingWindow;
 
 use Magento\Framework\App\Backpressure\ContextInterface;
+use Magento\Framework\Exception\RuntimeException;
 
 /**
- * Delegates finding configs for different requests types to other instances.
+ * Delegates finding configs for different requests types to other instances
  */
 class CompositeLimitConfigManager implements LimitConfigManagerInterface
 {
@@ -29,14 +30,21 @@ public function __construct(array $configs)
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
+     *
+     * @throws RuntimeException
      */
     public function readLimit(ContextInterface $context): LimitConfig
     {
-        if (!array_key_exists($context->getTypeId(), $this->configs)) {
-            throw new \RuntimeException(sprintf('Failed to find config manager for "%s".', $context->getTypeId()));
+        if (isset($this->configs[$context->getTypeId()])) {
+            return $this->configs[$context->getTypeId()]->readLimit($context);
         }
 
-        return $this->configs[$context->getTypeId()]->readLimit($context);
+        throw new RuntimeException(
+            __(
+                'Failed to find config manager for "%typeId".',
+                [ 'typeId' => $context->getTypeId()]
+            )
+        );
     }
 }

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/LimitConfig.php

@@ -9,7 +9,7 @@
 namespace Magento\Framework\App\Backpressure\SlidingWindow;
 
 /**
- * Limit configuration.
+ * Limit configuration
  */
 class LimitConfig
 {
@@ -34,7 +34,7 @@ public function __construct(int $limit, int $period)
     }
 
     /**
-     * Requests per period.
+     * Requests per period
      *
      * @return int
      */
@@ -44,7 +44,7 @@ public function getLimit(): int
     }
 
     /**
-     * Period in seconds.
+     * Period in seconds
      *
      * @return int
      */

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/LimitConfigManagerInterface.php

@@ -11,12 +11,12 @@
 use Magento\Framework\App\Backpressure\ContextInterface;
 
 /**
- * Provides limit configuration for request contexts.
+ * Provides limit configuration for request contexts
  */
 interface LimitConfigManagerInterface
 {
     /**
-     * Find limits for given context.
+     * Find limits for given context
      *
      * @param ContextInterface $context
      * @return LimitConfig

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/RequestLoggerInterface.php

@@ -11,22 +11,22 @@
 use Magento\Framework\App\Backpressure\ContextInterface;
 
 /**
- * Logs requests.
+ * Logs requests
  */
 interface RequestLoggerInterface
 {
     /**
-     * Increase counter for requests coming inside given timeslot from given identity.
+     * Increase counter for requests coming inside given timeslot from given identity
      *
      * @param ContextInterface $context
-     * @param int $timeSlot Time slot to increase the counter for (timestamp).
-     * @param int $discardAfter Counter for the time slot can be discarded after given number of seconds.
-     * @return int Requests logged for the identity and the time slot.
+     * @param int $timeSlot Time slot to increase the counter for (timestamp)
+     * @param int $discardAfter Counter for the time slot can be discarded after given number of seconds
+     * @return int Requests logged for the identity and the time slot
      */
     public function incrAndGetFor(ContextInterface $context, int $timeSlot, int $discardAfter): int;
 
     /**
-     * Get counter for specific identity and time slot.
+     * Get counter for specific identity and time slot
      *
      * @param ContextInterface $context
      * @param int $timeSlot

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/SlidingWindowEnforcer.php

@@ -14,7 +14,7 @@
 use Magento\Framework\Stdlib\DateTime\DateTime;
 
 /**
- * Uses Sliding Window approach to record request times and enforce limits.
+ * Uses Sliding Window approach to record request times and enforce limits
  */
 class SlidingWindowEnforcer implements BackpressureEnforcerInterface
 {

lib/internal/Magento/Framework/App/BackpressureEnforcerInterface.php

@@ -12,12 +12,12 @@
 use Magento\Framework\App\Backpressure\ContextInterface;
 
 /**
- * Enforces certain backpressure.
+ * Enforces certain backpressure
  */
 interface BackpressureEnforcerInterface
 {
     /**
-     * Enforce the backpressure by throwing the exception when limit exceeded.
+     * Enforce the backpressure by throwing the exception when limit exceeded
      *
      * @param ContextInterface $context
      * @throws BackpressureExceededException