fix(verifier): reject recursive script handlers#910
Merged
Conversation
BTraceProbePersisted.checkVerified() now always throws when verification fails, but the AtomicBoolean-guarded isVerified() let a losing thread fall through to `return false` before the winning thread populated verificationFailure, risking an NPE instead of VerifierException. Serialize verification with a synchronized block so racing callers observe consistent state. Also fix the onmethod/ArgsUnsafe golden traces, which called Throwable.getMessage() directly in a catch block -- a call the verifier has always disallowed outside BTraceUtils/injected services. This was previously masked by checkVerified()'s no-op bug and now fails CI now that verification failures are enforced.
jbachorik
marked this pull request as ready for review
July 19, 2026 10:45
This file contains hidden or 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
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.
Summary
Fixes #890 by rejecting handler-reachable direct and mutual recursion in BTrace scripts.
Why
Recursive helpers previously passed both verifier layers, allowing a hot probe to consume traced-thread stack and CPU until stack overflow.
Compatibility
Acyclic helpers and trusted scripts retain their existing behavior. This tightens safety only for non-trusted recursive scripts.
Validation
:btrace-compiler:testMethodVerifierDslTestandCallGraphTest:btrace-compiler:spotlessCheck :btrace-agent:spotlessCheckgit diff --checkThis change is