From d0f580d24d52f56b3a66e1d63f9e668a1ebcd721 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 13 Dec 2019 08:36:02 +0100
Subject: fix possible NullPointerException add jUnit test

---
 .../verification/AuthnRequestValidator.java        | 69 +++++++++++-----------
 1 file changed, 36 insertions(+), 33 deletions(-)

(limited to 'connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java')

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
index 2e58d863..482e6761 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
@@ -162,47 +162,50 @@ public class AuthnRequestValidator implements IAuthnRequestPostProcessor {
 
       // validate and process requested attributes
       boolean sectorDetected = false;
-      final List<XMLObject> requestedAttributes = authnReq.getExtensions().getUnknownXMLObjects();
-      for (final XMLObject reqAttrObj : requestedAttributes) {
-        if (reqAttrObj instanceof EaafRequestedAttributes) {
-          final EaafRequestedAttributes reqAttr = (EaafRequestedAttributes) reqAttrObj;
-          if (reqAttr.getAttributes() != null && reqAttr.getAttributes().size() != 0) {
-            for (final EaafRequestedAttribute el : reqAttr.getAttributes()) {
-              log.trace("Processing req. attribute '" + el.getName() + "' ... ");
-              if (el.getName().equals(PvpAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME)) {
-                if (el.getAttributeValues() != null && el.getAttributeValues().size() == 1) {
-                  final String sectorId = el.getAttributeValues().get(0).getDOM().getTextContent();
-                  final ServiceProviderConfiguration spConfig = pendingReq.getServiceProviderConfiguration(
-                      ServiceProviderConfiguration.class);
-
-                  try {
-                    spConfig.setBpkTargetIdentifier(sectorId);
-                    sectorDetected = true;
-
-                  } catch (final EaafException e) {
-                    log.info("Requested sector: " + sectorId + " DOES NOT match to allowed sectors for SP: "
-                        + spConfig.getUniqueIdentifier());
+      
+      if (authnReq.getExtensions() != null) {
+        final List<XMLObject> requestedAttributes = authnReq.getExtensions().getUnknownXMLObjects();
+        for (final XMLObject reqAttrObj : requestedAttributes) {
+          if (reqAttrObj instanceof EaafRequestedAttributes) {
+            final EaafRequestedAttributes reqAttr = (EaafRequestedAttributes) reqAttrObj;
+            if (reqAttr.getAttributes() != null && reqAttr.getAttributes().size() != 0) {
+              for (final EaafRequestedAttribute el : reqAttr.getAttributes()) {
+                log.trace("Processing req. attribute '" + el.getName() + "' ... ");
+                if (el.getName().equals(PvpAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME)) {
+                  if (el.getAttributeValues() != null && el.getAttributeValues().size() == 1) {
+                    final String sectorId = el.getAttributeValues().get(0).getDOM().getTextContent();
+                    final ServiceProviderConfiguration spConfig = pendingReq.getServiceProviderConfiguration(
+                        ServiceProviderConfiguration.class);
+  
+                    try {
+                      spConfig.setBpkTargetIdentifier(sectorId);
+                      sectorDetected = true;
+  
+                    } catch (final EaafException e) {
+                      log.info("Requested sector: " + sectorId + " DOES NOT match to allowed sectors for SP: "
+                          + spConfig.getUniqueIdentifier());
+                    }
+  
+                  } else {
+                    log.info("Req. attribute '" + el.getName()
+                        + "' contains NO or MORE THEN ONE attribute-values. Ignore full req. attribute");
                   }
-
+  
                 } else {
-                  log.info("Req. attribute '" + el.getName()
-                      + "' contains NO or MORE THEN ONE attribute-values. Ignore full req. attribute");
+                  log.debug("Ignore req. attribute: " + el.getName());
                 }
-
-              } else {
-                log.debug("Ignore req. attribute: " + el.getName());
+  
               }
-
+  
+            } else {
+              log.debug("No requested Attributes in Authn. Request");
             }
-
+  
           } else {
-            log.debug("No requested Attributes in Authn. Request");
+            log.info("Ignore unknown requested attribute: " + reqAttrObj.getElementQName().toString());
           }
-
-        } else {
-          log.info("Ignore unknown requested attribute: " + reqAttrObj.getElementQName().toString());
+  
         }
-
       }
 
       if (!sectorDetected) {
-- 
cgit v1.2.3