Skip to content

Commit 017d86f

Browse files
committed
Added missing fields
1 parent 9078431 commit 017d86f

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

phase4-lib/src/main/java/com/helger/phase4/incoming/AS4IncomingHelper.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
package com.helger.phase4.incoming;
1818

19+
import java.security.cert.X509Certificate;
20+
1921
import org.jspecify.annotations.NonNull;
2022

2123
import com.helger.annotation.Nonempty;
@@ -27,6 +29,7 @@
2729
import com.helger.json.IJsonObject;
2830
import com.helger.json.JsonArray;
2931
import com.helger.json.JsonObject;
32+
import com.helger.security.certificate.CertificateHelper;
3033

3134
import jakarta.servlet.http.Cookie;
3235

@@ -66,6 +69,13 @@ public static IJsonObject getIncomingMetadataAsJson (@NonNull final IAS4Incoming
6669
aMap.add ("RemotePort", aMessageMetadata.getRemotePort ());
6770
if (aMessageMetadata.hasRemoteUser ())
6871
aMap.add ("RemoteUser", aMessageMetadata.getRemoteUser ());
72+
if (aMessageMetadata.hasRemoteTlsCerts ())
73+
{
74+
final IJsonArray aArray = new JsonArray ();
75+
for (final X509Certificate aCert : aMessageMetadata.remoteTlsCerts ())
76+
aArray.add (CertificateHelper.getPEMEncodedCertificate (aCert));
77+
aMap.add ("RemoteTlsCerts", aArray);
78+
}
6979
{
7080
final IJsonArray aArray = new JsonArray ();
7181
for (final Cookie aCookie : aMessageMetadata.cookies ())
@@ -101,6 +111,10 @@ public static IJsonObject getIncomingMetadataAsJson (@NonNull final IAS4Incoming
101111
if (aArray.isNotEmpty ())
102112
aMap.add ("HttpHeaders", aArray);
103113
}
114+
if (aMessageMetadata.getRequestMessageID () != null)
115+
aMap.add ("RequestMessageID", aMessageMetadata.getRequestMessageID ());
116+
if (aMessageMetadata.hasResponseHttpStatusCode ())
117+
aMap.add ("ResponseHttpStatusCode", aMessageMetadata.getResponseHttpStatusCode ());
104118
return aMap;
105119
}
106120
}

0 commit comments

Comments
 (0)