MERGE:Merge branch '3.3' into '4.0'

neos · Jun 15, 2019 · adf69c6 · adf69c6
2 parents d18da48 + 60aa2cb
commit adf69c6
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/Configuration/Policy.yaml b/Configuration/Policy.yaml
@@ -18,7 +18,13 @@ privilegeTargets:
       matcher: 'method(Neos\FluidAdaptor\ViewHelpers\Widget\Controller\AutocompleteController->(index|autocomplete)Action()) || method(Neos\FluidAdaptor\ViewHelpers\Widget\Controller\PaginateController->indexAction()) || method(Neos\ContentRepository\ViewHelpers\Widget\Controller\PaginateController->indexAction()) || method(Neos\Neos\ViewHelpers\Widget\Controller\LinkRepositoryController->(index|search|lookup)Action())'
 
     'Neos.Neos:PublicFrontendAccess':
-      matcher: 'method(Neos\Neos\Controller\Frontend\NodeController->showAction()) || method(Neos\Neos\TypeConverter\NodeConverter->prepareContextProperties(workspaceName === "live"))'
+      matcher: 'method(Neos\Neos\Controller\Frontend\NodeController->showAction())'
+
+    '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)'
 
     'Neos.Neos:BackendLogin':
       matcher: 'method(Neos\Neos\Controller\LoginController->(index|tokenLogin|authenticate)Action()) || method(Neos\Flow\Security\Authentication\Controller\AbstractAuthenticationController->authenticateAction())'
@@ -144,6 +150,10 @@ roles:
         privilegeTarget: 'Neos.Neos:PublicFrontendAccess'
         permission: GRANT
 
+      -
+        privilegeTarget: 'Neos.Neos:PublicWorkspaceAccess'
+        permission: GRANT
+
       -
         privilegeTarget: 'Neos.Neos:BackendLogin'
         permission: GRANT
@@ -243,6 +253,10 @@ roles:
         privilegeTarget: 'Neos.Neos:Backend.Module.Management.History'
         permission: GRANT
 
+      -
+        privilegeTarget: 'Neos.Neos:OtherWorkspacesAccess'
+        permission: GRANT
+
   'Neos.Neos:RestrictedEditor':
     parentRoles: ['Neos.Neos:AbstractEditor']