[bot] Merge 26.3 to 26.7 (Conflicts)#659
Merged
Merged
Conversation
#### Changes **Test actions globally swap the NcbiPublicationSearchService singleton with no audit event (Informational)** * The three Selenium-test support actions (`SetupMockNcbiServiceAction`, `RestoreNcbiServiceAction`, `RegisterMockPublicationAction`) swap a process-wide singleton. They are @RequiresSiteAdmin but otherwise reachable in production, and extended ReadOnlyApiAction, which does no CSRF check and is reachable by a plain GET. * Added `requireDevModeForMockNcbiService()`: the actions now return 404 on a non-dev-mode server. Dev machines and TeamCity run in dev mode, so tests are unaffected. * Changed the three actions from `ReadOnlyApiAction` to `MutatingApiAction`, since they mutate global state, which also requires a POST with a CSRF token. * The report suggested adding an audit event or compiling these out of production builds. On review we found that gating them to dev mode is a better fix, since it removes the production attack surface entirely rather than just recording the swap. **Uses System.out instead of Log4J2 (Informational)** * `ExperimentModificationGetter`: removed System.out helpers printStructuralMod and printIsotopicMod and their call sites. **Tests** * `PublicationSearchTest`: invoke the three mock-NCBI actions with `SimplePostCommand `instead of `SimpleGetCommand`.
#### Changes ***Stored XSS (High) - result views and email preview** * failureDetail.jsp: HTML-encode the failure language and stack trace * runDetail.jsp: render the run log/xml popup via a `<pre>` textContent node instead of document.write of concatenated HTML. * trainingdata.jsp: render the daily-email preview in a sandboxed iframe (scripts disabled, opaque origin) instead of document.write of the raw email HTML. **Transaction and SQL handling (Medium)** * ChangeBoundaries.execute: wrapped the GlobalSettings update transaction in try-with-resources so it cannot leak on an exception before commit, and parameterized the INSERT with bind parameters. **Daily email output encoding (Low)** * SendTestResultsEmail.getHTMLEmail: HTML-encode the git hash, missing-user name, problem-table computer name, and test name. **Logging hygiene (Low)** * Replaced all five e.printStackTrace() calls with Log4J2 logging that includes the exception. **Tests** * Added testViewLogPopup, which opens the run-log popup and asserts the stored log is displayed (the existing tests only exercised the ViewLog API).
cnathe
force-pushed
the
26.7_fb_bot_merge_26.3
branch
from
d6ba982 to
bf07c79
Compare
cnathe
approved these changes
Jul 7, 2026
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
3 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.
Automatic merge failed! Please merge
26.3into26.7_fb_bot_merge_26.3and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.7_fb_bot_merge_26.3