Explicitly pass null filter when creating SecureJar/UnionFS #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using a non-null lambda defeats the optimization in UnionFS that skips the code in testFilter
embeddedt
commented
Aug 23, 2023
| @@ -38,7 +38,7 @@ protected IModLocator.ModFileOrException createMod(Path... path) { | |||
| var sj = SecureJar.from( | |||
| Manifest::new, | |||
| jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path), | |||
| (root, p) -> true, | |||
| null, | |||
There was a problem hiding this comment.
I've tested this specific class' change in production using my Java agent and an equivalent ASM transformer. The other changes have not been tested yet.
Technici4n
approved these changes
Aug 23, 2023
Jab125
added a commit
to Jab125/FancyModLoader
that referenced
this pull request
Sep 24, 2023
Pass null for an "always" filter instead of a separate lambda (neoforged#19)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
UnionFileSystem.testFiltercontains an optimization intended for the case where no path filter is set:https://github.com/McModLauncher/securejarhandler/blob/1dedb0655d9f4b8cf310ea7095b38c7a978a42ab/src/main/java/cpw/mods/niofs/union/UnionFileSystem.java#L397
However, all of the code paths creating commonly-used UnionFS instances in FML are passing non-null
(a, b) -> truelambdas, defeating this optimization. I have frequently seentestFilterappearing as a hotspot in my profiling while working on ModernFix.The solution is quite simple: start passing
nullinstead of a lambda. I've gone through the codebase and replaced all the lambdas matching this pattern.Would appreciate review from someone familiar with this part of the codebase.