Skip to content

Commit 790ec23

Browse files
committed
Adding some JenkinsJVM calls to try to clarify the control flow
1 parent de2860b commit 790ec23

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.io.IOException;
1717
import java.util.List;
1818
import jenkins.security.SlaveToMasterCallable;
19+
import jenkins.util.JenkinsJVM;
1920
import org.kohsuke.accmod.Restricted;
2021
import org.kohsuke.accmod.restrictions.NoExternalUse;
2122
import org.kohsuke.github.GHApp;
@@ -201,11 +202,13 @@ private static final class AgentSide extends BaseStandardCredentials implements
201202

202203
AgentSide(GitHubAppCredentials onMaster) {
203204
super(onMaster.getScope(), onMaster.getId(), onMaster.getDescription());
205+
JenkinsJVM.checkJenkinsJVM();
204206
appID = onMaster.appID;
205207
data = Secret.fromString(onMaster.appID + SEP + onMaster.privateKey.getPlainText() + SEP + onMaster.actualApiUri() + SEP + onMaster.owner).getEncryptedValue();
206208
}
207209

208210
private Object readResolve() {
211+
JenkinsJVM.checkNotJenkinsJVM();
209212
ch = Channel.currentOrFail();
210213
return this;
211214
}
@@ -217,6 +220,7 @@ public String getUsername() {
217220

218221
@Override
219222
public Secret getPassword() {
223+
JenkinsJVM.checkNotJenkinsJVM();
220224
try {
221225
return ch.call(new GetPassword(data));
222226
} catch (IOException | InterruptedException x) {
@@ -234,6 +238,7 @@ private static final class GetPassword extends SlaveToMasterCallable<Secret, Run
234238

235239
@Override
236240
public Secret call() throws RuntimeException {
241+
JenkinsJVM.checkJenkinsJVM();
237242
String[] fields = Secret.fromString(data).getPlainText().split(SEP);
238243
return Secret.fromString(generateAppInstallationToken(fields[0], fields[1], fields[2], fields[3]));
239244
}

0 commit comments

Comments
 (0)