PVP2 functional OK, STORK only partially tested

1 files changed, 20 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
index 11e9cb860..c8059b2f9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
@@ -8,8 +8,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.opensaml.saml2.metadata.Company;
 import org.opensaml.saml2.metadata.ContactPerson;
 import org.opensaml.saml2.metadata.ContactPersonTypeEnumeration;
@@ -38,6 +36,10 @@ public class PVPConfiguration {
 		return instance;
 	}
 
+	public static final String PVP2_METADATA = "/pvp2/metadata";
+	public static final String PVP2_REDIRECT = "/pvp2/redirect";
+	public static final String PVP2_POST = "/pvp2/post";
+	
 	public static final String PVP_CONFIG_FILE = "pvp2config.properties";
 	public static final String IDP_JAVAKEYSTORE = "idp.ks.file";
 	public static final String IDP_KEYALIAS = "idp.ks.alias";
@@ -54,9 +56,7 @@ public class PVPConfiguration {
 	public static final String IDP_ORG_DISPNAME = "idp.org.dispname";
 	public static final String IDP_ORG_URL = "idp.org.url";
 
-	public static final String IDP_POST_SSO_SERVICE = "idp.sso.post";
-	public static final String IDP_REDIRECT_SSO_SERVICE = "idp.sso.redirect";
-	public static final String IDP_SOAP_RESOLVE_SERVICE = "idp.resolve.soap";
+	public static final String IDP_PUBLIC_URL = "idp.public.url";
 
 	public static final String IDP_TRUST_STORE = "idp.truststore";
 	public static final String SP_TARGET_PREFIX = "sp.target.";
@@ -88,17 +88,27 @@ public class PVPConfiguration {
 			e.printStackTrace();
 		}
 	}
+	
+	public String getIDPPublicPath() {
+		String publicPath = props.getProperty(IDP_PUBLIC_URL);
+		if(publicPath != null) {
+			if(publicPath.endsWith("/")) {
+				publicPath = publicPath.substring(0, publicPath.length()-2);
+			}
+		}
+		return publicPath;
+	}
 
 	public String getIDPSSOPostService() {
-		return props.getProperty(IDP_POST_SSO_SERVICE);
+		return getIDPPublicPath() + PVP2_POST;
 	}
 
 	public String getIDPSSORedirectService() {
-		return props.getProperty(IDP_REDIRECT_SSO_SERVICE);
+		return getIDPPublicPath() + PVP2_REDIRECT;
 	}
-
-	public String getIDPResolveSOAPService() {
-		return props.getProperty(IDP_SOAP_RESOLVE_SERVICE);
+	
+	public String getIDPSSOMetadataService() {
+		return getIDPPublicPath() + PVP2_METADATA;
 	}
 
 	public String getIDPKeyStoreFilename() {