Fix preapprove() leaving scripts in pendingScripts after approval#908
Open
LeCrew163 wants to merge 3 commits intojenkinsci:masterfrom
Open
Fix preapprove() leaving scripts in pendingScripts after approval#908LeCrew163 wants to merge 3 commits intojenkinsci:masterfrom
LeCrew163 wants to merge 3 commits intojenkinsci:masterfrom
Conversation
The preapprove() method adds script hashes to approvedScriptHashes but does not remove matching entries from pendingScripts. This causes scripts to appear with apply/deny buttons in the Jenkins UI even though their hashes are already present in scriptApproval.xml's approvedScriptHashes. The scripts are technically approved (hash exists in approvedScriptHashes) but the UI incorrectly shows them as pending because they remain in the pendingScripts list. This fix makes preapprove() consistent with preapproveAll() by calling removePendingScript() to remove the pending entry after adding to approvedScriptHashes.
added 2 commits
January 27, 2026 21:33
Add test case that verifies preapprove() removes scripts from pendingScripts after adding them to approvedScriptHashes. The test: 1. Creates a pending script via configuring() 2. Calls preapprove() on it 3. Verifies the hash is in approvedScriptHashes 4. Verifies the script is removed from pendingScripts
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
1 participant
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.
Problem
The
preapprove()method adds script hashes toapprovedScriptHashesbut does not remove matching entries frompendingScripts. This causes scripts to appear with apply/deny buttons in the Jenkins UI even though their hashes are already present inscriptApproval.xml'sapprovedScriptHashes.The scripts are technically approved (hash exists in
approvedScriptHashes) but the UI incorrectly shows them as pending because they remain in thependingScriptslist.Solution
This fix makes
preapprove()consistent withpreapproveAll()by callingremovePendingScript()to remove the pending entry after adding toapprovedScriptHashes.Changes
preapprove()method to store the hash in a variableremovePendingScript(hash)after adding toapprovedScriptHashesThis makes the behavior consistent with
preapproveAll()which already clearspendingScriptsafter approval.Submitter checklist