[FIXED JENKINS-41987] Check for null return values from InstanceIdentityProvider methods #2749
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
There was a problem hiding this comment.
The change itself looks good to me though maybe there should be more info in the error message.
@jglick Could you please create a JIRA issue? Since JNLP4 is going to be enabled by default in the next LTS, so this fix likely deserves backporting.
| @@ -101,7 +101,13 @@ | |||
| public JnlpSlaveAgentProtocol4() throws KeyStoreException, KeyManagementException, IOException { | |||
| // prepare our local identity and certificate | |||
| X509Certificate identityCertificate = InstanceIdentityProvider.RSA.getCertificate(); | |||
| if (identityCertificate == null) { | |||
| throw new KeyStoreException("no X509Certificate found; perhaps instance-identity is missing or too old"); | |||
There was a problem hiding this comment.
Maybe it should explicitly mention the protocol. Just to make the error more diagnosable
There was a problem hiding this comment.
JnlpSlaveAgentProtocol4? The error message will clearly include that already.
| RSAPrivateKey privateKey = InstanceIdentityProvider.RSA.getPrivateKey(); | ||
| if (privateKey == null) { | ||
| throw new KeyStoreException("no RSAPrivateKey found; perhaps instance-identity is missing or too old"); |
oleg-nenashev
added
needs-jira-issue
|
Backporting seems like overkill to me, since this is merely better diagnostic reporting, but as you like. |
jglick
changed the title
jglick
removed
the
needs-jira-issue
oleg-nenashev
approved these changes
Feb 13, 2017
|
🐝 |
jglick
added
ready-for-merge
|
see also #7514 |
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.
JENKINS-41987
Otherwise you get a cryptic error when
instance-identityis misconfigured, for example in tests. This fixes the instantiation error to clearly reflect the actual problem.@reviewbybees