From b6e8e0a8f45c10d9a0cd77807db7107430752981 Mon Sep 17 00:00:00 2001
From: rudolf <rudolf@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 19 Dec 2003 09:00:07 +0000
Subject: MOA-ID 1.1.1D01

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@81 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../moa/id/auth/builder/DataURLBuilder.java        | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java')

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
index 575149d9e..30cc1df5a 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
@@ -1,6 +1,10 @@
 package at.gv.egovernment.moa.id.auth.builder;
 
 import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
+import at.gv.egovernment.moa.logging.Logger;
 
 /**
  * Builds a DataURL parameter meant for the security layer implementation
@@ -29,7 +33,31 @@ public class DataURLBuilder {
    * @return String
    */
   public String buildDataURL(String authBaseURL, String authServletName, String sessionID) {
-    String dataURL = authBaseURL + authServletName;
+
+		String individualDataURLPrefix = null;
+		String dataURL;
+		try {      
+      //check if an individual prefix is configured
+      individualDataURLPrefix = AuthConfigurationProvider.getInstance().
+      	getGenericConfigurationParameter(AuthConfigurationProvider.INDIVIDUAL_DATA_URL_PREFIX);
+			
+			if (null != individualDataURLPrefix) {
+				
+				//check individualDataURLPrefix
+				if(!individualDataURLPrefix.startsWith("http"))
+					throw(new ConfigurationException("config.13", new Object[] { individualDataURLPrefix}));
+
+				//when ok then use it
+				dataURL = individualDataURLPrefix + authServletName;
+			} else 
+				dataURL = authBaseURL + authServletName;
+			    	
+    } catch (ConfigurationException e) {
+      Logger.warn(e);
+      Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", new Object[] { authBaseURL } ));
+			dataURL = authBaseURL + authServletName;
+    }
+
     dataURL = addParameter(dataURL, AuthServlet.PARAM_SESSIONID, sessionID);
   	return dataURL;
   }
-- 
cgit v1.2.3