OZG-7232 SmartDocuments zertifikatbasierte Authentifizierung

Unterstützung von client certificate based authentication für smartdocuments client. Zusätzlich wurde der neue Spring RestClient angebunden und der WebClient wurde entfernt.

document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java

@@ -25,6 +25,7 @@ package de.ozgcloud.document.bescheid.smartdocuments;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Optional;
 
@@ -34,14 +35,15 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.BodyExtractors;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.client.RestClient;
 import org.w3c.dom.Document;
 import org.w3c.dom.Text;
 import org.xml.sax.SAXException;
@@ -69,7 +71,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import reactor.core.publisher.Mono;
 
 @Log4j2
 @Service
@@ -87,7 +88,7 @@ class SmartDocumentsBescheidRemoteService implements BescheidRemoteService {
 	private static final MediaType JSON_MEDIA_TYPE_FOR_SD = MediaType.APPLICATION_JSON_UTF8;
 
 	@Qualifier("smartDocuments")
-	private final WebClient smartDocumentsWebClient;
+	private final RestClient smartDocumentsRestClient;
 
 	private final SmartDocumentsProperties properties;
 
@@ -96,19 +97,24 @@ class SmartDocumentsBescheidRemoteService implements BescheidRemoteService {
 		var sdRequest = createRequest(request, vorgang);
 		LOG.debug(() -> buildLogRequest(sdRequest));
 
-		return smartDocumentsWebClient.post().accept(MediaType.APPLICATION_JSON)
+		var response = smartDocumentsRestClient.post().accept(MediaType.APPLICATION_JSON)
 				.contentType(JSON_MEDIA_TYPE_FOR_SD)
-				.bodyValue(sdRequest)
+				.body(sdRequest)
 				.retrieve()
 				.onStatus(HttpStatusCode::is4xxClientError, this::handleClientError)
-				.bodyToMono(SmartDocumentsResponse.class)
-				.map(response -> buildBescheid(request, response))
-				.block();
+				.toEntity(SmartDocumentsResponse.class)
+				.getBody();
+		return buildBescheid(request, response);
+
 	}
 
-	Mono<Throwable> handleClientError(ClientResponse response) {
-		return response.body(BodyExtractors.toMono(String.class))
-				.map(content -> new TechnicalException("Client-Error: " + content));
+	void handleClientError(HttpRequest request, ClientHttpResponse response) {
+		try {
+			var responseBody = IOUtils.toString(response.getBody(), StandardCharsets.UTF_8);
+			throw new TechnicalException("Client-Error: " + response.getStatusCode() + " " + responseBody);
+		} catch (IOException e) {
+			throw new TechnicalException("Couldn't read response body", e);
+		}
 	}
 
 	private String buildLogRequest(SmartDocumentsRequest request) {