-
Notifications
You must be signed in to change notification settings - Fork 165
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.
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
Fix reloading configuration from disk #545
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -176,6 +176,29 @@ public void upgradeSmokes() throws Exception { | |
r.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get())); | ||
} | ||
|
||
@LocalData // Some scriptApproval.xml with existing signatures approved | ||
@Test | ||
public void reload() throws Exception { | ||
configureSecurity(); | ||
ScriptApproval sa = ScriptApproval.get(); | ||
|
||
FreeStyleProject p = r.createFreeStyleProject(); | ||
p.getPublishersList().add(new TestGroovyRecorder( | ||
new SecureGroovyScript("jenkins.model.Jenkins.instance", true, null))); | ||
p.getPublishersList().add(new TestGroovyRecorder( | ||
new SecureGroovyScript("println(jenkins.model.Jenkins.instance.getLabels())", false, null))); | ||
r.assertLogNotContains("org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException: " | ||
+ "Scripts not permitted to use staticMethod jenkins.model.Jenkins getInstance", | ||
r.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get())); | ||
Comment on lines
+190
to
+192
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps besides the point since you approved the whole script anyway, and if you had not, you would also get an error on |
||
r.assertLogNotContains("org.jenkinsci.plugins.scriptsecurity.scripts.UnapprovedUsageException: script not yet approved for use", | ||
r.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get())); | ||
|
||
ScriptApproval.get().getConfigFile().delete(); | ||
sa.load(); | ||
r.assertLogContains("org.jenkinsci.plugins.scriptsecurity.scripts.UnapprovedUsageException: script not yet approved for use", | ||
r.assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0).get())); | ||
} | ||
|
||
private Script script(String groovy) { | ||
return new Script(groovy); | ||
} | ||
|
14 changes: 14 additions & 0 deletions
14
...org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApprovalTest/reload/scriptApproval.xml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<scriptApproval plugin="[email protected]"> | ||
<approvedScriptHashes> | ||
<string>fccae58c5762bdd15daca97318e9d74333203106</string> | ||
</approvedScriptHashes> | ||
<approvedSignatures> | ||
<string>staticMethod jenkins.model.Jenkins getInstance</string> | ||
</approvedSignatures> | ||
<aclApprovedSignatures/> | ||
<approvedClasspathEntries/> | ||
<pendingScripts/> | ||
<pendingSignatures/> | ||
<pendingClasspathEntries/> | ||
</scriptApproval> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this is what is causing issues with the tests, most specifically with the hot plugin load.