Restore "delete principal from group" listener invocation (#5584) (#5855

)
LabKey · Sep 13, 2024 · 1840233 · 1840233
1 parent c5cde63
commit 1840233
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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<UserPrincipal> 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
@@ -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"))