Logging with Panache: fix LocalVariablesSorter usage #32679
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
The `LocalVariablesSorter` utility from ASM is prone to misuse [1], which is exactly what happened in the Logging with Panache bytecode transformation. As a result, the transformed bytecode didn't obey the JVM stack discipline, leading to verification errors or possibly incorrect log messages. With this commit, instructions that refer to the newly allocated local variables are emitted directly through the original `MethodVisitor`, bypassing the `LocalVariablesSorter`. Therefore, local variable slot numbers in these instructions are not transformed and will not refer to wrong local variables. [1] https://stackoverflow.com/questions/50140365/asm-strange-localvar-index-using-newlocal-from-localvariablesorter
|
✔️ The latest workflow run for the pull request has completed successfully. It should be safe to merge provided you have a look at the other checks in the summary. |
benkard
pushed a commit
to benkard/mulkcms2
that referenced
this pull request
May 11, 2023
This MR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [flow-bin](https://github.com/flowtype/flow-bin) ([changelog](https://github.com/facebook/flow/blob/master/Changelog.md)) | devDependencies | minor | [`^0.203.0` -> `^0.206.0`](https://renovatebot.com/diffs/npm/flow-bin/0.203.1/0.206.0) | | [org.liquibase.ext:liquibase-hibernate5](https://github.com/liquibase/liquibase-hibernate/wiki) ([source](https://github.com/liquibase/liquibase-hibernate)) | build | minor | `4.20.0` -> `4.21.1` | | [org.liquibase:liquibase-maven-plugin](http://www.liquibase.org/liquibase-maven-plugin) ([source](https://github.com/liquibase/liquibase)) | build | minor | `4.20.0` -> `4.21.1` | | [org.jsoup:jsoup](https://jsoup.org/) ([source](https://github.com/jhy/jsoup)) | compile | minor | `1.15.4` -> `1.16.1` | | [com.vladsch.flexmark:flexmark-all](https://github.com/vsch/flexmark-java) | compile | patch | `0.64.0` -> `0.64.4` | | [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | build | minor | `2.35.0` -> `2.36.0` | | [io.quarkus:quarkus-maven-plugin](https://github.com/quarkusio/quarkus) | build | patch | `2.16.6.Final` -> `2.16.7.Final` | | [io.quarkus:quarkus-universe-bom](https://github.com/quarkusio/quarkus-platform) | import | patch | `2.16.6.Final` -> `2.16.7.Final` | | [org.apache.maven.plugins:maven-enforcer-plugin](https://maven.apache.org/enforcer/) | build | minor | `3.2.1` -> `3.3.0` | --- ### Release Notes <details> <summary>flowtype/flow-bin</summary> ### [`v0.206.0`](flow/flow-bin@f1c1fe9...7bf1c0e) [Compare Source](flow/flow-bin@f1c1fe9...7bf1c0e) ### [`v0.205.1`](flow/flow-bin@7b34b50...f1c1fe9) [Compare Source](flow/flow-bin@7b34b50...f1c1fe9) ### [`v0.205.0`](flow/flow-bin@2b838b7...7b34b50) [Compare Source](flow/flow-bin@2b838b7...7b34b50) ### [`v0.204.1`](flow/flow-bin@283b669...2b838b7) [Compare Source](flow/flow-bin@283b669...2b838b7) ### [`v0.204.0`](flow/flow-bin@5e0645d...283b669) [Compare Source](flow/flow-bin@5e0645d...283b669) </details> <details> <summary>liquibase/liquibase-hibernate</summary> ### [`v4.21.1`](https://github.com/liquibase/liquibase-hibernate/releases/tag/v4.21.1) [Compare Source](liquibase/liquibase-hibernate@v4.21.0...v4.21.1) Support for Liquibase 4.21.1. **Full Changelog**: liquibase/liquibase-hibernate@v4.20.0...v4.21.1 ### [`v4.21.0`](https://github.com/liquibase/liquibase-hibernate/releases/tag/v4.21.0) [Compare Source](liquibase/liquibase-hibernate@v4.20.0...v4.21.0) Support for Liquibase 4.21.0. #### What's Changed - Bump snakeyaml from 1.33 to 2.0 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#462 - Bump spring.version from 6.0.5 to 6.0.6 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#464 - Bump maven-compiler-plugin from 3.10.1 to 3.11.0 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#461 - Fix snyk warning by [@​filipelautert](https://github.com/filipelautert) in liquibase/liquibase-hibernate#466 - UniqueConstraintSnapshotGenerator removed to avoid issue of index/constraint recreation by [@​MalloD12](https://github.com/MalloD12) in liquibase/liquibase-hibernate#468 - Bump spring.version from 6.0.6 to 6.0.7 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#470 - feat: Make test failing with unique constraints by [@​fleboulch](https://github.com/fleboulch) in liquibase/liquibase-hibernate#455 - Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#473 - Bump maven-resources-plugin from 3.3.0 to 3.3.1 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#471 - Bump maven-surefire-plugin from 2.22.2 to 3.0.0 by [@​dependabot](https://github.com/dependabot) in liquibase/liquibase-hibernate#469 - Fix types handling by [@​filipelautert](https://github.com/filipelautert) in liquibase/liquibase-hibernate#467 #### New Contributors - [@​MalloD12](https://github.com/MalloD12) made their first contribution in liquibase/liquibase-hibernate#468 - [@​fleboulch](https://github.com/fleboulch) made their first contribution in liquibase/liquibase-hibernate#455 **Full Changelog**: liquibase/liquibase-hibernate@v4.19.1...v4.21.0 </details> <details> <summary>liquibase/liquibase</summary> ### [`v4.21.1`](https://github.com/liquibase/liquibase/blob/HEAD/changelog.txt#Liquibase-4211-is-a-patch-release) [Compare Source](liquibase/liquibase@v4.21.0...v4.21.1) ### [`v4.21.0`](https://github.com/liquibase/liquibase/blob/HEAD/changelog.txt#Liquibase-v4210-is-a-major-release) [Compare Source](liquibase/liquibase@v4.20.0...v4.21.0) </details> <details> <summary>vsch/flexmark-java</summary> ### [`v0.64.4`](vsch/flexmark-java@0.64.2...0.64.4) [Compare Source](vsch/flexmark-java@0.64.2...0.64.4) ### [`v0.64.2`](vsch/flexmark-java@0.64.0...0.64.2) [Compare Source](vsch/flexmark-java@0.64.0...0.64.2) </details> <details> <summary>diffplug/spotless</summary> ### [`v2.36.0`](https://github.com/diffplug/spotless/blob/HEAD/CHANGES.md#​2360---2023-02-27) ##### Added - `gradlew equoIde` opens a repeatable clean Spotless dev environment. ([#​1523](diffplug/spotless#1523)) - `cleanthat` added `includeDraft` option, to include draft mutators from composite mutators. ([#​1574](diffplug/spotless#1574)) - `npm`-based formatters now support caching of `node_modules` directory ([#​1590](diffplug/spotless#1590)) ##### Fixed - `JacksonJsonFormatterFunc` handles json files with an Array as root. ([#​1585](diffplug/spotless#1585)) ##### Changes - Bump default `cleanthat` version to latest `2.1` -> `2.6` ([#​1569](diffplug/spotless#1569) and [#​1574](diffplug/spotless#1574)) - Reduce logging-noise created by `npm`-based formatters ([#​1590](diffplug/spotless#1590) fixes [#​1582](diffplug/spotless#1582)) </details> <details> <summary>quarkusio/quarkus</summary> ### [`v2.16.7.Final`](https://github.com/quarkusio/quarkus/releases/tag/2.16.7.Final) [Compare Source](quarkusio/quarkus@2.16.6.Final...2.16.7.Final) ##### Complete changelog - [#​33023](quarkusio/quarkus#33023) - Fix algorithm comparison bug in OIDC code loading the token decryption key - [#​33020](quarkusio/quarkus#33020) - Fixed example in command-mode-reference.adoc - [#​33012](quarkusio/quarkus#33012) - Update JReleaser guide for native executables - [#​32842](quarkusio/quarkus#32842) - Correct a typo in redis-reference.adoc - [#​32841](quarkusio/quarkus#32841) - Add a column before a table column separator `|` - [#​32838](quarkusio/quarkus#32838) - Fix a typo in security-openid-connect-multitenancy.adoc - [#​32771](quarkusio/quarkus#32771) - Prevent NPE for UserInfo String and Boolean properties - [#​32762](quarkusio/quarkus#32762) - Normalize paths for POM Model providers - [#​32753](quarkusio/quarkus#32753) - Update codestarts to use openjdk container images 1.15 - [#​32751](quarkusio/quarkus#32751) - Codestarts - OpenJDK-Container Image not updated - [#​32740](quarkusio/quarkus#32740) - Add missing static import in config interceptor doc - [#​32738](quarkusio/quarkus#32738) - Fix guide oidc trust-store config parameter name - [#​32703](quarkusio/quarkus#32703) - Include MariaDB deprecated.properties - [#​32702](quarkusio/quarkus#32702) - Native MariaDb with useSsl throw NPE - [#​32692](quarkusio/quarkus#32692) - Allow ConfigMappings with default visibility - [#​32690](quarkusio/quarkus#32690) - Quarkus dev mode is not working with a certain type of folder tree due to dependency injection - [#​32679](quarkusio/quarkus#32679) - Logging with Panache: fix LocalVariablesSorter usage - [#​32669](quarkusio/quarkus#32669) - Replace remaining references to bcX-jdk150 - [#​32663](quarkusio/quarkus#32663) - infov impacts local variable type - [#​32655](quarkusio/quarkus#32655) - Correct a minor error in native-reference.adoc - [#​32636](quarkusio/quarkus#32636) - Remove reference Uni::then in Mutiny primer - [#​32635](quarkusio/quarkus#32635) - Quarkus Mutiny guide mistake - [#​32603](quarkusio/quarkus#32603) - Avoid calling after construct callbacks twice when using `@Nested` tests - [#​32514](quarkusio/quarkus#32514) - Bump OWASP dependency check plugin version to 8.2.1 - [#​32505](quarkusio/quarkus#32505) - Throw the exception if OIDC client fails to acquire the token - [#​32501](quarkusio/quarkus#32501) - Remove unnecessary line split from metadata yaml - [#​32500](quarkusio/quarkus#32500) - `YamlMetadataGenerator` emits yaml with line splits - [#​32481](quarkusio/quarkus#32481) - Fix NPE when OIDC TenantConfigResolver returns null - [#​32480](quarkusio/quarkus#32480) - RestClient with Oidc Token (OidcClientRequestReactiveFilter) is NOT failing when Token is wrong/unauthorized - [#​32449](quarkusio/quarkus#32449) - Multitenancy OIDC permit tenant enumeration - [#​32442](quarkusio/quarkus#32442) - Add one more CORS same origin unit test - [#​32419](quarkusio/quarkus#32419) - Correcting Resteasy Reactive docs - [#​32403](quarkusio/quarkus#32403) - Make SDKMAN releases minor for maintenance and preview releases - [#​32383](quarkusio/quarkus#32383) - Using `@InjectSpy` from a JUnit5 `@Nested` inner class leads to unreliable test result - [#​32360](quarkusio/quarkus#32360) - Qute validation - fix the way the namespace expressions are collected - [#​32355](quarkusio/quarkus#32355) - Cannot using 2 classes with Qute `@MessageBundle` with different namespace - [#​32349](quarkusio/quarkus#32349) - Better error on unparseable GraphQL JSON request - [#​31939](quarkusio/quarkus#31939) - A bit of javadoc for codegen - [#​31581](quarkusio/quarkus#31581) - Arc - Do not validate static members in inner non-static classes for CDI annotations - [#​31558](quarkusio/quarkus#31558) - JUnit `@Nested` Inner Classes with `@BeforeAll` and `@Transactional` annotations fail on initialization after upgrading to 2.16.3.Final - [#​31554](quarkusio/quarkus#31554) - RunTimeMappingsConfigBuilder failures (native build/tests) with 2.16.4 </details> <details> <summary>quarkusio/quarkus-platform</summary> ### [`v2.16.7.Final`](quarkusio/quarkus-platform@2.16.6.Final...2.16.7.Final) [Compare Source](quarkusio/quarkus-platform@2.16.6.Final...2.16.7.Final) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This MR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4yNC4wIiwidXBkYXRlZEluVmVyIjoiMzQuMjQuMCJ9-->
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.
The
LocalVariablesSorterutility from ASM is prone to misuse [1], which is exactly what happened in the Logging with Panache bytecode transformation. As a result, the transformed bytecode didn't obey the JVM stack discipline, leading to verification errors or possibly incorrect log messages.With this commit, instructions that refer to the newly allocated local variables are emitted directly through the original
MethodVisitor, bypassing theLocalVariablesSorter. Therefore, local variable slot numbers in these instructions are not transformed and will not refer to wrong local variables.[1] https://stackoverflow.com/questions/50140365/asm-strange-localvar-index-using-newlocal-from-localvariablesorter
Fixes #32663