From 1840233bcdb9fd308a04de9c0da68514ac78f4d4 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 13 Sep 2024 13:42:40 -0700 Subject: [PATCH] Restore "delete principal from group" listener invocation (#5584) (#5855) --- api/src/org/labkey/api/security/SecurityManager.java | 5 +++++ .../src/org/labkey/search/model/LuceneSearchServiceImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/src/org/labkey/api/security/SecurityManager.java b/api/src/org/labkey/api/security/SecurityManager.java index 95ca2bfe3c4..2a0d502352e 100644 --- a/api/src/org/labkey/api/security/SecurityManager.java +++ b/api/src/org/labkey/api/security/SecurityManager.java @@ -1526,6 +1526,11 @@ public static void deleteMembers(Group group, Collection membersT GroupMembershipCache.handleGroupChange(group, member); }, CommitTaskOption.IMMEDIATE, CommitTaskOption.POSTCOMMIT, CommitTaskOption.POSTROLLBACK); + transaction.addCommitTask( () -> { + for (UserPrincipal member : membersToDelete) + fireDeletePrincipalFromGroup(group.getUserId(), member); + }, CommitTaskOption.POSTCOMMIT); + if (!group.isProjectGroup()) ensureAtLeastOneRootAdminExists(); diff --git a/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java b/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java index e80be321f7a..b86c79b6845 100644 --- a/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java +++ b/search/src/org/labkey/search/model/LuceneSearchServiceImpl.java @@ -909,9 +909,10 @@ else if (topMessage.equals("Zip bomb detected!")) // Tika flags some files as "zip bombs" logAsWarning(r, "Can't parse this file", rootMessage); } - else if (topMessage.equals("Unable to unpack document stream")) + // "org.apache.commons.compress.archivers.ArchiveException: No Archiver found for the stream signature" OR + // "org.tukaani.xz.UnsupportedOptionsException: LZMA dictionary is too big for this implementation" + else if (topMessage.equals("Unable to unpack document stream") || rootMessage.equals("LZMA dictionary is too big for this implementation")) { - // Usually "org.apache.commons.compress.archivers.ArchiveException: No Archiver found for the stream signature" logAsWarning(r, "Can't decompress this file", rootMessage); } else if (StringUtils.endsWithIgnoreCase(r.getName(), ".chm"))