From 0224cdf7be78cf0778f0b832a42c18c480c4b784 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 9 Dec 2019 09:22:54 +0100 Subject: switch to EAAF-Components 1.1.0-SNAPSHOT --- .../connector/config/PVPEndPointConfiguration.java | 18 +++--- .../connector/config/PVPMetadataConfiguration.java | 72 +++++++++++----------- .../config/StaticResourceConfiguration.java | 6 +- 3 files changed, 48 insertions(+), 48 deletions(-) (limited to 'connector/src/main/java/at/asitplus/eidas/specific/connector/config') diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java index b044f398..4086ef7e 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java @@ -35,48 +35,48 @@ import org.springframework.stereotype.Service; import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants; import at.gv.egiz.eaaf.core.api.idp.IConfiguration; -import at.gv.egiz.eaaf.core.exceptions.EAAFException; -import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration; +import at.gv.egiz.eaaf.core.exceptions.EaafException; +import at.gv.egiz.eaaf.modules.pvp2.api.IPvp2BasicConfiguration; @Service("PVPEndPointConfiguration") -public class PVPEndPointConfiguration implements IPVP2BasicConfiguration { +public class PVPEndPointConfiguration implements IPvp2BasicConfiguration { private static final Logger log = LoggerFactory.getLogger(PVPEndPointConfiguration.class); @Autowired(required=true) IConfiguration basicConfiguration; @Override - public String getIDPEntityId(String authURL) throws EAAFException { + public String getIdpEntityId(String authURL) throws EaafException { return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_METADATA; } @Override - public String getIDPSSOPostService(String authURL) throws EAAFException { + public String getIdpSsoPostService(String authURL) throws EaafException { return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_POST; } @Override - public String getIDPSSORedirectService(String authURL) throws EAAFException { + public String getIdpSsoRedirectService(String authURL) throws EaafException { return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_REDIRECT; } @Override - public Object getIDPSSOSOAPService(String extractAuthURLFromRequest) throws EAAFException { + public Object getIdpSsoSoapService(String extractAuthURLFromRequest) throws EaafException { log.warn("PVP S-Profile End-Point does NOT support SOAP Binding"); return null; } @Override - public List getIDPContacts() throws EAAFException { + public List getIdpContacts() throws EaafException { // Return contact person, if it shall be included in metadata return null; } @Override - public Organization getIDPOrganisation() throws EAAFException { + public Organization getIdpOrganisation() throws EaafException { // Return organization, if it shall be included in metadata return null; } diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java index 39e0c1a4..62ca42ac 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java @@ -38,22 +38,22 @@ import org.slf4j.LoggerFactory; import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants; import at.gv.egiz.eaaf.core.api.idp.IConfiguration; -import at.gv.egiz.eaaf.core.exceptions.EAAFException; -import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration; -import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration; +import at.gv.egiz.eaaf.core.exceptions.EaafException; +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.exception.CredentialsNotAvailableException; -import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PVPAttributeBuilder; +import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder; import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider; -public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguration{ +public class PVPMetadataConfiguration implements IPvpMetadataBuilderConfiguration{ private static final Logger log = LoggerFactory.getLogger(PVPMetadataConfiguration.class); private IConfiguration basicConfig; private String authUrl; private AbstractCredentialProvider pvpIDPCredentials; - private IPVP2BasicConfiguration pvpBasicConfig; + private IPvp2BasicConfiguration pvpBasicConfig; - public PVPMetadataConfiguration(IConfiguration basicConfig, String authURL, IPVP2BasicConfiguration pvpBasicConfig, AbstractCredentialProvider pvpIDPCredentials) { + public PVPMetadataConfiguration(IConfiguration basicConfig, String authURL, IPvp2BasicConfiguration pvpBasicConfig, AbstractCredentialProvider pvpIDPCredentials) { this.authUrl = authURL; this.pvpIDPCredentials = pvpIDPCredentials; this.basicConfig = basicConfig; @@ -62,7 +62,7 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio } @Override - public String getSPNameForLogging() { + public String getSpNameForLogging() { return "PVP2 S-Profile IDP"; } @@ -81,13 +81,13 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio } @Override - public boolean buildIDPSSODescriptor() { + public boolean buildIdpSsoDescriptor() { return true; } @Override - public boolean buildSPSSODescriptor() { + public boolean buildSpSsoDescriptor() { return false; } @@ -95,9 +95,9 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio @Override public String getEntityID() { try { - return pvpBasicConfig.getIDPEntityId(authUrl); + return pvpBasicConfig.getIdpEntityId(authUrl); - } catch (EAAFException e) { + } catch (EaafException e) { log.error("Can NOT build PVP metadata configuration.", e); throw new RuntimeException("Can NOT build PVP metadata configuration."); @@ -114,9 +114,9 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio @Override public List getContactPersonInformation() { try { - return pvpBasicConfig.getIDPContacts(); + return pvpBasicConfig.getIdpContacts(); - } catch (EAAFException e) { + } catch (EaafException e) { log.error("Can NOT build PVP metadata configuration.", e); throw new RuntimeException("Can NOT build PVP metadata configuration."); @@ -127,9 +127,9 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio @Override public Organization getOrgansiationInformation() { try { - return pvpBasicConfig.getIDPOrganisation(); + return pvpBasicConfig.getIdpOrganisation(); - } catch (EAAFException e) { + } catch (EaafException e) { log.error("Can NOT build PVP metadata configuration.", e); throw new RuntimeException("Can NOT build PVP metadata configuration."); @@ -138,13 +138,13 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio @Override public Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException { - return pvpIDPCredentials.getIDPMetaDataSigningCredential(); + return pvpIDPCredentials.getIdpMetaDataSigningCredential(); } @Override public Credential getRequestorResponseSigningCredentials() throws CredentialsNotAvailableException { - return pvpIDPCredentials.getIDPAssertionSigningCredential(); + return pvpIDPCredentials.getIdpAssertionSigningCredential(); } @@ -156,11 +156,11 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio } @Override - public String getIDPWebSSOPostBindingURL() { + public String getIdpWebSsoPostBindingUrl() { try { - return pvpBasicConfig.getIDPSSOPostService(authUrl); + return pvpBasicConfig.getIdpSsoPostService(authUrl); - } catch (EAAFException e) { + } catch (EaafException e) { log.error("Can NOT build PVP metadata configuration.", e); throw new RuntimeException("Can NOT build PVP metadata configuration."); @@ -169,11 +169,11 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio } @Override - public String getIDPWebSSORedirectBindingURL() { + public String getIdpWebSsoRedirectBindingUrl() { try { - return pvpBasicConfig.getIDPSSORedirectService(authUrl); + return pvpBasicConfig.getIdpSsoRedirectService(authUrl); - } catch (EAAFException e) { + } catch (EaafException e) { log.error("Can NOT build PVP metadata configuration.", e); throw new RuntimeException("Can NOT build PVP metadata configuration."); @@ -181,68 +181,68 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio } @Override - public String getIDPSLOPostBindingURL() { + public String getIdpSloPostBindingUrl() { return null; } @Override - public String getIDPSLORedirectBindingURL() { + public String getIdpSloRedirectBindingUrl() { return null; } @Override - public String getSPAssertionConsumerServicePostBindingURL() { + public String getSpAssertionConsumerServicePostBindingUrl() { return null; } @Override - public String getSPAssertionConsumerServiceRedirectBindingURL() { + public String getSpAssertionConsumerServiceRedirectBindingUrl() { return null; } @Override - public String getSPSLOPostBindingURL() { + public String getSpSloPostBindingUrl() { return null; } @Override - public String getSPSLORedirectBindingURL() { + public String getSpSloRedirectBindingUrl() { return null; } @Override - public String getSPSLOSOAPBindingURL() { + public String getSpSloSoapBindingUrl() { return null; } @Override - public List getIDPPossibleAttributes() { - return PVPAttributeBuilder.buildSupportedEmptyAttributes(); + public List getIdpPossibleAttributes() { + return PvpAttributeBuilder.buildSupportedEmptyAttributes(); } @Override - public List getIDPPossibleNameITTypes() { + public List getIdpPossibleNameIdTypes() { return Arrays.asList(NameIDType.PERSISTENT, NameIDType.TRANSIENT, NameIDType.UNSPECIFIED); } @Override - public List getSPRequiredAttributes() { + public List getSpRequiredAttributes() { return null; } @Override - public List getSPAllowedNameITTypes() { + public List getSpAllowedNameIdTypes() { return null; } diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java index 34b9d2fa..97842262 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java @@ -63,7 +63,7 @@ public class StaticResourceConfiguration extends WebMvcConfigurerAdapter { String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_STATIC_PATH); try { if (StringUtils.isNotEmpty(staticResources)) { - String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory()); + String absPath = FileUtils.makeAbsoluteUrl(staticResources , basicConfig.getConfigurationRootDirectory()); if (!absPath.endsWith("/")) absPath += "/"; @@ -102,7 +102,7 @@ public class StaticResourceConfiguration extends WebMvcConfigurerAdapter { final String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_PROPERTIES_PATH); try { if (StringUtils.isNotEmpty(staticResources)) { - final String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory()); + final String absPath = FileUtils.makeAbsoluteUrl(staticResources , basicConfig.getConfigurationRootDirectory()); messageSource.setBasename(absPath); } else @@ -130,7 +130,7 @@ public class StaticResourceConfiguration extends WebMvcConfigurerAdapter { final String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH); try { if (StringUtils.isNotEmpty(staticResources)) { - String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory()); + String absPath = FileUtils.makeAbsoluteUrl(staticResources , basicConfig.getConfigurationRootDirectory()); if (!absPath.endsWith("/")) absPath += "/"; -- cgit v1.2.3