1 files changed, 89 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
index 26fb7bd29..c9482967f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
@@ -23,15 +23,25 @@
 package at.gv.egovernment.moa.id.moduls;
 
 import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.opensaml.saml2.core.Attribute;
 
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.ConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
+import at.gv.egovernment.moa.id.util.HTTPUtils;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public abstract class RequestImpl implements IRequest, Serializable{
-
+		
 	private static final long serialVersionUID = 1L;
 	
 	private String oaURL;
@@ -44,12 +54,67 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	private String requestID;
 	private String sessionIdentifier;
 	private IOAAuthParameters OAConfiguration = null;
+	private String authURL = null;
 	
 	//MOA-ID interfederation
 	private String requestedIDP = null;
 	private MOAResponse response = null;
 	
 	/**
+	 * @throws ConfigurationException 
+	 * 
+	 */
+	public RequestImpl(HttpServletRequest req) throws ConfigurationException {
+		String authURLString = HTTPUtils.extractAuthURLFromRequest(req);
+		URL authURL;
+		try {
+			authURL = new URL(authURLString);
+			
+		} catch (MalformedURLException e) {
+			Logger.error("IDP AuthenticationServiceURL Prefix is not a valid URL." + authURLString, e);
+			throw new ConfigurationException("1299", null, e);
+			
+		}
+		
+		List<String> configuredPublicURLPrefix = 
+				AuthConfigurationProviderFactory.getInstance().getPublicURLPrefix();
+				
+		if (MiscUtil.isEmpty(authURLString)) {
+			Logger.info("AuthenticationServiceURL extraction FAILED. Use default IDP PublicURLPrefix from configuration: " + configuredPublicURLPrefix.get(0));
+			this.authURL = configuredPublicURLPrefix.get(0); 
+			
+		} else {
+			Logger.debug("Extract AuthenticationServiceURL: " + authURLString);
+			URL resultURL = null;
+			
+			for (String el : configuredPublicURLPrefix) {
+				try {
+					URL configuredURL = new URL(el);
+					if (configuredURL.getHost().equals(authURL.getHost()) && 
+							configuredURL.getPath().equals(authURL.getPath())) {
+						Logger.debug("Select configurated PublicURLPrefix: " + configuredURL 
+								+ " for authURL: " + authURLString);
+						resultURL = configuredURL;
+					}
+					
+				} catch (MalformedURLException e) {
+					Logger.error("Configurated IDP PublicURLPrefix is not a valid URL." + el);
+					
+				}				
+			}
+			
+			if (resultURL == null) {
+				Logger.warn("Extract AuthenticationServiceURL: " + authURL + " is NOT found in configuration.");
+				throw new ConfigurationException("config.25", new Object[]{authURLString});
+				
+			} else {
+				this.authURL = resultURL.toExternalForm();
+				
+			}					
+		}				
+	}
+	
+	/**
 	 * This method map the protocol specific requested attributes to PVP 2.1 attributes.
 	 * 
 	 * @return List of PVP 2.1 attributes with maps all protocol specific attributes
@@ -169,4 +234,27 @@ public abstract class RequestImpl implements IRequest, Serializable{
 		this.OAConfiguration = oaConfig;
 		
 	}
+
+	/**
+	 * @return the authURL
+	 */
+	public String getAuthURL() {
+		return authURL;
+	}
+	
+	public String getAuthURLWithOutSlash() {
+		if (authURL.endsWith("/"))
+			return authURL.substring(0, authURL.length()-1);
+		else
+			return authURL;
+		
+	}
+
+//	/**
+//	 * @param authURL the authURL to set
+//	 */
+//	public void setAuthURL(String authURL) {
+//		this.authURL = authURL;
+//	}
+		
 }