Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit d5edbf27 authored by Pawel GUTOWSKI's avatar Pawel GUTOWSKI
Browse files

EDELIVERY-1978 Moved SOAP client call to a separate class, some minor refactorings

parent 57f7f1b0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 85 deletions
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAuthenticationException.java deleted 100644 → 0
+ 0
− 26
View file @ 57f7f1b0
/*
* Copyright 2017 European Commission | CEF eDelivery
*
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence.
*
* You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and limitations under the Licence.
*/
package eu.europa.ec.edelivery.smp.exceptions;
public class CertificateAuthenticationException extends Exception {
public CertificateAuthenticationException(String message) {
super(message);
}
public CertificateAuthenticationException(String message, Throwable t) {
super(message, t);
}
}
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
+ 6
− 52
View file @ d5edbf27
......@@ -13,7 +13,6 @@
package eu.europa.ec.edelivery.smp.services;
import eu.europa.ec.bdmsl.ws.soap.*;
import eu.europa.ec.edelivery.smp.conversion.CaseSensitivityNormalizer;
import eu.europa.ec.edelivery.smp.conversion.ServiceGroupConverter;
import eu.europa.ec.edelivery.smp.data.dao.ServiceGroupDao;
......@@ -21,24 +20,18 @@ import eu.europa.ec.edelivery.smp.data.dao.UserDao;
import eu.europa.ec.edelivery.smp.data.model.*;
import eu.europa.ec.edelivery.smp.exceptions.NotFoundException;
import eu.europa.ec.edelivery.smp.exceptions.UnknownUserException;
import eu.europa.ec.edelivery.smp.sml.SmlIntegrationException;
import org.busdox.servicemetadata.locator._1.ServiceMetadataPublisherServiceForParticipantType;
import eu.europa.ec.edelivery.smp.sml.SmlConnector;
import org.oasis_open.docs.bdxr.ns.smp._2016._05.ParticipantIdentifierType;
import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceGroup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashSet;
import static eu.europa.ec.edelivery.smp.conversion.ServiceGroupConverter.toDbModel;
import static eu.europa.ec.edelivery.smp.conversion.SmlIdentifierConverter.toBusdoxParticipantId;
import static eu.europa.ec.smp.api.Identifiers.asString;
import static java.util.Arrays.asList;
......@@ -46,7 +39,7 @@ import static java.util.Arrays.asList;
* Created by gutowpa on 14/11/2017.
*/
@Service
public class ServiceGroupService implements ApplicationContextAware {
public class ServiceGroupService {
private static final Logger log = LoggerFactory.getLogger(ServiceGroupService.class);
......@@ -59,14 +52,8 @@ public class ServiceGroupService implements ApplicationContextAware {
@Autowired
private UserDao userDao;
@Value("${bdmsl.integration.enabled}")
boolean smlIntegrationEnabled;
@Value("${bdmsl.integration.smp.id}")
private String smpId;
private ApplicationContext ctx;
@Autowired
private SmlConnector smlConnector;
public ServiceGroup getServiceGroup(ParticipantIdentifierType serviceGroupId) {
ParticipantIdentifierType normalizedServiceGroupId = caseSensitivityNormalizer.normalize(serviceGroupId);
......@@ -107,9 +94,7 @@ public class ServiceGroupService implements ApplicationContextAware {
dbServiceGroup.setOwnerships(new HashSet(asList(dbOwnership)));
serviceGroupDao.save(dbServiceGroup);
if(smlIntegrationEnabled) {
registerInDns(normalizedParticipantId);
}
smlConnector.registerInDns(normalizedParticipantId);
return true;
}
}
......@@ -130,39 +115,8 @@ public class ServiceGroupService implements ApplicationContextAware {
if (dbServiceGroup == null) {
throw new NotFoundException("ServiceGroup not found: '%s'", asString(serviceGroupId));
}
//ownershipDao.removeByServiceGroupId(dbServiceGroup.getId());
serviceGroupDao.remove(dbServiceGroup);
if(smlIntegrationEnabled) {
unregisterFromDns(normalizedServiceGroupId);
}
}
private void registerInDns(ParticipantIdentifierType normalizedParticipantId) {
try {
ServiceMetadataPublisherServiceForParticipantType smlRequest = toBusdoxParticipantId(normalizedParticipantId, smpId);
buildClient().create(smlRequest);
} catch (Exception e) {
throw new SmlIntegrationException("Could not create new DNS entry through SML", e);
}
}
private void unregisterFromDns(ParticipantIdentifierType normalizedParticipantId) {
try {
ServiceMetadataPublisherServiceForParticipantType smlRequest = toBusdoxParticipantId(normalizedParticipantId, smpId);
buildClient().delete(smlRequest);
} catch (Exception e) {
throw new SmlIntegrationException("Could not remove DNS entry through SML", e);
}
}
private IManageParticipantIdentifierWS buildClient() {
return ctx.getBean(IManageParticipantIdentifierWS.class);
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
ctx = applicationContext;
smlConnector.unregisterFromDns(normalizedServiceGroupId);
}
}
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
+ 2
− 1
View file @ d5edbf27
......@@ -76,7 +76,6 @@ public class SmlClientFactory {
private KeyManager[] keyManagers;
@Value("${bdmsl.integration.proxy.server}")
private String proxyServer;
......@@ -143,6 +142,8 @@ public class SmlClientFactory {
Map<String, List<String>> customHeaders = new HashMap<>();
customHeaders.put(CLIENT_CERT_HEADER_KEY, asList(smlClientCertHttpHeader));
requestContext.put(MessageContext.HTTP_REQUEST_HEADERS, customHeaders);
} else{
throw new IllegalStateException("SML integration is wrongly configured, at least one authentication option is required: 2-way-SSL or Client-Cert header");
}
}
......
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java 0 → 100644
+ 80
− 0
View file @ d5edbf27
/*
* Copyright 2017 European Commission | CEF eDelivery
*
* Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence.
*
* You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and limitations under the Licence.
*/
package eu.europa.ec.edelivery.smp.sml;
import eu.europa.ec.bdmsl.ws.soap.IManageParticipantIdentifierWS;
import org.busdox.servicemetadata.locator._1.ServiceMetadataPublisherServiceForParticipantType;
import org.oasis_open.docs.bdxr.ns.smp._2016._05.ParticipantIdentifierType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
import static eu.europa.ec.edelivery.smp.conversion.SmlIdentifierConverter.toBusdoxParticipantId;
import static eu.europa.ec.smp.api.Identifiers.asString;
/**
* Created by gutowpa on 22/12/2017.
*/
@Component
public class SmlConnector implements ApplicationContextAware {
private static final Logger log = LoggerFactory.getLogger(SmlConnector.class);
@Value("${bdmsl.integration.enabled}")
boolean smlIntegrationEnabled;
@Value("${bdmsl.integration.smp.id}")
private String smpId;
private ApplicationContext ctx;
public void registerInDns(ParticipantIdentifierType normalizedParticipantId) {
if (!smlIntegrationEnabled) {
return;
}
log.info("Registering new Participant in BDMSL: " + asString(normalizedParticipantId));
try {
ServiceMetadataPublisherServiceForParticipantType smlRequest = toBusdoxParticipantId(normalizedParticipantId, smpId);
buildClient().create(smlRequest);
} catch (Exception e) {
throw new SmlIntegrationException("Could not create new DNS entry through SML", e);
}
}
public void unregisterFromDns(ParticipantIdentifierType normalizedParticipantId) {
if (!smlIntegrationEnabled) {
return;
}
log.info("Removing Participant from BDMSL: " + asString(normalizedParticipantId));
try {
ServiceMetadataPublisherServiceForParticipantType smlRequest = toBusdoxParticipantId(normalizedParticipantId, smpId);
buildClient().delete(smlRequest);
} catch (Exception e) {
throw new SmlIntegrationException("Could not remove DNS entry through SML", e);
}
}
private IManageParticipantIdentifierWS buildClient() {
return ctx.getBean(IManageParticipantIdentifierWS.class);
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
ctx = applicationContext;
}
}
smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorMappingControllerAdvice.java
+ 0
− 6
View file @ d5edbf27
......@@ -14,7 +14,6 @@
package eu.europa.ec.edelivery.smp.error;
import ec.services.smp._1.ErrorResponse;
import eu.europa.ec.edelivery.smp.exceptions.CertificateAuthenticationException;
import eu.europa.ec.edelivery.smp.exceptions.NotFoundException;
import eu.europa.ec.edelivery.smp.exceptions.UnknownUserException;
import eu.europa.ec.edelivery.smp.exceptions.XmlParsingException;
......@@ -72,11 +71,6 @@ public class ErrorMappingControllerAdvice {
return buildAndWarn(UNAUTHORIZED, ErrorBusinessCode.UNAUTHORIZED, ex.getMessage(), ex);
}
@ExceptionHandler(CertificateAuthenticationException.class)
public ResponseEntity handleCertificateAuthenticationException(CertificateAuthenticationException ex) {
return buildAndWarn(UNAUTHORIZED, ErrorBusinessCode.UNAUTHORIZED, ex.getMessage(), ex);
}
@ExceptionHandler(AccessDeniedException.class)
public ResponseEntity handleAccessDeniedException(AccessDeniedException ex) {
return buildAndWarn(UNAUTHORIZED, ErrorBusinessCode.UNAUTHORIZED, ex.getMessage() + " - Only SMP Admin or owner of given ServiceGroup is allowed to perform this action", ex);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about