aboutsummaryrefslogtreecommitdiff
path: root/connector/src/main/java/at/asitplus/eidas/specific/connector/provider
diff options
context:
space:
mode:
Diffstat (limited to 'connector/src/main/java/at/asitplus/eidas/specific/connector/provider')
-rw-r--r--connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java12
-rw-r--r--connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java12
-rw-r--r--connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java28
-rw-r--r--connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java6
4 files changed, 29 insertions, 29 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
index eecf777c..2259acd5 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
@@ -33,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
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.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;
@@ -49,23 +49,23 @@ public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
}
@Override
- public String getKeyStoreFilePath() throws EAAFException {
+ 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",
+ throw new EaafConfigurationException("config.27",
new Object[] {getFriendlyName() + " | Path to keyStore is NULL or EMPTY"});
}
- return FileUtils.makeAbsoluteURL(
+ return FileUtils.makeAbsoluteUrl(
path,
basicConfiguration.getConfigurationRootDirectory());
} catch (MalformedURLException e) {
log.error(getFriendlyName() + " | Path to keyStore NOT valid.", e);
- throw new EAAFConfigurationException("config.27",
+ throw new EaafConfigurationException("config.27",
new Object[] {getFriendlyName() + " | Path to keyStore NOT valid."}, e);
}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
index 35280654..6965a407 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
@@ -29,19 +29,19 @@ import org.springframework.stereotype.Service;
import at.asitplus.eidas.specific.connector.config.PVPMetadataConfiguration;
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.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;
@Service("PVPMetadataConfigurationFactory")
-public class PVPMetadataConfigurationFactory implements IPVPMetadataConfigurationFactory {
+public class PVPMetadataConfigurationFactory implements IPvpMetadataConfigurationFactory {
@Autowired private IConfiguration basicConfig;
- @Autowired private IPVP2BasicConfiguration pvpBasicConfig;
+ @Autowired private IPvp2BasicConfiguration pvpBasicConfig;
@Override
- public IPVPMetadataBuilderConfiguration generateMetadataBuilderConfiguration(String authURL,
+ public IPvpMetadataBuilderConfiguration generateMetadataBuilderConfiguration(String authURL,
AbstractCredentialProvider pvpIDPCredentials) {
return new PVPMetadataConfiguration(basicConfig, authURL, pvpBasicConfig, pvpIDPCredentials);
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
index 831338c2..4db6ac5a 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
@@ -41,13 +41,13 @@ import org.springframework.stereotype.Service;
import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
import at.asitplus.eidas.specific.connector.verification.MetadataSignatureVerificationFilter;
import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+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.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.PvpEntityCategoryFilter;
import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.SchemaValidationFilter;
@Service("PVPMetadataProvider")
@@ -57,8 +57,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
@Autowired(required=true) IConfigurationWithSP basicConfig;
@Override
- protected String getMetadataURL(String entityId) throws EAAFConfigurationException {
- ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
+ protected String getMetadataUrl(String entityId) throws EaafConfigurationException {
+ ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
if (spConfig != null) {
String metadataURL = entityId;
@@ -79,8 +79,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
@Override
protected MetadataProvider createNewMetadataProvider(String entityId)
- throws EAAFConfigurationException, IOException, CertificateException {
- ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(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);
@@ -89,7 +89,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
metadataURL = entityId;
}
- String trustStoreUrl = FileUtils.makeAbsoluteURL(
+ 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);
@@ -101,9 +101,9 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
new BasicParserPool(),
createHttpClient(metadataURL));
- } catch (PVP2MetadataException e) {
+ } catch (Pvp2MetadataException e) {
log.info("Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage());
- throw new EAAFConfigurationException("config.27",
+ throw new EaafConfigurationException("config.27",
new Object[] {"Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage()}, e);
}
@@ -115,7 +115,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
}
@Override
- protected List<String> getAllMetadataURLsFromConfiguration() throws EAAFConfigurationException {
+ protected List<String> getAllMetadataUrlsFromConfiguration() throws EaafConfigurationException {
// TODO Auto-generated method stub
return null;
}
@@ -129,7 +129,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
}
- private MetadataFilterChain buildMetadataFilterChain(ISPConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, PVP2MetadataException{
+ private MetadataFilterChain buildMetadataFilterChain(ISpConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, Pvp2MetadataException{
MetadataFilterChain filterChain = new MetadataFilterChain();
filterChain.getFilters().add(new SchemaValidationFilter(
basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_SCHEME_VALIDATION, true)));
@@ -138,7 +138,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
new MetadataSignatureVerificationFilter(
trustStoreUrl, trustStorePassword, metadataURL));
- filterChain.getFilters().add(new PVPEntityCategoryFilter(
+ filterChain.getFilters().add(new PvpEntityCategoryFilter(
basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true)));
return filterChain;
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
index 875192a1..f4dee848 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
@@ -35,7 +35,7 @@ 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;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
@Service("StatusMessageProvider")
public class StatusMessageProvider implements IStatusMessenger {
@@ -92,8 +92,8 @@ public class StatusMessageProvider implements IStatusMessenger {
@Override
public String getResponseErrorCode(Throwable throwable) {
String errorCode = IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
- if (throwable instanceof EAAFException) {
- errorCode = ((EAAFException) throwable).getErrorId();
+ if (throwable instanceof EaafException) {
+ errorCode = ((EaafException) throwable).getErrorId();
}
//TODO: maybe more internal switches are required
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 01:36:00 +0000