EZP-30822: Fixed wrong usage of hasAccess in URLAliasService (#2729)

ezsystems · Aug 9, 2019 · 144757e · 144757e
1 parent 886e6c2
commit 144757e
Show file tree

Hide file tree

Showing 5 changed files with 255 additions and 590 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/URLAliasServiceAuthorizationTest.php b/eZ/Publish/API/Repository/Tests/URLAliasServiceAuthorizationTest.php
@@ -8,13 +8,14 @@
  */
 namespace eZ\Publish\API\Repository\Tests;
 
+use eZ\Publish\API\Repository\Exceptions\UnauthorizedException;
+
 class URLAliasServiceAuthorizationTest extends BaseTest
 {
     /**
      * Test for the createUrlAlias() method.
      *
      * @covers \eZ\Publish\API\Repository\URLAliasService::createUrlAlias()
-     * @expectedException \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      * @depends \eZ\Publish\API\Repository\Tests\URLAliasServiceTest::testCreateUrlAlias
      */
     public function testCreateUrlAliasThrowsUnauthorizedException()
@@ -31,12 +32,13 @@ public function testCreateUrlAliasThrowsUnauthorizedException()
         $urlAliasService = $repository->getURLAliasService();
         $locationService = $repository->getLocationService();
 
-        $location = $locationService->newLocationCreateStruct($parentLocationId);
+        $content = $this->createFolder(['eng-GB' => 'Foo'], $parentLocationId);
+        $location = $locationService->loadLocation($content->contentInfo->mainLocationId);
 
         $anonymousUser = $userService->loadUser($anonymousUserId);
         $repository->getPermissionResolver()->setCurrentUserReference($anonymousUser);
 
-        // This call will fail with an UnauthorizedException
+        $this->expectException(UnauthorizedException::class);
         $urlAliasService->createUrlAlias($location, '/Home/My-New-Site', 'eng-US');
         /* END: Use Case */
     }

diff --git a/eZ/Publish/API/Repository/Tests/URLAliasServiceTest.php b/eZ/Publish/API/Repository/Tests/URLAliasServiceTest.php
@@ -87,7 +87,7 @@ public function testCreateUrlAlias()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -144,7 +144,7 @@ public function testCreateUrlAliasWithForwarding()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -200,7 +200,7 @@ public function testCreateUrlAliasWithAlwaysAvailable()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -279,7 +279,7 @@ public function testCreateGlobalUrlAlias()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -331,7 +331,7 @@ public function testCreateGlobalUrlAliasWithForward()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -384,7 +384,7 @@ public function testCreateGlobalUrlAliasWithAlwaysAvailable()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -443,7 +443,7 @@ public function testCreateGlobalUrlAliasForLocation()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -478,7 +478,7 @@ public function testCreateGlobalUrlAliasForLocationVariation()
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $createdUrlAlias
         );
 
@@ -569,13 +569,10 @@ public function testListLocationAliases()
         $loadedAliases = $urlAliasService->listLocationAliases($location);
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
+        $this->assertIsArray($loadedAliases);
 
         // Only 1 non-history alias
-        $this->assertEquals(1, count($loadedAliases));
+        $this->assertCount(1, $loadedAliases);
 
         return [$loadedAliases, $location];
     }
@@ -591,7 +588,7 @@ public function testListLocationAliasesLoadsCorrectly(array $testData)
 
         foreach ($loadedAliases as $loadedAlias) {
             $this->assertInstanceOf(
-                'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+                URLAlias::class,
                 $loadedAlias
             );
             $this->assertEquals(
@@ -626,11 +623,8 @@ public function testListLocationAliasesWithCustomFilter()
         $loadedAliases = $urlAliasService->listLocationAliases($location, false, 'eng-US');
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
-        $this->assertEquals(1, count($loadedAliases));
+        $this->assertIsArray($loadedAliases);
+        $this->assertCount(1, $loadedAliases);
     }
 
     /**
@@ -657,11 +651,8 @@ public function testListLocationAliasesWithLanguageCodeFilter()
         $loadedAliases = $urlAliasService->listLocationAliases($location, true, 'eng-US');
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
-        $this->assertEquals(1, count($loadedAliases));
+        $this->assertIsArray($loadedAliases);
+        $this->assertCount(1, $loadedAliases);
     }
 
     /**
@@ -683,11 +674,8 @@ public function testListGlobalAliases()
         $loadedAliases = $urlAliasService->listGlobalAliases();
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
-        $this->assertEquals(3, count($loadedAliases));
+        $this->assertIsArray($loadedAliases);
+        $this->assertCount(3, $loadedAliases);
     }
 
     /**
@@ -736,11 +724,8 @@ public function testListGlobalAliasesWithLanguageFilter()
         $loadedAliases = $urlAliasService->listGlobalAliases('eng-US');
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
-        $this->assertEquals(2, count($loadedAliases));
+        $this->assertIsArray($loadedAliases);
+        $this->assertCount(2, $loadedAliases);
     }
 
     /**
@@ -762,11 +747,8 @@ public function testListGlobalAliasesWithOffset()
         $loadedAliases = $urlAliasService->listGlobalAliases(null, 1);
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
-        $this->assertEquals(2, count($loadedAliases));
+        $this->assertIsArray($loadedAliases);
+        $this->assertCount(2, $loadedAliases);
     }
 
     /**
@@ -788,11 +770,8 @@ public function testListGlobalAliasesWithLimit()
         $loadedAliases = $urlAliasService->listGlobalAliases(null, 0, 1);
         /* END: Use Case */
 
-        $this->assertInternalType(
-            'array',
-            $loadedAliases
-        );
-        $this->assertEquals(1, count($loadedAliases));
+        $this->assertIsArray($loadedAliases);
+        $this->assertCount(1, $loadedAliases);
     }
 
     /**
@@ -876,11 +855,11 @@ public function testLookUp()
         /* BEGIN: Use Case */
         $urlAliasService = $repository->getURLAliasService();
 
-        $loadedAlias = $urlAliasService->lookUp('/Setup2');
+        $loadedAlias = $urlAliasService->lookup('/Setup2');
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $loadedAlias
         );
 
@@ -902,11 +881,11 @@ public function testLookUpWithLanguageFilter()
         // Create aliases in multiple languages
         $this->createGlobalAliases();
 
-        $loadedAlias = $urlAliasService->lookUp('/My/Special-Support', 'eng-US');
+        $loadedAlias = $urlAliasService->lookup('/My/Special-Support', 'eng-US');
         /* END: Use Case */
 
         $this->assertInstanceOf(
-            'eZ\\Publish\\API\\Repository\\Values\\Content\\URLAlias',
+            URLAlias::class,
             $loadedAlias
         );
         $this->assertEquals(
@@ -929,7 +908,7 @@ public function testLookUpThrowsNotFoundException()
         $urlAliasService = $repository->getURLAliasService();
 
         // Throws NotFoundException
-        $loadedAlias = $urlAliasService->lookUp('/non-existent-url');
+        $urlAliasService->lookup('/non-existent-url');
         /* END: Use Case */
     }
 
@@ -947,7 +926,7 @@ public function testLookUpThrowsNotFoundExceptionWithLanguageFilter()
         $urlAliasService = $repository->getURLAliasService();
 
         // Throws NotFoundException
-        $loadedAlias = $urlAliasService->lookUp('/Contact-Us', 'ger-DE');
+        $urlAliasService->lookup('/Contact-Us', 'ger-DE');
         /* END: Use Case */
     }
 
@@ -965,7 +944,7 @@ public function testLookUpThrowsInvalidArgumentException()
         $urlAliasService = $repository->getURLAliasService();
 
         // Throws InvalidArgumentException
-        $loadedAlias = $urlAliasService->lookUp(str_repeat('/1', 99), 'ger-DE');
+        $loadedAlias = $urlAliasService->lookup(str_repeat('/1', 99), 'ger-DE');
         /* END: Use Case */
     }
 

diff --git a/eZ/Publish/Core/Repository/Repository.php b/eZ/Publish/Core/Repository/Repository.php
@@ -626,6 +626,7 @@ public function getURLAliasService()
             $this,
             $this->persistenceHandler->urlAliasHandler(),
             $this->getNameSchemaService(),
+            $this->getPermissionResolver(),
             $this->serviceSettings['urlAlias']
         );