namespace refactoring

4 files changed, 0 insertions, 350 deletions

diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
deleted file mode 100644
index f515ee5a..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
-
-import java.net.MalformedURLException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-
-public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
-	private static final Logger log = LoggerFactory.getLogger(PVPEndPointCredentialProvider.class);
-	
-	@Autowired(required=true) IConfiguration basicConfiguration;
-	
-	@Override
-	public String getFriendlyName() {
-		return "PVP2 S-Profile EndPoint";
-	}
-
-	@Override
-	public String getKeyStoreFilePath() throws EAAFException {
-		try {
-			String path = basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PATH);
-			if (StringUtils.isEmpty(path)) {
-				log.error(getFriendlyName() + " | Path to keyStore is NULL or EMPTY");
-				throw new EAAFConfigurationException("config.27", 
-						new Object[] {getFriendlyName() + " | Path to keyStore is NULL or EMPTY"});
-				
-			}
-			
-			return FileUtils.makeAbsoluteURL(
-					path, 
-					basicConfiguration.getConfigurationRootDirectory());
-			
-		} catch (MalformedURLException e) {
-			log.error(getFriendlyName() + " | Path to keyStore NOT valid.", e);
-			throw new EAAFConfigurationException("config.27", 
-					new Object[] {getFriendlyName() + " | Path to keyStore NOT valid."}, e);
-			
-		}
-		
-	}
-
-	@Override
-	public String getKeyStorePassword() {
-		return basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PASSWORD);
-		
-	}
-
-	@Override
-	public String getMetadataKeyAlias() {
-		return basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEY_METADATA_ALIAS);
-	}
-
-	@Override
-	public String getMetadataKeyPassword() {
-		return basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEY_METADATA_PASSWORD);
-		
-	}
-
-	@Override
-	public String getSignatureKeyAlias() {
-		return basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEY_SIGNING_ALIAS);
-		
-	}
-
-	@Override
-	public String getSignatureKeyPassword() {
-		return basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEY_SIGNING_PASSWORD);
-		
-	}
-
-	@Override
-	public String getEncryptionKeyAlias() {
-		return null;
-		
-	}
-
-	@Override
-	public String getEncryptionKeyPassword() {
-		return null;
-		
-	}
-
-}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
deleted file mode 100644
index c5d2f29c..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataConfigurationFactory;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eidas.specific.connector.config.PVPMetadataConfiguration;
-
-@Service("PVPMetadataConfigurationFactory")
-public class PVPMetadataConfigurationFactory implements IPVPMetadataConfigurationFactory {
-
-	@Autowired private IConfiguration basicConfig;
-	@Autowired private IPVP2BasicConfiguration pvpBasicConfig;
-	
-	@Override
-	public IPVPMetadataBuilderConfiguration generateMetadataBuilderConfiguration(String authURL, 
-			AbstractCredentialProvider pvpIDPCredentials) {
-		return new PVPMetadataConfiguration(basicConfig, authURL, pvpBasicConfig, pvpIDPCredentials);
-		
-	}
-
-}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
deleted file mode 100644
index 41a44dba..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
-
-import java.io.IOException;
-import java.security.cert.CertificateException;
-import java.util.List;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.lang3.StringUtils;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.xml.parse.BasicParserPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2MetadataException;
-import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.AbstractChainingMetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.MetadataFilterChain;
-import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.PVPEntityCategoryFilter;
-import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.SchemaValidationFilter;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eidas.specific.connector.verification.MetadataSignatureVerificationFilter;
-
-@Service("PVPMetadataProvider")
-public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
-	private static final Logger log = LoggerFactory.getLogger(PVPMetadataProvider.class);
-	
-	@Autowired(required=true) IConfiguration basicConfig;
-	
-	@Override
-	protected String getMetadataURL(String entityId) throws EAAFConfigurationException {
-		ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
-		if (spConfig != null) {
-			String metadataURL = entityId;
-			
-			String metadataURLFromConfig = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_URL);
-			if (StringUtils.isNotEmpty(metadataURLFromConfig)) {
-				log.debug("Use metdataURL from configuration for EntityId: " + entityId);
-				metadataURL = metadataURLFromConfig;
-				
-			}
-				
-			return metadataURL;
-			
-		} else
-			log.info("No ServiceProvider with entityId: " + entityId + " in configuration.");
-		
-		return null;
-	}
-
-	@Override
-	protected MetadataProvider createNewMetadataProvider(String entityId)
-			throws EAAFConfigurationException, IOException, CertificateException {
-		ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
-		if (spConfig != null) {
-			try {
-				String metadataURL = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_URL);
-				if (StringUtils.isEmpty(metadataURL)) {
-					log.debug("Use EntityId: " + entityId + " instead of explicite metadataURL ... ");
-					metadataURL = entityId;
-					
-				}				
-				String trustStoreUrl = FileUtils.makeAbsoluteURL(
-						spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE), 
-						authConfig.getConfigurationRootDirectory());
-				String trustStorePassword = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE_PASSWORD);
-
-				return createNewSimpleMetadataProvider(metadataURL, 								 
-						buildMetadataFilterChain(spConfig, metadataURL, trustStoreUrl, trustStorePassword), 
-						spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_UNIQUEIDENTIFIER),
-						getTimer(),
-						new BasicParserPool(),
-						createHttpClient(metadataURL));
-				
-			} catch (PVP2MetadataException e) {
-				log.info("Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage());
-				throw new EAAFConfigurationException("config.27", 
-						new Object[] {"Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage()}, e);
-				
-			}
-			
-		} else
-			log.info("No ServiceProvider with entityId: " + entityId + " in configuration.");
-		
-		return null;
-	}
-
-	@Override
-	protected List<String> getAllMetadataURLsFromConfiguration() throws EAAFConfigurationException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	private HttpClient createHttpClient(String metadataURL) {					
-		HttpClient httpClient = new HttpClient();		
-		HttpClientParams httpClientParams = new HttpClientParams();
-		httpClientParams.setSoTimeout(MSeIDASNodeConstants.METADATA_SOCKED_TIMEOUT);
-		httpClient.setParams(httpClientParams);		
-		return httpClient;
-				
-	}
-	
-	private MetadataFilterChain buildMetadataFilterChain(ISPConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, PVP2MetadataException{
-		MetadataFilterChain filterChain = new MetadataFilterChain();		
-		filterChain.getFilters().add(new SchemaValidationFilter(
-				basicConfig.getBasicMOAIDConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_SCHEME_VALIDATION, true)));
-					
-		filterChain.getFilters().add(
-				new MetadataSignatureVerificationFilter(
-						trustStoreUrl, trustStorePassword, metadataURL));
-				
-		filterChain.getFilters().add(new PVPEntityCategoryFilter(
-				basicConfig.getBasicMOAIDConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true)));
-		
-		return filterChain;		
-	}
-}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java
deleted file mode 100644
index d1787e7d..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
-
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import at.gv.egiz.eaaf.core.api.IStatusMessenger;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-
-@Service("StatusMessageProvider")
-public class StatusMessageProvider implements IStatusMessenger {
-	private static final Logger log = LoggerFactory.getLogger(StatusMessageProvider.class);
-	
-	 private static final String ERROR_MESSAGES_UNAVAILABLE = "Error messages can NOT be load from application. Only errorCode: {0} is availabe" ;	 
-	 private static final String ERROR_NO_MESSAGE = "No errormesseage for error with number.={0}";
-	
-	 private static final String ERROR_EXTERNALERROR_CODES_UNAVAILABLE = "External error-codes can NOT be load from application. Only internal errorCode: {0} is availabe" ;	 
-	 private static final String ERROR_NO_EXTERNALERROR_CODE = "No external error for internal error with number.={0}";
-	 
-	 //internal messanges
-	  private static final String DEFAULT_MESSAGE_RESOURCES = "properties/status_messages_en";  
-	  private static final Locale DEFAULT_MESSAGE_LOCALES = new Locale("en", "GB");
-	  private ResourceBundle messages;
-	  
-	  //external error codes
-	  private static final String DEFAULT_EXTERNALERROR_RESOURCES = "properties/external_statuscodes_map";  
-	  private static final Locale DEFAULT_EXTERNALERROR_LOCALES = new Locale("en", "GB");
-	  private ResourceBundle externalError = null;
-	
-	@Override
-	public String getMessage(String messageId, Object[] parameters) {
-		 // initialize messages
-	    if (messages == null) {	    	
-	      this.messages = PropertyResourceBundle.getBundle(
-	              DEFAULT_MESSAGE_RESOURCES,
-	              DEFAULT_MESSAGE_LOCALES);
-	              
-	    }
-
-	    // create the message
-	    if (messages == null) {
-	      return MessageFormat.format(ERROR_MESSAGES_UNAVAILABLE, new Object[] { messageId });
-
-	    } else {	    	
-	      try {
-	        String rawMessage = messages.getString(messageId);
-	        return MessageFormat.format(rawMessage, parameters);
-	        
-	      } catch (MissingResourceException e2) { 
-	        return MessageFormat.format(ERROR_NO_MESSAGE, new Object[] { messageId });
-	        
-	      }
-	    }						
-	}
-
-	@Override
-	public String getResponseErrorCode(Throwable throwable) {
-		String errorCode = IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
-		if (throwable instanceof EAAFException) {
-			errorCode = ((EAAFException) throwable).getErrorId();
-			
-		}
-		//TODO: maybe more internal switches are required
-		
-		return errorCode;
-		
-	}
-
-	@Override
-	public String mapInternalErrorToExternalError(String intErrorCode) {
-		 // initialize messages
-	    if (externalError == null) {	    	
-	      this.externalError = PropertyResourceBundle.getBundle(
-	    		  DEFAULT_EXTERNALERROR_RESOURCES,
-	    		  DEFAULT_EXTERNALERROR_LOCALES);
-	              
-	    }
-
-	    // create the message
-	    if (externalError == null) {
-	    	log.warn(MessageFormat.format(ERROR_EXTERNALERROR_CODES_UNAVAILABLE, new Object[] { intErrorCode }));
-	      return IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
-
-	    } else {	    	
-	      try {
-	    	  return externalError.getString(intErrorCode);
-	        
-	      } catch (MissingResourceException e2) { 
-	        log.info(MessageFormat.format(ERROR_NO_EXTERNALERROR_CODE, new Object[] { intErrorCode }));
-	        return IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
-	        
-	      }
-	    }				
-	}
-
-}