This repository has been archived by the owner on Jun 30, 2023. It is now read-only.
jar: support Go 1.19 archive/zip #63
Merged
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
In Go 1.19 the standard library's archive/zip package will
automatically and silently handle a prefixed zip file.
The log4jscanner package expects to handle the offset itself.
To let log4jscanner work with both Go 1.18 and 1.19,
change it to read the offset first, before using the archive/zip
package.
Tested by running tests with both Go 1.18 and Go tip.
Without this change, Go tip fails with
--- FAIL: TestAutoMitigateExecutable (0.00s)
--- FAIL: TestAutoMitigateExecutable/helloworld-executable (0.00s)
rewrite_test.go:247: expected offset for executable testdata/helloworld-executable: got=0
--- FAIL: TestAutoMitigateExecutable/vuln-class-executable (0.00s)
rewrite_test.go:247: expected offset for executable testdata/vuln-class-executable: got=0
FAIL
FAIL github.com/google/log4jscanner/jar 34.541s
ericchiang
approved these changes
May 25, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In Go 1.19 the standard library's archive/zip package will
automatically and silently handle a prefixed zip file.
The log4jscanner package expects to handle the offset itself.
To let log4jscanner work with both Go 1.18 and 1.19,
change it to read the offset first, before using the archive/zip
package.
Tested by running tests with both Go 1.18 and Go tip.
Without this change, Go tip fails with
--- FAIL: TestAutoMitigateExecutable (0.00s)
--- FAIL: TestAutoMitigateExecutable/helloworld-executable (0.00s)
rewrite_test.go:247: expected offset for executable testdata/helloworld-executable: got=0
--- FAIL: TestAutoMitigateExecutable/vuln-class-executable (0.00s)
rewrite_test.go:247: expected offset for executable testdata/vuln-class-executable: got=0
FAIL
FAIL github.com/google/log4jscanner/jar 34.541s