Merge branch 'moa-2.1-Snapshot' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa-2.1-Snapshot

5 files changed, 40 insertions, 12 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java
index 3429f6c96..332adaa80 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java
@@ -56,6 +56,19 @@ public class MetaDataVerificationFilter implements MetadataFilter {
 			} catch (MOAIDException e) {
 				throw new FilterException("Invalid Metadata file Root element is no EntitiesDescriptor", null);
 			}
+			
+		} if (metadata instanceof EntityDescriptor) {
+			try {
+				EntityDescriptor entity = (EntityDescriptor) metadata;
+				if (entity.getSignature() != null)
+					EntityVerifier.verify(entity, this.credential);
+				
+				else
+					throw new FilterException("Root element of metadata file has to be signed", null);
+				
+			} catch (MOAIDException e) {
+				throw new FilterException("Invalid Metadata file Root element is no EntitiesDescriptor", null);
+			}				
 		}
 	}
 	
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index be5b2200b..363c094ff 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -253,9 +253,15 @@ public class OASTORKConfig implements IOnlineApplicationData{
 	public List<CPEPS> getEnabledCPEPS() {
 		if (enabledCitizenCountries != null) {
 			List<CPEPS> result = new ArrayList<CPEPS>();
-			for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
-				if(enabledCitizenCountries.contains(current.getCountryCode()))
-					result.add(current);
+			
+			try {
+				for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+					if(enabledCitizenCountries.contains(current.getCountryCode()))
+						result.add(current);
+				}
+				
+			} catch (NullPointerException e){
+				
 			}
 			return result;
 		}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 659835d03..9509f9712 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -133,12 +133,20 @@ public class EditOAAction extends BasicOAAction {
 
 			// prepare attribute helper list
 			ArrayList<AttributeHelper> attributes = new ArrayList<AttributeHelper>();
-			for (StorkAttribute current : ConfigurationDBRead
-					.getMOAIDConfiguration().getAuthComponentGeneral()
-					.getForeignIdentities().getSTORK().getAttributes())
-				attributes.add(new AttributeHelper(current));
-			getStorkOA().setHelperAttributes(attributes);
+			
+			try {			
+				for (StorkAttribute current : ConfigurationDBRead
+						.getMOAIDConfiguration().getAuthComponentGeneral()
+						.getForeignIdentities().getSTORK().getAttributes())
+					attributes.add(new AttributeHelper(current));
+				
+				
+			} catch (NullPointerException e) {
+				
+			}
 
+			getStorkOA().setHelperAttributes(attributes);
+			
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index 345d25cda..40e243d0b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -121,10 +121,10 @@ public class OAPVP2ConfigValidation {
 											protoSocketFactory);
 	
 							} catch (MOAHttpProtocolSocketFactoryException e) {
-								log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.");
+								log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.", e);
 								
 							} catch (ConfigurationException e) {
-								log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.");
+								log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
 								
 							}
 						
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index 4dec2c32e..2e243b3ae 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -70,7 +70,8 @@ public class STORKConfig {
 

         try {

             cpeps = stork.getCPEPS();

-        }   catch (NullPointerException ex) {

+            

+        }   catch (NullPointerException ex) {        	

             Logger.error("CPEPS not configured!");

         }

 

@@ -104,7 +105,7 @@ public class STORKConfig {
 			}*/

 		}

 		attr = new ArrayList<StorkAttribute>();

-		if (stork.getAttributes() != null) {

+		if (stork != null && stork.getAttributes() != null) {

 			for(StorkAttribute current : stork.getAttributes()) {

 				attr.add(current);

 			}