Merge pull request #418 from IABTechLab/sch-UID2-4661-log-http-errors-to-core

sch-UID2-4661 detailed error message when http request to core is not a success

Author: sophia-chen-ttd

src/main/java/com/uid2/shared/attest/UidCoreClient.java

@@ -97,7 +97,7 @@ private InputStream readContentFromLocalFileSystem(String path, Proxy proxy) thr
         return (proxy == null ? new URL(path).openConnection() : new URL(path).openConnection(proxy)).getInputStream();
     }
 
-    private InputStream getWithAttest(String path) throws IOException, AttestationResponseHandlerException {
+    private InputStream getWithAttest(String path) throws IOException, AttestationResponseHandlerException, CloudStorageException {
         if (!attestationResponseHandler.attested()) {
             attestationResponseHandler.attest();
         }
@@ -106,7 +106,9 @@ private InputStream getWithAttest(String path) throws IOException, AttestationRe
 
         HttpResponse<String> httpResponse;
         httpResponse = sendHttpRequest(path, attestationToken);
-
+        if (httpResponse.statusCode() != 200) {
+            throw new CloudStorageException(String.format("Non-success response from core on request to %s. Status code: %d. Response: %s", path, httpResponse.statusCode(), httpResponse.body()));
+        }
         return Utils.convertHttpResponseToInputStream(httpResponse);
     }
 

src/test/java/com/uid2/shared/attest/UidCoreClientTest.java

@@ -47,6 +47,7 @@ public void Download_Succeed_RequestSentWithExpectedParameters() throws IOExcept
 
         String expectedResponseBody = "Hello, world!";
         when(mockHttpResponse.body()).thenReturn(expectedResponseBody);
+        when(mockHttpResponse.statusCode()).thenReturn(200);
 
         HashMap<String, String> expectedHeaders = new HashMap<>();
         expectedHeaders.put(Const.Http.AppVersionHeader, "testAppVersionHeader");
@@ -73,7 +74,7 @@ public void Download_AttestInternalFail_ExceptionThrown() throws IOException, At
     }
 
     @Test
-    public void Download_Attest401_getOptOut_NotCalled() throws CloudStorageException, IOException, AttestationResponseHandlerException {
+    public void Download_Attest401_getOptOut_NotCalled() throws IOException, AttestationResponseHandlerException {
         HttpResponse<String> mockHttpResponse = mock(HttpResponse.class);
         when(mockHttpResponse.statusCode()).thenReturn(401);
 
@@ -82,7 +83,10 @@ public void Download_Attest401_getOptOut_NotCalled() throws CloudStorageExceptio
 
         when(mockHttpClient.get(eq("https://download"), any(HashMap.class))).thenReturn(mockHttpResponse);
 
-        uidCoreClient.download("https://download");
+        assertThrows(CloudStorageException.class, () -> {
+            uidCoreClient.download("https://download");
+        });
+
         verify(mockAttestationResponseHandler, times(1)).attest();
         verify(mockAttestationResponseHandler, never()).getOptOutUrl();
     }