Skip to content

Commit

Permalink
Bump Oxalis to version 6.5.0 and added certification validation
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaron-kumar
aaron-kumar committed Mar 4, 2024
1 parent db0ec70 commit 48c179d
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 10 deletions.
7 changes: 6 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>network.oxalis</groupId>
<artifactId>oxalis</artifactId>
<version>6.4.0</version>
<version>6.5.0</version>
</parent>

<artifactId>oxalis-as4</artifactId>
Expand Down Expand Up @@ -142,6 +142,11 @@
<artifactId>peppol-mode</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>network.oxalis.vefa</groupId>
<artifactId>peppol-security</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>network.oxalis.peppol</groupId>
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/network/oxalis/as4/inbound/As4FaultInHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ public class As4FaultInHandler implements SOAPHandler<SOAPMessageContext> {
private final As4MessageFactory as4MessageFactory;
private final PersisterHandler persisterHandler;

private static final String CERTIFICATE_ERROR_MSG = "Cannot find key for certificate";
private static final String ERROR_CODE_FAILED_CHECK = "FAILED_CHECK";
private static final String FAULT_CODE_FAILED_CHECK = "FailedCheck";

@Inject
public As4FaultInHandler(As4MessageFactory as4MessageFactory, PersisterHandler persisterHandler) {
this.as4MessageFactory = as4MessageFactory;
Expand Down Expand Up @@ -111,6 +115,27 @@ public static AS4Error toAS4Error(Throwable t) {

if (t instanceof WSSecurityException && inMessage.isPresent()) {

boolean IsSecurityException = false;
String detailSecurityExceptionMessage = "";

if(null != t.getMessage()) {
detailSecurityExceptionMessage = t.getMessage();
}

if(null != ((WSSecurityException) t).getErrorCode()) {
String errorCode = ((WSSecurityException) t).getErrorCode().name();
IsSecurityException = errorCode.equalsIgnoreCase(ERROR_CODE_FAILED_CHECK);
}

if(null != ((WSSecurityException) t).getFaultCode()) {
String faultCode = (null == ((WSSecurityException) t).getFaultCode().getLocalPart() ? "" : ((WSSecurityException) t).getFaultCode().getLocalPart());
IsSecurityException = faultCode.equalsIgnoreCase(FAULT_CODE_FAILED_CHECK);
}

if(IsSecurityException || detailSecurityExceptionMessage.equalsIgnoreCase(CERTIFICATE_ERROR_MSG)) {
return new OxalisAs4Exception("PEPPOL:NOT_SERVICED", AS4ErrorCode.EBMS_0004, AS4ErrorCode.Severity.FAILURE);
}

boolean isCompressionError = (boolean) inMessage.get().getOrDefault("oxalis.as4.compressionErrorDetected", false);
if (isCompressionError) {

Expand Down
33 changes: 24 additions & 9 deletions src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import network.oxalis.as4.lang.OxalisAs4Exception;
import network.oxalis.as4.lang.OxalisAs4TransmissionException;
import network.oxalis.as4.util.*;
import network.oxalis.api.header.HeaderParser;
import network.oxalis.api.inbound.InboundService;
import network.oxalis.api.lang.TimestampException;
Expand All @@ -19,12 +16,18 @@
import network.oxalis.api.transmission.TransmissionVerifier;
import network.oxalis.as4.common.As4MessageProperties;
import network.oxalis.as4.common.As4MessageProperty;
import network.oxalis.as4.lang.OxalisAs4Exception;
import network.oxalis.as4.lang.OxalisAs4TransmissionException;
import network.oxalis.as4.util.*;
import network.oxalis.commons.header.SbdhHeaderParser;
import network.oxalis.commons.io.UnclosableInputStream;
import network.oxalis.commons.mode.OxalisCertificateValidator;
import network.oxalis.vefa.peppol.common.code.DigestMethod;
import network.oxalis.vefa.peppol.common.code.Service;
import network.oxalis.vefa.peppol.common.model.*;
import network.oxalis.vefa.peppol.sbdh.SbdReader;
import network.oxalis.vefa.peppol.sbdh.lang.SbdhException;
import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Attachment;
Expand Down Expand Up @@ -63,20 +66,27 @@ public class As4InboundHandler {
private final As4MessageFactory as4MessageFactory;
private final PolicyService policyService;
private final InboundService inboundService;
private final OxalisCertificateValidator certificateValidator;

@Inject
public As4InboundHandler(TransmissionVerifier transmissionVerifier, PersisterHandler persisterHandler, TimestampProvider timestampProvider, HeaderParser headerParser, As4MessageFactory as4MessageFactory, PolicyService policyService, InboundService inboundService) {
public As4InboundHandler(TransmissionVerifier transmissionVerifier, PersisterHandler persisterHandler,
TimestampProvider timestampProvider, HeaderParser headerParser, As4MessageFactory as4MessageFactory,
PolicyService policyService, InboundService inboundService, OxalisCertificateValidator certificateValidator) {
this.transmissionVerifier = transmissionVerifier;
this.persisterHandler = persisterHandler;
this.timestampProvider = timestampProvider;
this.headerParser = headerParser;
this.as4MessageFactory = as4MessageFactory;
this.policyService = policyService;
this.inboundService = inboundService;
this.certificateValidator = certificateValidator;
}

public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) throws OxalisAs4Exception {
SOAPHeader soapHeader = getSoapHeader(request);

X509Certificate senderCertificate = getSenderCertificate(soapHeader);

Timestamp timestamp = getTimestamp(soapHeader);
Iterator<AttachmentPart> attachments = CastUtils.cast(request.getAttachments());

Expand All @@ -89,6 +99,13 @@ public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) th
TransmissionIdentifier messageId = TransmissionIdentifier.of(envelopeHeader.getMessageId());

validateMessageId(messageId.getIdentifier()); // Validate UserMessage

try {
certificateValidator.validate(Service.AP, senderCertificate);
} catch (PeppolSecurityException peppolSecurityException) {
throw new OxalisAs4Exception("PEPPOL:NOT_SERVICED", AS4ErrorCode.EBMS_0004, AS4ErrorCode.Severity.FAILURE);
}

validatePayloads(userMessage.getPayloadInfo()); // Validate Payloads

List<ReferenceType> referenceList = SOAPHeaderParser.getReferenceListFromSignedInfo(soapHeader);
Expand Down Expand Up @@ -123,8 +140,6 @@ public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) th
String firstAttachmentId = envelopeHeader.getPayloadCIDs().get(0);
Digest firstAttachmentDigest = Digest.of(DigestMethod.SHA256, SOAPHeaderParser.getAttachmentDigest(firstAttachmentId, soapHeader));

X509Certificate senderCertificate = getSenderCertificate(soapHeader);

As4InboundMetadata as4InboundMetadata = new As4InboundMetadata(
messageId,
userMessage.getCollaborationInfo().getConversationId(),
Expand Down Expand Up @@ -166,11 +181,11 @@ public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) th
return response;
}

private X509Certificate getSenderCertificate(SOAPHeader soapHeader) {
private X509Certificate getSenderCertificate(SOAPHeader soapHeader) throws OxalisAs4Exception {
try {
return SOAPHeaderParser.getSenderCertificate(soapHeader);
} catch (OxalisAs4Exception e) {
return null;
throw new OxalisAs4Exception("PEPPOL:NOT_SERVICED", AS4ErrorCode.EBMS_0004, AS4ErrorCode.Severity.FAILURE);
}
}

Expand All @@ -186,7 +201,7 @@ private boolean isPingMessage(UserMessage userMessage) {
}

return Optional.ofNullable(collaborationInfo.getService())
.map(Service::getValue)
.map(org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Service::getValue)
.map(service -> Optional.ofNullable(collaborationInfo.getAction())
.map(action ->
Constants.TEST_SERVICE.equals(service) && Constants.TEST_ACTION.equals(action)
Expand Down

0 comments on commit 48c179d

Please sign in to comment.