You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2022/05/30 06:34:20 UTC

[jackrabbit-oak] 01/01: Merge pull request #574 from apache/OAK-9775

This is an automated email from the ASF dual-hosted git repository.

angela pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit eab9088abc08d2e51cb51c609a3856d8de2a4186
Merge: 8de8333cf1 8c9d20b1ff
Author: anchela <an...@apache.org>
AuthorDate: Mon May 30 08:34:14 2022 +0200

    Merge pull request #574 from apache/OAK-9775
    
    OAK-9775 : ACEs with unsupported restrictions must be cleared upon editing, OAK-9782 : CompositeRestrictionProvider must call validate on aggregated providers

 .../principalbased/impl/EntryCache.java            |   6 +-
 .../impl/PrincipalBasedAccessControlManager.java   |   8 +-
 .../principalbased/impl/PrincipalPolicyImpl.java   |  10 +-
 .../authorization/principalbased/impl/Utils.java   |  30 +++
 .../principalbased/impl/EntryCacheTest.java        |  38 +++-
 .../impl/UnsupportedRestrictionTest.java           | 184 ++++++++++++++++
 .../accesscontrol/AccessControlManagerImpl.java    |  21 +-
 .../restriction/RestrictionProviderImpl.java       |   2 +-
 .../accesscontrol/UnsupportedRestrictionTest.java  | 243 +++++++++++++++++++++
 .../restriction/RestrictionProviderImplTest.java   |  40 +++-
 .../restriction/AbstractRestrictionProvider.java   |  67 +++++-
 .../{package-info.java => AggregationAware.java}   |  14 +-
 .../restriction/CompositeRestrictionProvider.java  |  75 ++-----
 .../authorization/restriction/package-info.java    |   2 +-
 .../AbstractRestrictionProviderTest.java           |  21 ++
 .../CompositeRestrictionProviderTest.java          |  93 +++++++-
 16 files changed, 768 insertions(+), 86 deletions(-)