spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-10 19:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Improve null-safety of module/spring-boot-cloudfoundry

Browse Source 
See gh-46926
This commit is contained in:
Moritz Halbritter
2025-08-26 14:22:54 +02:00
parent 31a9958a06
commit 05ba546a09
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/TokenValidator.java
+6 -4
View File
@@ -70,14 +70,16 @@ class TokenValidator {
private void validateKeyIdAndSignature(Token token) {
String keyId = token.getKeyId();
if (this.tokenKeys == null || !hasValidKeyId(this.tokenKeys, keyId)) {
this.tokenKeys = this.securityService.fetchTokenKeys();
if (!hasValidKeyId(this.tokenKeys, keyId)) {
Map<String, String> tokenKeys = this.tokenKeys;
if (tokenKeys == null || !hasValidKeyId(tokenKeys, keyId)) {
tokenKeys = this.securityService.fetchTokenKeys();
if (!hasValidKeyId(tokenKeys, keyId)) {
throw new CloudFoundryAuthorizationException(Reason.INVALID_KEY_ID,
"Key Id present in token header does not match");
}
this.tokenKeys = tokenKeys;
}
String key = this.tokenKeys.get(keyId);
String key = tokenKeys.get(keyId);
Assert.state(key != null, "'key' must not be null");
if (!hasValidSignature(token, key)) {
throw new CloudFoundryAuthorizationException(Reason.INVALID_SIGNATURE,