Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2792 from jglick/SYSTEM-JENKINS-42556
[JENKINS-42556] Run more system threads as SYSTEM
- Loading branch information
Showing
5 changed files
with
234 additions
and
3 deletions.
There are no files selected for viewing
77 changes: 77 additions & 0 deletions
77
core/src/main/java/jenkins/security/ImpersonatingExecutorService.java
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,77 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2017 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.security; | ||
|
|
||
| import hudson.security.ACL; | ||
| import hudson.security.ACLContext; | ||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ExecutorService; | ||
| import jenkins.util.InterceptingExecutorService; | ||
| import org.acegisecurity.Authentication; | ||
|
|
||
| /** | ||
| * Uses {@link ACL#impersonate(Authentication)} for all tasks. | ||
| * @see SecurityContextExecutorService | ||
| * @since FIXME | ||
| */ | ||
| public final class ImpersonatingExecutorService extends InterceptingExecutorService { | ||
|
|
||
| private final Authentication authentication; | ||
|
|
||
| /** | ||
| * Creates a wrapper service. | ||
| * @param base the base service | ||
| * @param authentication for example {@link ACL#SYSTEM} | ||
| */ | ||
| public ImpersonatingExecutorService(ExecutorService base, Authentication authentication) { | ||
| super(base); | ||
| this.authentication = authentication; | ||
| } | ||
|
|
||
| @Override | ||
| protected Runnable wrap(final Runnable r) { | ||
| return new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| try (ACLContext ctxt = ACL.as(authentication)) { | ||
| r.run(); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| protected <V> Callable<V> wrap(final Callable<V> r) { | ||
| return new Callable<V>() { | ||
| @Override | ||
| public V call() throws Exception { | ||
| try (ACLContext ctxt = ACL.as(authentication)) { | ||
| return r.call(); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| } |
76 changes: 76 additions & 0 deletions
76
core/src/main/java/jenkins/security/ImpersonatingScheduledExecutorService.java
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,76 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2017 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.security; | ||
|
|
||
| import hudson.security.ACL; | ||
| import hudson.security.ACLContext; | ||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ScheduledExecutorService; | ||
| import jenkins.util.InterceptingScheduledExecutorService; | ||
| import org.acegisecurity.Authentication; | ||
|
|
||
| /** | ||
| * Variant of {@link ImpersonatingExecutorService} for scheduled services. | ||
| * @since FIXME | ||
| */ | ||
| public final class ImpersonatingScheduledExecutorService extends InterceptingScheduledExecutorService { | ||
|
|
||
| private final Authentication authentication; | ||
|
|
||
| /** | ||
| * Creates a wrapper service. | ||
| * @param base the base service | ||
| * @param authentication for example {@link ACL#SYSTEM} | ||
| */ | ||
| public ImpersonatingScheduledExecutorService(ScheduledExecutorService base, Authentication authentication) { | ||
| super(base); | ||
| this.authentication = authentication; | ||
| } | ||
|
|
||
| @Override | ||
| protected Runnable wrap(final Runnable r) { | ||
| return new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| try (ACLContext ctxt = ACL.as(authentication)) { | ||
| r.run(); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| protected <V> Callable<V> wrap(final Callable<V> r) { | ||
| return new Callable<V>() { | ||
| @Override | ||
| public V call() throws Exception { | ||
| try (ACLContext ctxt = ACL.as(authentication)) { | ||
| return r.call(); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| } |
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
67 changes: 67 additions & 0 deletions
67
core/src/main/java/jenkins/util/InterceptingScheduledExecutorService.java
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,67 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2017 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.util; | ||
|
|
||
| import java.util.concurrent.Callable; | ||
| import java.util.concurrent.ScheduledExecutorService; | ||
| import java.util.concurrent.ScheduledFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * Generalization of {@link InterceptingExecutorService} to scheduled services. | ||
| * @since FIXME | ||
| */ | ||
| public abstract class InterceptingScheduledExecutorService extends InterceptingExecutorService implements ScheduledExecutorService { | ||
|
|
||
| protected InterceptingScheduledExecutorService(ScheduledExecutorService base) { | ||
| super(base); | ||
| } | ||
|
|
||
| @Override | ||
| protected ScheduledExecutorService delegate() { | ||
| return (ScheduledExecutorService) super.delegate(); | ||
| } | ||
|
|
||
| @Override | ||
| public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) { | ||
| return delegate().schedule(wrap(command), delay, unit); | ||
| } | ||
|
|
||
| @Override | ||
| public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) { | ||
| return delegate().schedule(wrap(callable), delay, unit); | ||
| } | ||
|
|
||
| @Override | ||
| public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) { | ||
| return delegate().scheduleAtFixedRate(wrap(command), initialDelay, period, unit); | ||
| } | ||
|
|
||
| @Override | ||
| public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) { | ||
| return delegate().scheduleWithFixedDelay(wrap(command), initialDelay, delay, unit); | ||
| } | ||
|
|
||
| } |
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