Revize 7f0e1a0c

#10425 Zachytávání vyjímek (error http requestů) z AUTH appky a následná propagace přes SPADe na klienta.

pom.xml

@@ -104 +104 @@
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
 		<!-- Junit libraries for unit tests-->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/httpErrorHandler/CustomErrorHandler.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.v2.httpErrorHandler;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.HttpClientErrorException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author Jiri Trefil
+ * Custom HTTP error handler for RestTemplate class
+ *
+ */
+public class CustomErrorHandler extends DefaultResponseErrorHandler {
+    /**
+     *
+     * Override default custom behavior of Response Handler to be able to read body of error responses
+     * because default error handle can only parse body of generic errors.
+     * @param response Http response containing error code
+     * @throws IOException if file descriptor (socket) is no longer valid in the response
+     */
+    @Override
+    public void handleError(ClientHttpResponse response) throws IOException {
+        if (response.getStatusCode() == HttpStatus.UNAUTHORIZED) {
+            final InputStream inputStream = response.getBody();
+            byte[] responseBody = inputStream.readAllBytes();
+            inputStream.close();
+            //String responseBody = StreamUtils.copyToString(response.getBody(),StandardCharsets.UTF_8);
+            throw new HttpClientErrorException(response.getStatusCode(),response.getStatusText(),responseBody,StandardCharsets.UTF_8);
+        } else {
+            super.handleError(response);
+        }
+    }
+
+
+}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/security/JwtAuthenticationFilter.java

@@ -2 +2 @@
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.httpExceptions.CustomExceptionHandler;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.OAuthService;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.JSONBuilder;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
 import org.springframework.http.*;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -9 +12 @@
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
@@ -39 +43 @@
             response.getOutputStream().println("{\"error\" : \"Some other error related to jwt token!\"}");
             return;
         }
-        System.out.println("<------------------------tady jsem------------------------->");
 
         try {
             String token = authorizationHeader.replace("Bearer ", "");
@@ -60 +63 @@
                 response.getOutputStream().println("{\"error\" : \"Token timed out!\"}");
                 return;
             }*/
-        } catch (Exception e) {
+        }
+        //4xx or 5xx http response from auth application
+        //basically copies the response from auth app and send it to client
+        catch (HttpClientErrorException e){
             SecurityContextHolder.clearContext();
-            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-            response.getOutputStream().println("{\"error\" : \"Some other error related to jwt token!\"}");
+            //read response body
+            String responseBody = e.getResponseBodyAsString();
+            response.setStatus(e.getStatusCode().value());
+            response.getOutputStream().println(responseBody);
             return;
         }
 

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/utils/JSONBuilder.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -59 +61 @@
         //some simple data type without any indentation, we can just return it
         return value;
     }
+
+    /**
+     * Transform string json to json object
+     * @param jsonString json object in string type
+     * @return JSONObject parsed string
+     */
+    public static JSONObject parseJSON(String jsonString) throws ParseException {
+        if(jsonString == null||jsonString.length()==0) return null;
+        JSONParser parser = new JSONParser();
+        JSONObject json = (JSONObject) parser.parse(jsonString);
+        return json;
+    }
+
+
+
+
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/utils/RequestBuilder.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.httpErrorHandler.CustomErrorHandler;
+import org.json.simple.JSONObject;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
@@ -12 +18 @@
 import javax.servlet.http.HttpServletRequest;
 
 public class RequestBuilder {
-
-    //@Value("${auth.realm.authenticate}")
-    private static String spadeSignature;
     private static Logger logger = Logger.getLogger(RequestBuilder.class.getName());
 
 
 
     public static ResponseEntity<String> sendRequestResponse(String url, Map<String, Object> body) {
         RestTemplate restTemplate = new RestTemplate();
-        String json = JSONBuilder.buildJSON(body);
+        restTemplate.setErrorHandler(new CustomErrorHandler());
+        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
 
+        String json = JSONBuilder.buildJSON(body);
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         //headers.set("X-spade-request",spadeSignature);
@@ -32 +37 @@
 
     public static ResponseEntity<String> sendRequestResponse(String url, String token) {
         RestTemplate restTemplate = new RestTemplate();
-
+        //custom error handler to handle http response
+        restTemplate.setErrorHandler(new CustomErrorHandler());
+        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
         HttpHeaders headers = new HttpHeaders();
 
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -42 +49 @@
         HttpEntity<String> entity = new HttpEntity<>(null, headers);
         ResponseEntity<String> response = restTemplate.postForEntity(url, entity, String.class);
         return response;
+
     }
 
     public static ResponseEntity<String> sendRequestResponse(String url, String token, boolean get) {
         RestTemplate restTemplate = new RestTemplate();
-
+        restTemplate.setErrorHandler(new CustomErrorHandler());
+        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
         HttpHeaders headers = new HttpHeaders();
 
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -58 +67 @@
         return response;
     }
 
+
+    public static ResponseEntity<String> sendRequestResponse(String url, Map<String, Object> body, String token) {
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.setErrorHandler(new CustomErrorHandler());
+        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
+
+        String json = JSONBuilder.buildJSON(body);
+        HttpHeaders headers = new HttpHeaders();
+        headers.set(HttpHeaders.AUTHORIZATION, "Bearer " + token);
+
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        //headers.set("X-spade-request",spadeSignature);
+        HttpEntity<String> entity = new HttpEntity<>(json, headers);
+        return restTemplate.postForEntity(url, entity, String.class);
+    }
+
 }