Commit 37edf70
Backport entitlement work up to elastic#116473 to 8.x (elastic#116613)
* Add initial entitlement policy parsing (elastic#114448)
This change adds entitlement policy parsing with the following design:
* YAML file for readability and re-use of our x-content parsers
* hierarchical structure to group entitlements under a single scope
* no general entitlements without a scope or for the entire project
* Avoid double instrumentation via class annotation (elastic#115398)
* Move entitlement jars to libs (elastic#115883)
The distribution tools are meant to be CLIs. This commit moves the
entitlements jar projects to the libs dir, under a single
libs/entitlement root directory to keep the related jars together.
* Entitlement tools: SecurityManager scanner (elastic#116020)
* Dynamic entitlement agent (elastic#116125)
* Refactor: treat "maybe" JVM options uniformly
* WIP
* Get entitlement running with bridge all the way through, with qualified
exports
* Cosmetic changes to SystemJvmOptions
* Disable entitlements by default
* Bridge module comments
* Fixup forbidden APIs
* spotless
* Rename EntitlementChecker
* Fixup InstrumenterTests
* exclude recursive dep
* Fix some compliance stuff
* Rename asm-provider
* Stop using bridge in InstrumenterTests
* Generalize readme for asm-provider
* InstrumenterTests doesn't need EntitlementCheckerHandle
* Better javadoc
* Call parseBoolean
* Add entitlement to internal module list
* Docs as requested by Lorenzo
* Changes from Jack
* Rename ElasticsearchEntitlementChecker
* Remove logging javadoc
* exportInitializationToAgent should reference EntitlementInitialization, not EntitlementBootstrap.
They're currently in the same module, but if that ever changes, this code would have become wrong.
* Some suggestions from Mark
---------
Co-authored-by: Ryan Ernst <[email protected]>
* Remove unused EntitlementInternals (elastic#116473)
* Revert "Entitlement tools: SecurityManager scanner (elastic#116020)"
This reverts commit 023fb66.
---------
Co-authored-by: Jack Conradson <[email protected]>
Co-authored-by: Lorenzo Dematté <[email protected]>
Co-authored-by: Ryan Ernst <[email protected]>1 parent b9c2b52 commit 37edf70
File tree
58 files changed
+1375
-505
lines changed- build-tools-internal/src/main/java/org/elasticsearch/gradle/internal
- build-tools/src/main/java/org/elasticsearch/gradle/testclusters
- distribution
- tools
- entitlement-agent
- impl/src/test/java/org/elasticsearch/entitlement/instrumentation/impl
- src/test/java/org/elasticsearch/entitlement/agent
- entitlement-bridge/src/main/java/org/elasticsearch/entitlement/api
- entitlement-runtime
- src/main
- java
- org/elasticsearch/entitlement/runtime/internals
- resources/META-INF/services
- server-cli/src/main/java/org/elasticsearch/server/cli
- libs
- core/src/main/java
- entitlement
- agent
- src/main/java/org/elasticsearch/entitlement/agent
- asm-provider
- licenses
- src
- main
- java
- org/elasticsearch/entitlement/instrumentation/impl
- resources/META-INF/services
- test
- java/org/elasticsearch/entitlement/instrumentation/impl
- resources/META-INF/services
- bridge
- src/main/java
- org/elasticsearch/entitlement/bridge
- src
- main/java
- org/elasticsearch/entitlement
- bootstrap
- initialization
- instrumentation
- runtime
- api
- policy
- test
- java/org/elasticsearch/entitlement/runtime/policy
- resources/org/elasticsearch/entitlement/runtime/policy
- server
- src/main/java
- org/elasticsearch/bootstrap
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
58 files changed
+1375
-505
lines changedLines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
55 | 56 | | |
56 | 57 | | |
57 | 58 | | |
| |||
Lines changed: 17 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| |||
69 | 70 | | |
70 | 71 | | |
71 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
72 | 81 | | |
73 | 82 | | |
74 | 83 | | |
| |||
79 | 88 | | |
80 | 89 | | |
81 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
82 | 96 | | |
83 | 97 | | |
84 | 98 | | |
| |||
226 | 240 | | |
227 | 241 | | |
228 | 242 | | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
229 | 246 | | |
230 | 247 | | |
231 | 248 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
77 | 85 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
265 | | - | |
| 265 | + | |
266 | 266 | | |
267 | 267 | | |
268 | 268 | | |
| |||
292 | 292 | | |
293 | 293 | | |
294 | 294 | | |
| 295 | + | |
| 296 | + | |
295 | 297 | | |
296 | 298 | | |
297 | 299 | | |
| |||
336 | 338 | | |
337 | 339 | | |
338 | 340 | | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
339 | 347 | | |
340 | 348 | | |
341 | 349 | | |
| |||
This file was deleted.
Lines changed: 0 additions & 153 deletions
This file was deleted.
Lines changed: 0 additions & 52 deletions
This file was deleted.
0 commit comments