Skip to content

Refactor before entitlements for testing #129099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 9, 2025
Merged

Refactor before entitlements for testing #129099

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
94049e7
Support multiple plugin source paths
prdoyle Jun 6, 2025
6a3fce8
Refactor: remove unncessary PathLookup method.
prdoyle Jun 6, 2025
3e62ec6
Refactor: local var for pathLookup
prdoyle Jun 6, 2025
c8317d7
Fix bugs in test build info parsing
prdoyle Jun 2, 2025
4a8e676
Fix representative_class in test
prdoyle Jun 5, 2025
c850b80
Move BridgeUtilTests.
prdoyle Jun 4, 2025
9b8e676
Upcast (?!) Java23EntitlementChecker to EntitlementChecker
prdoyle Jun 2, 2025
21ce09c
Empty TestPathLookup
prdoyle Jun 2, 2025
d08d6d2
Create PolicyManager during bootstrap, allowing us to share initializ…
prdoyle Jun 6, 2025
0a04b2e
Use empty component path list instead of null
prdoyle Jun 6, 2025
d9cabe4
Downcast to the class of the check method.
prdoyle Jun 7, 2025
1ef7bac
Fix javadoc typos
prdoyle Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...er/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;

public class InstrumenterImpl implements Instrumenter {
public final class InstrumenterImpl implements Instrumenter {
private static final Logger logger = LogManager.getLogger(InstrumenterImpl.class);

private final String getCheckerClassMethodDescriptor;
Expand Down Expand Up @@ -272,7 +272,8 @@ public void visitCode() {
}

private void pushEntitlementChecker() {
InstrumenterImpl.this.pushEntitlementChecker(mv);
mv.visitMethodInsn(INVOKESTATIC, handleClass, "instance", getCheckerClassMethodDescriptor, false);
mv.visitTypeInsn(CHECKCAST, checkMethod.className());
}

private void pushCallerClass() {
Expand Down Expand Up @@ -320,11 +321,7 @@ private void invokeInstrumentationMethod() {
true
);
}
}

protected void pushEntitlementChecker(MethodVisitor mv) {
mv.visitMethodInsn(INVOKESTATIC, handleClass, "instance", getCheckerClassMethodDescriptor, false);
mv.visitTypeInsn(CHECKCAST, "org/elasticsearch/entitlement/bridge/EntitlementChecker");
}

record ClassFileInfo(String fileName, byte[] bytecodes) {}
Expand Down