Encoding fix, getAttributeValue now optionally returns null instead of throwing an exception

1 files changed, 31 insertions, 25 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
index 2c8b44404..46fd06741 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
@@ -105,13 +105,19 @@ public class STORKResponseProcessor {
 	 * @throws STORKException the sTORK exception

 	 */

 	private static String getAttributeValue(String attributeName, IPersonalAttributeList attributeList) throws STORKException {

+		return getAttributeValue(attributeName, attributeList, true);

+	}

+	private static String getAttributeValue(String attributeName, IPersonalAttributeList attributeList, boolean throwException) throws STORKException {

 		try {

 			String result = attributeList.get(attributeName).getValue().get(0);

 			Logger.trace(attributeName + " : " + result);

 			return result;

-		} catch(NullPointerException e) {

+		} catch(Exception e) {

 			Logger.error(attributeName + " not found in response");

-			throw new STORKException(attributeName + " not found in response");

+			if(throwException)

+				throw new STORKException(attributeName + " not found in response");

+			else

+				return null;

 		}

 	}

 

@@ -137,29 +143,29 @@ public class STORKResponseProcessor {
 

 			// if there is no signedDoc attribute, we cannot go on

 			String citizenSignature = getAttributeValue("signedDoc", attributeList);

-			String fiscalNumber = getAttributeValue("fiscalNumber", attributeList);

+			String fiscalNumber = getAttributeValue("fiscalNumber", attributeList, false);

 			

 			// if we have a signedDoc we test for a representation case

 			// - according to stork samlengine and commons

 			if(hasAttribute("mandate", attributeList)) {

 				// we have a representation case

-				String mandate = getAttributeValue("mandate", attributeList);

+				String mandate = getAttributeValue("mandate", attributeList, false);

 				

 				if(!hasAttribute("dateOfBirth", attributeList)) {

 					// if we get here, we have a natural person representing a legal person

-					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList);

-					String organizationType = getAttributeValue("translateableType", attributeList);

+					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList, false);

+					String organizationType = getAttributeValue("translateableType", attributeList, false);

 					

 					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, null, null, mandate, organizationAddress, organizationType, targetType, targetValue, oaFriendlyName, filters, fiscalNumber);

 				} else {

 					// if we get here, we have a natural person representing another natural person

-					String eIdentifier = getAttributeValue("eIdentifier", attributeList);

-					String givenName = getAttributeValue("givenName", attributeList);

-					String lastName = getAttributeValue("surname", attributeList);

-					String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

+					String eIdentifier = getAttributeValue("eIdentifier", attributeList, false);

+					String givenName = getAttributeValue("givenName", attributeList, false);

+					String lastName = getAttributeValue("surname", attributeList, false);

+					String dateOfBirth = getAttributeValue("dateOfBirth", attributeList, false);

 					

 					// gender attribute is mandatory here because of some legal stuff

-					String gender = getAttributeValue("gender", attributeList);

+					String gender = getAttributeValue("gender", attributeList, false);

 					

 					if (!StringUtils.isEmpty(dateOfBirth))

 						dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

@@ -172,25 +178,25 @@ public class STORKResponseProcessor {
 			// - according to stork spec

 			else if(hasAttribute("mandateContent", attributeList) || hasAttribute("representative", attributeList) || hasAttribute("represented", attributeList)) {

 				// we have a representation case

-				String representative = getAttributeValue("representative", attributeList);

-				String represented = getAttributeValue("represented", attributeList);

-				String mandate = getAttributeValue("mandateContent", attributeList);

+				String representative = getAttributeValue("representative", attributeList, false);

+				String represented = getAttributeValue("represented", attributeList, false);

+				String mandate = getAttributeValue("mandateContent", attributeList, false);

 				

 				if(!hasAttribute("dateOfBirth", attributeList)) {

 					// if we get here, we have a natural person representing a legal person

-					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList);

-					String organizationType = getAttributeValue("translateableType", attributeList);

+					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList, false);

+					String organizationType = getAttributeValue("translateableType", attributeList, false);

 									

 					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, representative, represented, mandate, organizationAddress, organizationType, targetType, targetValue, oaFriendlyName, filters, fiscalNumber);

 				} else {

 					// if we get here, we have a natural person representing another natural person

-					String eIdentifier = getAttributeValue("eIdentifier", attributeList);

-					String givenName = getAttributeValue("givenName", attributeList);

-					String lastName = getAttributeValue("surname", attributeList);

-					String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

+					String eIdentifier = getAttributeValue("eIdentifier", attributeList, false);

+					String givenName = getAttributeValue("givenName", attributeList, false);

+					String lastName = getAttributeValue("surname", attributeList, false);

+					String dateOfBirth = getAttributeValue("dateOfBirth", attributeList, false);

 			

 					// gender attribute is mandatory here because of some legal stuff

-					String gender = getAttributeValue("gender", attributeList);

+					String gender = getAttributeValue("gender", attributeList, false);

 					

 					if (!StringUtils.isEmpty(dateOfBirth))

 						dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

@@ -201,10 +207,10 @@ public class STORKResponseProcessor {
 				}

 			} else {

 				// we do not have a representation case

-				String eIdentifier = getAttributeValue("eIdentifier", attributeList);

-				String givenName = getAttributeValue("givenName", attributeList);

-				String lastName = getAttributeValue("surname", attributeList);

-				String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

+				String eIdentifier = getAttributeValue("eIdentifier", attributeList, false);

+				String givenName = getAttributeValue("givenName", attributeList, false);

+				String lastName = getAttributeValue("surname", attributeList, false);

+				String dateOfBirth = getAttributeValue("dateOfBirth", attributeList, false);

 				if (!StringUtils.isEmpty(dateOfBirth))

 					dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

 				identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, citizenSignature, fiscalNumber);