Add JWT support in HTTP/HTTPS based locations1.5.4

Issue-ID: DCAEGEN2-2536

Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>
Change-Id: I47a928159853333014b0fd413a085b7c50eeb7a0

2 files changed, 79 insertions, 14 deletions

diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpClientTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpClientTest.java
index 2013950a..98804a0c 100644
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpClientTest.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpClientTest.java
@@ -15,6 +15,7 @@
  */
 package org.onap.dcaegen2.collectors.datafile.http;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,6 +30,7 @@ import reactor.netty.http.client.HttpClientConfig;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -49,6 +51,8 @@ class DfcHttpClientTest {
     private static final String PASSWORD = "123";
     private static final String XNF_ADDRESS = "127.0.0.1";
     private static final int PORT = 80;
+    private static final String JWT_PASSWORD = "thisIsThePassword";
+    private static String ACCESS_TOKEN = "access_token";
 
     @Mock
     private Path pathMock;
@@ -61,10 +65,10 @@ class DfcHttpClientTest {
     }
 
     @Test
-    void openConnection_successAuthSetup() throws DatafileTaskException {
+    void openConnection_successBasicAuthSetup() throws DatafileTaskException {
         dfcHttpClientSpy.open();
         HttpClientConfig config = dfcHttpClientSpy.client.configuration();
-        assertEquals(HttpUtils.basicAuth(USERNAME, PASSWORD), config.headers().get("Authorization"));
+        assertEquals(HttpUtils.basicAuthContent(USERNAME, PASSWORD), config.headers().get("Authorization"));
     }
 
     @Test
@@ -81,25 +85,34 @@ class DfcHttpClientTest {
             .hasMessageContaining("Not sufficient basic auth data for file.");
     }
 
+
     @Test
-    void prepareUri_UriWithoutPort() {
-        ImmutableFileServerData serverData = ImmutableFileServerData.builder()
-            .serverAddress(XNF_ADDRESS)
-            .userId(USERNAME).password(PASSWORD)
-            .build();
-        DfcHttpClient clientNoPortSpy = spy(new DfcHttpClient(serverData));
+    void collectFile_AllOk() throws Exception {
         String REMOTE_FILE = "any";
+        Flux<InputStream> fis = Flux.just(new ByteArrayInputStream("ReturnedString".getBytes()));
+
+        dfcHttpClientSpy.open();
+
+        when(dfcHttpClientSpy.getServerResponse(any())).thenReturn(fis);
+        doReturn(false).when(dfcHttpClientSpy).isDownloadFailed(any());
+
+        dfcHttpClientSpy.collectFile(REMOTE_FILE, pathMock);
+        dfcHttpClientSpy.close();
 
-        String retrievedUri = clientNoPortSpy.prepareUri(REMOTE_FILE);
-        assertTrue(retrievedUri.startsWith("http://" + XNF_ADDRESS + ":80"));
+        verify(dfcHttpClientSpy, times(1)).getServerResponse(ArgumentMatchers.eq(REMOTE_FILE));
+        verify(dfcHttpClientSpy, times(1)).processDataFromServer(any(), any(), any());
+        verify(dfcHttpClientSpy, times(1)).isDownloadFailed(any());
     }
 
     @Test
-    void collectFile_AllOk() throws Exception {
+    void collectFile_AllOkWithJWTToken() throws Exception {
+        dfcHttpClientSpy = spy(new DfcHttpClient(fileServerDataWithJWTToken()));
         String REMOTE_FILE = "any";
         Flux<InputStream> fis = Flux.just(new ByteArrayInputStream("ReturnedString".getBytes()));
 
         dfcHttpClientSpy.open();
+        HttpClientConfig config = dfcHttpClientSpy.client.configuration();
+        assertEquals(HttpUtils.jwtAuthContent(JWT_PASSWORD), config.headers().get("Authorization"));
 
         when(dfcHttpClientSpy.getServerResponse(any())).thenReturn(fis);
         doReturn(false).when(dfcHttpClientSpy).isDownloadFailed(any());
@@ -123,7 +136,7 @@ class DfcHttpClientTest {
         doReturn(fis).when(dfcHttpClientSpy).getServerResponse(any());
 
         assertThatThrownBy(() -> dfcHttpClientSpy.collectFile(REMOTE_FILE, pathMock))
-            .hasMessageContaining("Error occured during datafile download: ");
+            .hasMessageContaining(ERROR_RESPONSE);
         verify(dfcHttpClientSpy, times(1)).getServerResponse(REMOTE_FILE);
         verify(dfcHttpClientSpy, times(1)).processFailedConnectionWithServer(any(), any());
         dfcHttpClientSpy.close();
@@ -142,4 +155,16 @@ class DfcHttpClientTest {
                 .port(PORT)
                 .build();
     }
+
+    private ImmutableFileServerData fileServerDataWithJWTToken() throws URISyntaxException {
+        String query = "?" + ACCESS_TOKEN + "=" + JWT_PASSWORD;
+
+        return ImmutableFileServerData.builder()
+                .serverAddress(XNF_ADDRESS)
+                .userId("")
+                .password("")
+                .port(PORT)
+                .queryParameters(new URIBuilder(query).getQueryParams())
+                .build();
+    }
 }
diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpsClientTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpsClientTest.java
index 8df91d3a..168bb08c 100644
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpsClientTest.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/DfcHttpsClientTest.java
@@ -16,6 +16,7 @@
 package org.onap.dcaegen2.collectors.datafile.http;
 
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.conn.ConnectTimeoutException;
@@ -25,15 +26,18 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.onap.dcaegen2.collectors.datafile.commons.FileServerData;
 import org.onap.dcaegen2.collectors.datafile.commons.ImmutableFileServerData;
 import org.onap.dcaegen2.collectors.datafile.exceptions.DatafileTaskException;
 import org.onap.dcaegen2.collectors.datafile.exceptions.NonRetryableDatafileTaskException;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -50,6 +54,8 @@ class DfcHttpsClientTest {
     private static final String PASSWORD = "123";
     private static final String XNF_ADDRESS = "127.0.0.1";
     private static final int PORT = 443;
+    private static final String JWT_PASSWORD = "thisIsThePassword";
+    private static String ACCESS_TOKEN = "access_token";
     private static String remoteFile = "remoteFile";
 
     @Mock
@@ -105,6 +111,29 @@ class DfcHttpsClientTest {
     }
 
     @Test
+    void dfcHttpsClient_flow_successfulCallWithJWTAndResponseProcessing() throws Exception {
+        FileServerData serverData = jWTTokenInFileServerData();
+        dfcHttpsClientSpy = spy(new DfcHttpsClient(serverData, connectionManager));
+
+        doReturn(HttpClientResponseHelper.APACHE_RESPONSE_OK).when(dfcHttpsClientSpy)
+                .executeHttpClient(any(HttpGet.class));
+        doReturn((long)3).when(dfcHttpsClientSpy).writeFile(eq(localFile), any(InputStream.class));
+
+        dfcHttpsClientSpy.open();
+        dfcHttpsClientSpy.collectFile(remoteFile, localFile);
+        dfcHttpsClientSpy.close();
+
+        verify(dfcHttpsClientSpy, times(1)).makeCall(any(HttpGet.class));
+        verify(dfcHttpsClientSpy, times(1))
+                .executeHttpClient(any(HttpGet.class));
+        verify(dfcHttpsClientSpy, times(1))
+                .processResponse(HttpClientResponseHelper.APACHE_RESPONSE_OK, localFile);
+        verify(dfcHttpsClientSpy, times(1))
+                .writeFile(eq(localFile), any(InputStream.class));
+        assertFalse(serverData.toString().contains(JWT_PASSWORD));
+    }
+
+    @Test
     void dfcHttpsClient_flow_failedCallUnexpectedResponseCode() throws Exception {
         doReturn(HttpClientResponseHelper.APACHE_RESPONSE_OK).when(dfcHttpsClientSpy)
             .executeHttpClient(any(HttpGet.class));
@@ -112,7 +141,7 @@ class DfcHttpsClientTest {
 
         dfcHttpsClientSpy.open();
 
-        assertThrows(NonRetryableDatafileTaskException.class,
+        assertThrows(DatafileTaskException.class,
                 () -> dfcHttpsClientSpy.collectFile(remoteFile, localFile));
     }
 
@@ -157,8 +186,19 @@ class DfcHttpsClientTest {
     private ImmutableFileServerData invalidUserInFileServerData() {
         return ImmutableFileServerData.builder()
                 .serverAddress(XNF_ADDRESS)
-                .userId("demo").password("")
+                .userId(USERNAME).password("")
+                .port(PORT)
+                .build();
+    }
+
+    private ImmutableFileServerData jWTTokenInFileServerData() throws URISyntaxException {
+        String query = "?" + ACCESS_TOKEN + "=" + JWT_PASSWORD;
+
+        return ImmutableFileServerData.builder()
+                .serverAddress(XNF_ADDRESS)
+                .userId("").password("")
                 .port(PORT)
+                .queryParameters(new URIBuilder(query).getQueryParams())
                 .build();
     }
 }