Repository navigation
fix(security): CodeQL #2063–#2075 path-injection residuals (#4577) - #4578
Merged
Merged
Conversation
Add ObjectStore ApplicationFile store tests under a thread RxDir so exists/rename/delete stay inside requireUnderBase. Document #2074–#2075 as residual of #2046–#2062. Do not re-edit annotated sinks. Partial #4577 > Co-Authored by Grok Build 1.0.34 using grok-4.6 with agent night-issue-prs-security.
natechadwick-intsof
added
operator:grok
natechadwick
approved these changes
Sep 18, 2026
11 tasks done
natechadwick
pushed a commit
that referenced
this pull request
Sep 18, 2026
…4591) * fix(security): CodeQL #2076-#2081 path-injection residuals (#4590) Document the default-branch CodeQL java/path-injection residuals #2077-#2081 (PSServerXmlObjectStore saveApplicationFile lines 730/731/741/742) and #2076 (ApplicationFileAdaptor deleteRecursively line 1026) in suppressions.md and extend the existing .github/codeql/codeql-config.yml query-filter reason text to cover them. Ladder steps 1-4 already on main (PR #4352 / #4571 / #4578): * requireFileUnderRxDir -> requireUnderBase(RxDir) (PSServerXmlObjectStore line 728) * resolveUnderAppRoot -> requireUnderBase(appDir, rel) (ApplicationFileAdaptor line 1006) * same-line // codeql[java/path-injection] annotations on every sink * path query-filter glob for both files * model pack ReturnValue barriers for both helpers (GHA does not load local packs but the documentation is required by contracts/C3) Sinks were intentionally NOT re-edited - per playbook row 184, re-editing already-annotated sinks re-fingerprints and reopens a new alert ID. Default-branch IDs dismissed as false positive (playbook step 5) after this PR. Tests (siblings on main, not re-edited): * PSServerXmlObjectStorePathInjectionTest .requireFileUnderRxDir_rejectsEscapeAndAcceptsChild * ApplicationFileAdaptorTest.deleteRecursively_removesTreeUnderTempDir (plus ObjectStore exists/rename/delete under thread RxDir from PR #4578) Partial #4590 Co-Authored-By: OpenCode <noreply@opencode.ai> * chore(review): erlang pre-merge review for #4591 Durable review record (per AGENTS.md "Erlang review" section). Recommends approve on the docs/config diff; no bug findings; no rule-file changes. Refs #4591 --------- Co-authored-by: OpenCode <noreply@opencode.ai>
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
2 participants
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
Parent audit issue: #4577 (
[night-issues: Security Audit - Fix Pass],base_branch: main).Mitigates default-branch CodeQL
java/path-injectionresiduals:ApplicationFileAdaptor.javaPSServerXmlObjectStore.java:835/838Disposition: ladder steps 1–4 already on
main(PR #4571 / #4351):requireUnderBase/requireFileUnderRxDir, same-line// codeql[java/path-injection], model-pack ReturnValue barriers, path query-filters. This PR does not re-edit annotated sinks (re-fingerprint thrash). Adds ObjectStore store tests (exists/rename/delete under thread RxDir; traversal 400 before I/O) and documents #2074–#2075.Step used: runtime already closed + tests + suppressions/query-filter reason; default-branch IDs dismissed as FP after this PR (playbook step 5).
Partial #4577
Test plan
cd projects/sitemanage && JAVA_HOME=<JDK21> ../../mvnw clean installApplicationFileAdaptorTest(36 tests) and module suite green.// codeql[java/path-injection]sink lines.Checklist
ApplicationFileAdaptorTestObjectStore exists/rename/delete + traversal; sitemanage standalone clean install greencd projects/sitemanage && ../../mvnw clean install(JAVA_HOME JDK 21): BUILD SUCCESS; Tests run: 2767, Failures: 0, Errors: 0, Skipped: 125;ApplicationFileAdaptorTestTests run: 36, Failures: 0; no new compiler warnings from this diffPath.of/Files/@TempDirCodeQL PR checklist
resolveUnderAppRoot/requireFileUnderRxDir) + new store tests greenresolveAppRootDir/resolveUnderAppRoot/requireFileUnderRxDir(GHA does not load local packs)// codeql[java/path-injection]already on sinks; not re-editedsuppressions.mdupdated for fix(deps): #1824 slice — Betwixt log4j noise + unused toolkit dep #2063–docs(#2000): SolrJ 10 operator release notes + Dependabot major freeze #2075not-configured