Skip to content
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.

Sign up for GitHub

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

[FIXED JENKINS-41987] Check for null return values from InstanceIdentityProvider methods #2749

Merged
merged 2 commits into from
Feb 17, 2017
Merged

[FIXED JENKINS-41987] Check for null return values from InstanceIdentityProvider methods #2749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3791e9
Check for null return values from InstanceIdentityProvider methods.
jglick Feb 13, 2017
dbf5efa
[JENKINS-41987] Improved message.
jglick Feb 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,13 @@ public class JnlpSlaveAgentProtocol4 extends AgentProtocol {
public JnlpSlaveAgentProtocol4() throws KeyStoreException, KeyManagementException, IOException {
// prepare our local identity and certificate
X509Certificate identityCertificate = InstanceIdentityProvider.RSA.getCertificate();
if (identityCertificate == null) {
throw new KeyStoreException("JENKINS-41987: no X509Certificate found; perhaps instance-identity module is missing or too old");
}
RSAPrivateKey privateKey = InstanceIdentityProvider.RSA.getPrivateKey();
if (privateKey == null) {
throw new KeyStoreException("JENKINS-41987: no RSAPrivateKey found; perhaps instance-identity module is missing or too old");
}

// prepare our keyStore so we can provide our authentication
keyStore = KeyStore.getInstance("JKS");
Expand Down