1 files changed, 24 insertions, 53 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/DynamicOAAuthParameterBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/DynamicOAAuthParameterBuilder.java
index 79b09503f..f4f6e82ba 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/DynamicOAAuthParameterBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/DynamicOAAuthParameterBuilder.java
@@ -28,16 +28,17 @@ import java.util.List;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.exception.DynamicOABuildException;
+import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
+import at.gv.egovernment.moa.id.commons.api.IRequest;
+import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 import at.gv.egovernment.moa.id.commons.db.dao.session.InterfederationSessionStore;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
-import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.config.auth.data.DynamicOAAuthParameters;
-import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 /**
  * @author tlenz
@@ -45,65 +46,35 @@ import at.gv.egovernment.moa.util.Constants;
  */
 public class DynamicOAAuthParameterBuilder {
 
-	public static IOAAuthParameters buildFromAttributeQuery(List<Attribute> reqAttributes, InterfederationSessionStore interfIDP) throws DynamicOABuildException {
+	public static IOAAuthParameters buildFromAttributeQuery(List<Attribute> reqAttributes) throws DynamicOABuildException {
 
 		Logger.debug("Build dynamic OAConfiguration from AttributeQuery and interfederation information");
 		
-		try {
-			DynamicOAAuthParameters dynamicOA = new DynamicOAAuthParameters();
-					
-			for (Attribute attr : reqAttributes) {				
-				//get Target or BusinessService from request 
-				if (attr.getName().equals(PVPConstants.EID_SECTOR_FOR_IDENTIFIER_NAME)) {
-					String attrValue = attr.getAttributeValues().get(0).getDOM().getTextContent();
-					if (attrValue.startsWith(Constants.URN_PREFIX_CDID)) {
-						dynamicOA.setBusinessService(false);
-						dynamicOA.setTarget(attrValue.substring((Constants.URN_PREFIX_CDID + "+").length()));
-						
-					} else if( attrValue.startsWith(Constants.URN_PREFIX_WBPK) || 
-							attrValue.startsWith(Constants.URN_PREFIX_STORK) ) {
-						dynamicOA.setBusinessService(true);
-						dynamicOA.setTarget(attrValue);
-						 					
-					} else {
-						Logger.error("Sector identification " + attrValue + " is not a valid Target or BusinessServiceArea");
-						throw new DynamicOABuildException("Sector identification " + attrValue + " is not a valid Target or BusinessServiceArea", null);
-						
-					}
-					
-				}
+		DynamicOAAuthParameters dynamicOA = new DynamicOAAuthParameters();
 				
-			}
-			
-			if (interfIDP != null) {
-				//load interfederated IDP informations
-				OAAuthParameter idp = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(interfIDP.getIdpurlprefix());
-				if (idp == null) {
-					Logger.warn("Interfederated IDP configuration is not loadable.");
-					throw new DynamicOABuildException("Interfederated IDP configuration is not loadable.", null);
+		for (Attribute attr : reqAttributes) {				
+			//get Target or BusinessService from request 
+			if (attr.getName().equals(PVPConstants.EID_SECTOR_FOR_IDENTIFIER_NAME)) {
+				String attrValue = attr.getAttributeValues().get(0).getDOM().getTextContent();
+				if (attrValue.startsWith(Constants.URN_PREFIX_CDID)) {
+					dynamicOA.setBusinessService(false);
+					dynamicOA.setTarget(attrValue.substring((Constants.URN_PREFIX_CDID + "+").length()));
+					
+				} else if( attrValue.startsWith(Constants.URN_PREFIX_WBPK) || 
+						attrValue.startsWith(Constants.URN_PREFIX_STORK) ) {
+					dynamicOA.setBusinessService(true);
+					dynamicOA.setTarget(attrValue);
+					 					
+				} else {
+					Logger.error("Sector identification " + attrValue + " is not a valid Target or BusinessServiceArea");
+					throw new DynamicOABuildException("Sector identification " + attrValue + " is not a valid Target or BusinessServiceArea", null);
 					
 				}
-			
-				dynamicOA.setApplicationID(idp.getPublicURLPrefix());
-				dynamicOA.setInderfederatedIDP(idp.isInderfederationIDP());
-				dynamicOA.setIDPQueryURL(idp.getIDPAttributQueryServiceURL());
 				
-				//check if IDP service area policy. BusinessService IDPs can only request wbPKs 
-				if (!dynamicOA.getBusinessService() && !idp.isIDPPublicService()) {
-					Logger.error("Interfederated IDP " + idp.getPublicURLPrefix() 
-							+ " has a BusinessService-IDP but requests PublicService attributes.");
-					throw new DynamicOABuildException("Interfederated IDP " + idp.getPublicURLPrefix() 
-							+ " has a BusinessService-IDP but requests PublicService attributes.", null);
-					
-				}				
 			}
 			
-			return dynamicOA;
-
-		} catch (ConfigurationException e) {
-			Logger.warn("Internel server errror. Basic configuration load failed.", e);
-			throw new DynamicOABuildException("Basic configuration load failed.", null);
-		}
+		}			
+		return dynamicOA;