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

FDP-94: Add option to not use organisation certificates #7

Merged
merged 4 commits into from
Nov 23, 2023
Merged

FDP-94: Add option to not use organisation certificates #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78105a2
FDP-94: Add option to not use organisation certificates
jasperkamerling Nov 23, 2023
135e3d7
FDP-94: Fix unit test
jasperkamerling Nov 23, 2023
47e4838
FDP-94: Update comment
jasperkamerling Nov 23, 2023
91110ac
Merge branch 'main' into feature/FDP-94
jasperkamerling Nov 23, 2023
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
22 changes: 13 additions & 9 deletions application/src/main/java/org/gxf/soapbridge/soap/endpoints/SoapEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,19 @@ public void handleRequest(
}

String organisationName = null;
if (request.getAttribute(DEFAULT_REQUEST_ATTR_NAME)
instanceof final SecurityContext securityContext
&& securityContext.getAuthentication().getPrincipal() instanceof final User organisation) {
organisationName = organisation.getUsername();
}
if (organisationName == null) {
LOGGER.error("Unable to find client certificate, returning 500.");
createErrorResponse(response);
return;
if(soapConfiguration.getUseOrganisationFromRequest()) {
if (request.getAttribute(DEFAULT_REQUEST_ATTR_NAME)
instanceof final SecurityContext securityContext
&& securityContext.getAuthentication().getPrincipal() instanceof final User organisation) {
organisationName = organisation.getUsername();
}
if (organisationName == null) {
LOGGER.error("Unable to find client certificate, returning 500.");
createErrorResponse(response);
return;
}
} else {
organisationName = "";
}

// Cache the incoming connection.
Expand Down
9 changes: 9 additions & 0 deletions ...rc/main/kotlin/org/gxf/soapbridge/configuration/properties/SoapConfigurationProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ class SoapConfigurationProperties(
* Timeouts for specific functions.
*/
val customTimeouts: Map<String, Int> = emptyMap(),
/**
* TODO Can we search for certificates on both sides
*
* Property to set common name based on the organisation on requests published to Kafka.
*
* If set to false the other listening proxy doesn't search for certificates by [org.gxf.soapbridge.valueobjects.ProxyServerRequestMessage.commonName].
* Instead, the other proxy will generate a new ssl context.
*/
val useOrganisationFromRequest: Boolean = true,
val callEndpoint: SoapEndpointConfiguration,
)

Expand Down
3 changes: 2 additions & 1 deletion application/src/test/java/org/gxf/soapbridge/soap/clients/SoapClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class SoapClientTest {
HostnameVerificationStrategy.BROWSER_COMPATIBLE_HOSTNAMES,
45,
new HashMap<>(),
true,
new SoapEndpointConfiguration("localhost", 443, "https"));

@InjectMocks SoapClient soapClient;
Expand All @@ -61,7 +62,7 @@ void shouldSendSoapRequestAndKafkaResponse() throws Exception {
}

@Test
void shoudDisconnectWhenSoapRequestFails() throws Exception {
void shouldDisconnectWhenSoapRequestFails() throws Exception {
// arrange
final HttpsURLConnection connection = setupFailingConnectionMock();
Mockito.when(
Expand Down
Loading