kwin commented on code in PR #294:
URL:
https://github.com/apache/jackrabbit-filevault/pull/294#discussion_r1182405550
##########
vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java:
##########
@@ -565,6 +574,52 @@ public void run(Archive archive, Session session, String
parentPath)
}
}
+ private void restorePrincipalAcls(Session session) throws
RepositoryException {
+ for (String authorizableId : createdAuthorizableIds) {
+ String principalName = userManagement.getPrincipalName(session,
authorizableId);
+ if (deletedPrincipalAcls.containsKey(principalName)) {
+ if (opts.isDryRun()) {
+ track("Dry run: Would potentially restore principal ACLs
of " + principalName + " ...", "");
+ } else {
+ for (AccessControlPolicy policy :
deletedPrincipalAcls.get(principalName)) {
+ // CUG or ACL handling relevant?
+ AccessControlHandling aclHandling;
+ if (policy instanceof PrincipalSetPolicy) {
+ aclHandling = opts.getCugHandling();
+ } else {
+ aclHandling = opts.getAccessControlHandling();
+ }
+ // convert aclHandling (as this was set for the
imported ACLs, not the existing ones)
+ final AccessControlHandling
aclHandlingForRestoredPolicy;
+ switch (aclHandling) {
+ case OVERWRITE:
+ aclHandlingForRestoredPolicy =
AccessControlHandling.IGNORE;
+ break;
+ case IGNORE:
+ aclHandlingForRestoredPolicy =
AccessControlHandling.OVERWRITE;
+ break;
+ case CLEAR:
+ aclHandlingForRestoredPolicy =
AccessControlHandling.IGNORE;
+ break;
+ case MERGE:
+ aclHandlingForRestoredPolicy =
AccessControlHandling.MERGE;
Review Comment:
@adamcin Can you come up with a dedicated JIRA issue and first a PR to fix
the javadoc according to the status quo (for `AccessControlHandling`).
Afterwards we can discuss modifying the behaviour.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
