MERGE: Branch '3.3' into 4.0

neos · Jun 16, 2019 · 6b10a5b · 6b10a5b
2 parents fe4ac1a + ef32e63
commit 6b10a5b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/Configuration/Policy.yaml b/Configuration/Policy.yaml
@@ -2,7 +2,27 @@
 # Security policy for the ContentRepository package                                #
 #                                                                        #
 
+privilegeTargets:
+  'Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilege':
+    'Neos.Neos:PublicWorkspaceAccess':
+      matcher: 'method(Neos\ContentRepository\Domain\Service\Context->validateWorkspace()) && evaluate(this.workspace.publicWorkspace === true)'
+
+    'Neos.Neos:OtherWorkspacesAccess':
+      matcher: 'method(Neos\ContentRepository\Domain\Service\Context->validateWorkspace()) && evaluate(this.workspace.publicWorkspace === false) && evaluate(this.workspace.personalWorkspace === false)'
+
 roles:
+  'Neos.Flow:Everybody':
+    privileges:
+      - privilegeTarget: 'Neos.Neos:PublicWorkspaceAccess'
+        permission: GRANT
+
+  'Neos.ContentRepository:InternalWorkspaceAccess':
+    abstract: TRUE
+    privileges:
+      - privilegeTarget: 'Neos.Neos:OtherWorkspacesAccess'
+        permission: GRANT
 
   'Neos.ContentRepository:Administrator':
     abstract: true
+    parentRoles: ['Neos.ContentRepository:InternalWorkspaceAccess']
+
diff --git a/Configuration/Testing/Policy.yaml b/Configuration/Testing/Policy.yaml
@@ -0,0 +1,7 @@
+#                                                                        #
+# Security policy for the ContentRepository package                                #
+#                                                                        #
+
+roles:
+  'Neos.ContentRepository:TestingAdministrator':
+    parentRoles: ['Neos.ContentRepository:Administrator']
diff --git a/Tests/Functional/Eel/FlowQueryOperations/FindOperationTest.php b/Tests/Functional/Eel/FlowQueryOperations/FindOperationTest.php
@@ -156,6 +156,7 @@ public function attributeFilterIsSupported($filter, array $expectedNodePaths)
      */
     public function findByNodeIdentifierReturnsCorrectNodeInContext()
     {
+        $this->authenticateRoles(['Neos.ContentRepository:TestingAdministrator']);
         $q = new FlowQuery(array($this->node));
         $foundNode = $q->find('#30e893c1-caef-0ca5-b53d-e5699bb8e506')->get(0);
         $this->assertSame($this->node->getNode('about-us'), $foundNode);
@@ -273,6 +274,7 @@ public function findByNodeWithRelativePathReturnsCorrectNode()
      */
     public function findByMultipleNodesReturnsMatchingNodesForAllNodes()
     {
+        $this->authenticateRoles(['Neos.ContentRepository:TestingAdministrator']);
         $testContext = $this->contextFactory->create(array('workspaceName' => 'test'));
         $testNodeA = $testContext->getNode('/sites/example/home/main/dummy44');
         $testNodeB = $testContext->getNode('/sites/example/home/main/dummy45');