MAGETWO-70505: [2.1-backport] Fix trailing slash used in url rewrites #10164

 - Merge Pull Request #10164 from ihor-sviziev/magento2:patch-8
 - Merged commits:
   1. c021b6f
   2. f1e80e9
   3. 0e9575d
   4. 86a3227
   5. 7d88a9b
   6. d1a0703
   7. 8ced0da
   8. d950a82
   9. 82a7dce
   10. ad3f213
   11. 4df2dcb

Author: Oleksii Korshenko

app/code/Magento/Store/Model/BaseUrlChecker.php

@@ -34,17 +34,10 @@ public function __construct(
     public function execute($uri, $request)
     {
         $requestUri = $request->getRequestUri() ? $request->getRequestUri() : '/';
-
-        return (!isset(
-            $uri['scheme']
-        ) || $uri['scheme'] === $request->getScheme()) && (!isset(
-            $uri['host']
-        ) || $uri['host'] === $request->getHttpHost()) && (!isset(
-            $uri['path']
-        ) || strpos(
-            $requestUri,
-            $uri['path']
-        ) !== false);
+        $isValidSchema = !isset($uri['scheme']) || $uri['scheme'] === $request->getScheme();
+        $isValidHost = !isset($uri['host']) || $uri['host'] === $request->getHttpHost();
+        $isValidPath = !isset($uri['path']) || strpos($requestUri, $uri['path']) !== false;
+        return $isValidSchema && $isValidHost && $isValidPath;
     }
 
     /**

app/code/Magento/UrlRewrite/Controller/Router.php

@@ -127,7 +127,7 @@ protected function redirect($request, $url, $code)
     protected function getRewrite($requestPath, $storeId)
     {
         return $this->urlFinder->findOneByData([
-            UrlRewrite::REQUEST_PATH => trim($requestPath, '/'),
+            UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),
             UrlRewrite::STORE_ID => $storeId,
         ]);
     }

app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php

@@ -109,7 +109,7 @@ protected function createUrlRewrite($data)
         $this->dataObjectHelper->populateWithArray(
             $dataObject,
             $data,
-            '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite'
+            \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class
         );
         return $dataObject;
     }

app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php

@@ -5,10 +5,11 @@
  */
 namespace Magento\UrlRewrite\Model\Storage;
 
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\ResourceConnection;
+use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-use Magento\Framework\Api\DataObjectHelper;
 
 class DbStorage extends AbstractStorage
 {
@@ -78,6 +79,54 @@ protected function doFindAllByData($data)
      */
     protected function doFindOneByData($data)
     {
+        if (is_array($data)
+            && array_key_exists(UrlRewrite::REQUEST_PATH, $data)
+            && is_string($data[UrlRewrite::REQUEST_PATH])
+        ) {
+            $result = null;
+
+            $requestPath = $data[UrlRewrite::REQUEST_PATH];
+
+            $data[UrlRewrite::REQUEST_PATH] = [
+                rtrim($requestPath, '/'),
+                rtrim($requestPath, '/') . '/',
+            ];
+
+            $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
+
+            if (count($resultsFromDb) === 1) {
+                $resultFromDb = current($resultsFromDb);
+                $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
+
+                // If request path matches the DB value or it's redirect - we can return result from DB
+                $canReturnResultFromDb = ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
+                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true));
+
+                // Otherwise return 301 redirect to request path from DB results
+                $result = $canReturnResultFromDb ? $resultFromDb : [
+                    UrlRewrite::ENTITY_TYPE => 'custom',
+                    UrlRewrite::ENTITY_ID => '0',
+                    UrlRewrite::REQUEST_PATH => $requestPath,
+                    UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
+                    UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
+                    UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
+                    UrlRewrite::DESCRIPTION => null,
+                    UrlRewrite::IS_AUTOGENERATED => '0',
+                    UrlRewrite::METADATA => null,
+                ];
+            } else {
+                // If we have 2 results - return the row that matches request path
+                foreach ($resultsFromDb as $resultFromDb) {
+                    if ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath) {
+                        $result = $resultFromDb;
+                        break;
+                    }
+                }
+            }
+
+            return $result;
+        }
+
         return $this->connection->fetchRow($this->prepareSelect($data));
     }
 

app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/AbstractStorageTest.php

@@ -53,7 +53,7 @@ public function testFindAllByData()
 
         $this->dataObjectHelper->expects($this->at(0))
             ->method('populateWithArray')
-            ->with($urlRewrites[0], $rows[0], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
+            ->with($urlRewrites[0], $rows[0], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
             ->will($this->returnSelf());
 
         $this->urlRewriteFactory->expects($this->at(0))
@@ -62,7 +62,7 @@ public function testFindAllByData()
 
         $this->dataObjectHelper->expects($this->at(1))
             ->method('populateWithArray')
-            ->with($urlRewrites[1], $rows[1], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
+            ->with($urlRewrites[1], $rows[1], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
             ->will($this->returnSelf());
 
         $this->urlRewriteFactory->expects($this->at(1))
@@ -97,7 +97,7 @@ public function testFindOneByDataIfFound()
 
         $this->dataObjectHelper->expects($this->once())
             ->method('populateWithArray')
-            ->with($urlRewrite, $row, '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
+            ->with($urlRewrite, $row, \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
             ->will($this->returnSelf());
 
         $this->urlRewriteFactory->expects($this->any())