Skip to content

Backport 2.541.3#26400

Merged
krisstern merged 5 commits intojenkinsci:stable-2.541from
krisstern:backport-2.541.3
Mar 7, 2026
Merged

Backport 2.541.3#26400
krisstern merged 5 commits intojenkinsci:stable-2.541from
krisstern:backport-2.541.3

Conversation

@krisstern
Copy link
Member

@krisstern krisstern commented Mar 3, 2026 •
edited
Loading

Latest core version: jenkins-2.553
Fixed:

Postponed:

Submitter checklist

  • The issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • UI changes do not introduce regressions when enforcing the current default rules of Content Security Policy Plugin. In particular, new or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, be a Bug or Improvement, and either the issue or pull request must be labeled as lts-candidate to be considered.

@github-actions github-actions bot added the into-lts This PR is filed against an LTS branch label Mar 3, 2026
daniel-beck and others added 4 commits March 5, 2026 06:48
@daniel-beck @krisstern
Change label for CSP setup to be less ambiguous (jenkinsci#26198)
d1ab94e 
Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
(cherry picked from commit 84c9107)
@daniel-beck @timja @krisstern
Do not pick up random message Jelly variable in `l:keyboard-shortcu…
3d6f639 
…t` (jenkinsci#26214)

Do not pick up random `message` Jelly variable in l:keyboard-shortcut

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
(cherry picked from commit 35cf374)
@daniel-beck @krisstern
Do not compute CSP header if disabled (jenkinsci#26255)
a1d3174 
* Do not compute CSP header if disabled

* Replace waiting with counting invocations

* Replace waiting with counting

---------

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
Co-authored-by: Kris Stern <88480540+krisstern@users.noreply.github.com>
(cherry picked from commit 6227cd1)
@daniel-beck @krisstern
Refresh test cert and re-enable `SetupWizard#testRemoteUpdateSitePerf…
b1f5e8d 
…ormingValidation` (jenkinsci#26372)

Refresh test cert

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
(cherry picked from commit 0ffe12e)
daniel-beck
daniel-beck requested changes Mar 4, 2026
View reviewed changes
core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java Outdated

@Extension
@Restricted(NoExternalUse.class)
public static class ExcludeSessionIdAdministrativeMonitor extends AdministrativeMonitor {
Copy link
Member

@daniel-beck daniel-beck Mar 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This class should not be here. It's part of 07d2ff1 and not a good backport candidate.

Copy link
Member Author

@krisstern krisstern Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me check, I must have done something wrong when I tried to resolve the merge conflict..

daniel-beck
daniel-beck reviewed Mar 4, 2026
View reviewed changes
Copy link
Member

@daniel-beck daniel-beck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise looks reasonable.

core/src/main/java/hudson/util/HttpResponses.java
* @return the HttpResponse
* @since TODO
*/
public static HttpResponse clientRedirectTo(String url) {
Copy link
Member

@daniel-beck daniel-beck Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally @Restricted(NoExternalUse.class) but not sure what current LTS backporting practices of new API are. Ignore if we haven't bothered with that recently.

Copy link
Member

@timja timja Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not bothered with it recently

core/src/main/java/jenkins/util/ClientHttpRedirect.java
* @see <a href="https://github.com/w3c/webappsec-csp/issues/8">Content Security Policy issue discussing this behavior</a>
* @since TODO
*/
public record ClientHttpRedirect(String redirectUrl) implements HttpResponse {
Copy link
Member

@daniel-beck daniel-beck Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally @Restricted(NoExternalUse.class) but not sure what current LTS backporting practices of new API are. Ignore if we haven't bothered with that recently.

@daniel-beck @krisstern
Use client-side redirects in admin monitors for Chrome (jenkinsci#26207)
fed71e0 
Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
(cherry picked from commit dc03336)
@daniel-beck
Copy link
Member

daniel-beck commented Mar 5, 2026 •
edited
Loading

Postponed:

Why? (Don't delay the release further to include it, we'll be able to deal with it not being included.)

@krisstern
Copy link
Member Author

krisstern commented Mar 5, 2026

Postponed:

Why? (Don't delay the release further to include it, we'll be able to deal with it not being included.)

It introduced some compilation error that I will need more time to investigate if I were to include it in the coming RC to be released.

@daniel-beck
Copy link
Member

daniel-beck commented Mar 5, 2026

Ah, relies on the new List#getLast in Java 21. Makes sense. Too bad we're only finding this out now.

@krisstern
Copy link
Member Author

krisstern commented Mar 6, 2026

Now that the tests are passing, let me cut a release for the RC ASAP

@krisstern krisstern merged commit 897fbb4 into jenkinsci:stable-2.541 Mar 7, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daniel-beck daniel-beck daniel-beck approved these changes

@Kevin-CB Kevin-CB Awaiting requested review from Kevin-CB

@timja timja Awaiting requested review from timja

@MarkEWaite MarkEWaite Awaiting requested review from MarkEWaite

Assignees

No one assigned

Labels

into-lts This PR is filed against an LTS branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@krisstern @daniel-beck @timja