소스 검색

SEC-1390: Added null check on claimedIdentifier returned by DiscoveryInformation to prevent NPE.

Luke Taylor 15 년 전
부모
커밋
8720966d20
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java

+ 3 - 2
openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java

@@ -158,7 +158,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer {
                 }
             } catch (MessageException e) {
                 attributes.clear();
-                throw new OpenIDConsumerException("Attribute retrievel failed", e);
+                throw new OpenIDConsumerException("Attribute retrieval failed", e);
             }
             if (debug) {
                 logger.debug("Retrieved attributes" + attributes);
@@ -169,8 +169,9 @@ public class OpenID4JavaConsumer implements OpenIDConsumer {
         Identifier verified = verification.getVerifiedId();
 
         if (verified == null) {
+            Identifier id = discovered.getClaimedIdentifier();
             return new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.FAILURE,
-                    discovered.getClaimedIdentifier().getIdentifier(),
+                    id == null ? "Unknown" : id.getIdentifier(),
                     "Verification status message: [" + verification.getStatusMsg() + "]", attributes);
         }