[JENKINS-59775] Ensure that PluginManager.start runs as SYSTEM #4320
Conversation
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
jglick
approved these changes
Oct 25, 2019
| String pluginShortName = "require-system-during-load"; | ||
| dynamicLoad(pluginShortName + ".hpi"); | ||
| try (ACLContext context = ACL.as(User.getOrCreateByIdOrFullName("underprivileged").impersonate())) { | ||
| r.jenkins.pluginManager.start(Collections.singletonList(r.jenkins.pluginManager.getPlugin(pluginShortName))); |
There was a problem hiding this comment.
So in what way does this fail with src/main/ reverted? Since it is not obvious to at least me as a reviewer, best to show the stack trace of the test failure in the PR description or a line comment or something.
There was a problem hiding this comment.
The stacktrace is in the JIRA. Here is what happens in that test without the fix:
hudson.security.AccessDeniedException2: underprivileged is missing the Overall/Administer permission
at hudson.security.ACL.checkPermission(ACL.java:73)
at hudson.security.AccessControlled.checkPermission(AccessControlled.java:47)
at test.ThePlugin.postInitialize(ThePlugin.java:10)
at hudson.PluginManager.start(PluginManager.java:955)
at hudson.PluginManagerTest.requireSystemDuringStart(PluginManagerTest.java:474)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at org.jvnet.hudson.test.JenkinsRule$1.evaluate(JenkinsRule.java:600)
at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at java.lang.Thread.run(Thread.java:748)
| @@ -948,49 +948,51 @@ public void dynamicLoad(File arc, boolean removeExisting, @CheckForNull List<Plu | |||
|
|
|||
| @Restricted(NoExternalUse.class) | |||
| public void start(List<PluginWrapper> plugins) throws Exception { | |||
| Jenkins.get().refreshExtensions(); | |||
There was a problem hiding this comment.
Have to Hide whitespace changes to see what is happening here. Risk of merge conflicts, git blame issues, etc. For cases like this I tend to recommend either leaving the original code at its original indentation (despite looking ugly), or introducing a helper method:
public void start(List<PluginWrapper> plugins) throws Exception {
try (ACLContext context = ACL.as(ACL.SYSTEM)) {
doStart(plugins);
}
}
private void doStart(List<PluginWrapper> plugins) throws Exception {
// as before…
}to minimize the diff.
There was a problem hiding this comment.
I see. I'll work with the indentation.
Co-Authored-By: Jesse Glick <jglick@cloudbees.com>
oleg-nenashev
approved these changes
Oct 31, 2019
oleg-nenashev
added
the
ready-for-merge
oleg-nenashev
added
the
bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See JENKINS-59775.
Proposed changelog entries
Submitter checklist
Desired reviewers
@jglick @reviewbybees