Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract the correct Sender Certificate in As4InboundHandler #28

Closed
wants to merge 1 commit into from
Closed

Extract the correct Sender Certificate in As4InboundHandler #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/main/java/no/difi/oxalis/as4/inbound/As4InboundHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,19 @@ private As4EnvelopeHeader parseAs4EnvelopeHeader(UserMessage userMessage) {
private X509Certificate extractSenderCertificate(SOAPHeader header) throws OxalisAs4Exception {
Map<String, String> ns = new TreeMap<>();
ns.put("wsse", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd");
ns.put("secutil", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd");
ns.put("xmldsig", "http://www.w3.org/2000/09/xmldsig#");
XPathUtils xu = new XPathUtils(ns);
String cert = xu.getValueString("//wsse:BinarySecurityToken[1]/text()", header);

if (cert == null) {
throw new OxalisAs4Exception("Unable to locate sender certificate");
String certId = xu.getValueString("//wsse:Security/xmldsig:Signature/xmldsig:KeyInfo/wsse:SecurityTokenReference/wsse:Reference/@URI", header).substring(1);
if (certId == null || certId.equals("")) {
throw new OxalisAs4Exception("Unable to locate sender certificate identifier");
}

String cert = xu.getValueString("//wsse:BinarySecurityToken[@secutil:Id='"+certId+"']/text()", header);

if (cert == null || cert.equals("")) {
throw new OxalisAs4Exception("Unable to locate sender certificate '" + certId + "'");
}

try {
Expand Down