Skip to content
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

Jump to bottom

[JENKINS-73166] Fix PKCS#12 certificate save to credentials #9286

Merged
merged 1 commit into from
May 19, 2024
Merged

[JENKINS-73166] Fix PKCS#12 certificate save to credentials #9286

merged 1 commit into from
May 19, 2024

Conversation

zbynek
Copy link
Contributor

@zbynek zbynek commented May 17, 2024 •
edited by MarkEWaite

JENKINS-73166 - Fix PKCS#12 certificate save to credentials

Alternative to #9284, fixes a bug introduced in #9136

The execScript code is for IE only and removing it was correct. However geval cannot simply call eval since it has to use the global scope.

Automated tests of this case don't provide enough benefit for the effort required. No added test automation,.

Testing done

Confirmed that I can duplicate the problem before this change and that after this change the PKCS#12 credential checkbox works as expected.

Proposed changelog entries

  • Allow PKCS 12 certificates to be added to the credentials store again. Regression in 2.453.

Proposed upgrade guidelines

N/A

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. The Jira issue, if it exists, is well-described.
    Options
  2. 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.
    Options
  3. There is automated testing or an explanation as to why this change has no tests.
    Options
  4. New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
    Options
  5. New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
    Options
  6. 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).
    Options
  7. For dependency updates, there are links to external changelogs and, if possible, full differentials.
    Options
  8. For new APIs and extension points, there is a link to at least one consumer.
    Options

Desired reviewers

@MarkEWaite

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

Maintainer checklist

Edit tasklist title
Beta Give feedback Tasklist Maintainer checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. There are at least two (2) approvals for the pull request and no outstanding requests for change.
    Options
  2. Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
    Options
  3. Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
    Options
  4. Proper changelog labels are set so that the changelog can be generated automatically.
    Options
  5. 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).
    Options
  6. If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).
    Options

@MarkEWaite MarkEWaite mentioned this pull request May 17, 2024
Closed
@MarkEWaite MarkEWaite self-assigned this May 17, 2024
@MarkEWaite MarkEWaite added bug For changelog: Minor bug. Will be listed after features regression-fix Pull request that fixes a regression in one of the previous Jenkins releases labels May 17, 2024
NotMyFault
NotMyFault approved these changes May 18, 2024
View reviewed changes
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

Thanks!

/label ready-for-merge

This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label May 18, 2024
@MarkEWaite MarkEWaite merged commit 35b3959 into jenkinsci:master May 19, 2024
16 checks passed
@zbynek zbynek deleted the patch-3 branch May 19, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkEWaite MarkEWaite MarkEWaite approved these changes

@NotMyFault NotMyFault NotMyFault approved these changes

Assignees

@MarkEWaite MarkEWaite

Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback regression-fix Pull request that fixes a regression in one of the previous Jenkins releases
Projects
None yet
Milestone
No milestone
3 participants
@zbynek @MarkEWaite @NotMyFault