Added passing login credentials from EI Frontend to EI Backend (#20)

Author: ValentinTyhonov

src/main/java/com/ericsson/ei/frontend/EIRequestsController.java

@@ -24,14 +24,10 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.*;
 import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -47,18 +43,17 @@
 
 @RestController
 @ConfigurationProperties(prefix = "ei")
-// @RequestMapping(value = "")
 public class EIRequestsController {
 
     private static final Logger LOG = LoggerFactory.getLogger(EIRequestsController.class);
 
+    private CloseableHttpClient client = HttpClientBuilder.create().build();
+
     private String backendServerHost;
     private int backendServerPort;
     private String backendContextPath;
     private boolean useSecureHttp;
 
-    private static final String APPLICATION_JSON = "application/json";
-
     // Backend host and port (Getter & Setters), application.properties ->
     // greeting.xxx
     public String getBackendServerHost() {
@@ -93,17 +88,33 @@ public void setUseSecureHttp(boolean useSecureHttp) {
         this.useSecureHttp = useSecureHttp;
     }
 
-    public String getEIBackendSubscriptionAddress() {
-        String httpMethod = "http";
-        if (useSecureHttp) {
-            httpMethod = "https";
+    /**
+     * Bridge authorized EI Http Requests with GET method. Used for login and logout
+     *
+     */
+    @CrossOrigin
+    @RequestMapping(value = "/auth/*", method = RequestMethod.GET)
+    public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest request) {
+        String eiBackendAddressSuffix = request.getServletPath();
+        String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
+        LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix +
+            "\nForwarding Request to EI Backend with url: " + newRequestUrl);
+
+        try {
+            client.close();
+            client = HttpClientBuilder.create().build();
+        } catch (IOException e) {
+            LOG.error("Failed to close HTTP Client");
         }
 
-        if (backendContextPath != null && !backendContextPath.isEmpty()) {
-            return httpMethod + "://" + this.getBackendServerHost() + ":" + this.getBackendServerPort() + "/"
-                    + backendContextPath;
+        HttpGet eiRequest = new HttpGet(newRequestUrl);
+
+        String header = request.getHeader("Authorization");
+        if (header != null) {
+            eiRequest.addHeader("Authorization", header);
         }
-        return httpMethod + "://" + this.getBackendServerHost() + ":" + this.getBackendServerPort();
+
+        return getResponse(eiRequest);
     }
 
     /**
@@ -120,38 +131,9 @@ public ResponseEntity<String> getRequests(Model model, HttpServletRequest reques
         LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix
                 + "\nForwarding Request to EI Backend with url: " + newRequestUrl);
 
-        HttpClient client = HttpClients.createDefault();
         HttpGet eiRequest = new HttpGet(newRequestUrl);
 
-        String jsonContent = "";
-        HttpResponse eiResponse = null;
-        try {
-            eiResponse = client.execute(eiRequest);
-
-            InputStream inStream = eiResponse.getEntity().getContent();
-            BufferedReader bufReader = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
-            for (String line = bufReader.readLine(); line != null; line = bufReader.readLine()) {
-                jsonContent += line;
-            }
-            bufReader.close();
-            inStream.close();
-        } catch (IOException e) {
-            LOG.error("Forward Request Errors: " + e);
-        }
-
-        LOG.info("EI Http Reponse Status Code: " + eiResponse.getStatusLine().getStatusCode()
-                + "\nEI Recevied jsonContent:\n" + jsonContent + "\nForwarding response back to EI Frontend WebUI.");
-
-        if (jsonContent.isEmpty()) {
-            jsonContent = "[]";
-        }
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<>(jsonContent, headers,
-                HttpStatus.valueOf(eiResponse.getStatusLine().getStatusCode()));
-        return responseEntity;
+        return getResponse(eiRequest);
     }
 
     /**
@@ -180,39 +162,11 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
         LOG.debug("Input Request JSON Content to be forwarded:\n" + inputReqJsonContent);
         HttpEntity inputReqJsonEntity = new ByteArrayEntity(inputReqJsonContent.getBytes());
 
-        HttpClient client = HttpClients.createDefault();
         HttpPost eiRequest = new HttpPost(newRequestUrl);
         eiRequest.setEntity(inputReqJsonEntity);
         eiRequest.setHeader("Content-type", "application/json");
 
-        String jsonContent = "";
-        HttpResponse eiResponse = null;
-        try {
-            eiResponse = client.execute(eiRequest);
-
-            InputStream inStream = eiResponse.getEntity().getContent();
-            BufferedReader bufReader = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
-            for (String line = bufReader.readLine(); line != null; line = bufReader.readLine()) {
-                jsonContent += line;
-            }
-            bufReader.close();
-            inStream.close();
-        } catch (IOException e) {
-            LOG.error("Forward Request Errors: " + e);
-        }
-
-        LOG.info("EI Http Reponse Status Code: " + eiResponse.getStatusLine().getStatusCode()
-                + "\nEI Recevied jsonContent:\n" + jsonContent + "\nForwarding response back to EI Frontend WebUI.");
-
-        if (jsonContent.isEmpty()) {
-            jsonContent = "[]";
-        }
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        ResponseEntity<String> responseEntity = new ResponseEntity<>(jsonContent, headers,
-                HttpStatus.valueOf(eiResponse.getStatusLine().getStatusCode()));
-        return responseEntity;
+        return getResponse(eiRequest);
     }
 
     /**
@@ -223,7 +177,6 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
     @CrossOrigin
     @RequestMapping(value = "/subscriptions", method = RequestMethod.PUT)
     public ResponseEntity<String> putRequests(Model model, HttpServletRequest request) {
-
         String eiBackendAddressSuffix = request.getServletPath();
         String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
         LOG.info("Got HTTP Request with method PUT.\nUrlSuffix: " + eiBackendAddressSuffix
@@ -243,41 +196,11 @@ public ResponseEntity<String> putRequests(Model model, HttpServletRequest reques
         LOG.debug("Input Request JSON Content to be forwarded:\n" + inputReqJsonContent);
         HttpEntity inputReqJsonEntity = new ByteArrayEntity(inputReqJsonContent.getBytes());
 
-        HttpClient client = HttpClients.createDefault();
         HttpPut eiRequest = new HttpPut(newRequestUrl);
         eiRequest.setEntity(inputReqJsonEntity);
         eiRequest.setHeader("Content-type", "application/json");
 
-        String jsonContent = "";
-        HttpResponse eiResponse = null;
-        try {
-            eiResponse = client.execute(eiRequest);
-
-            InputStream inStream = eiResponse.getEntity().getContent();
-            BufferedReader bufReader = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
-            for (String line = bufReader.readLine(); line != null; line = bufReader.readLine()) {
-                jsonContent += line;
-            }
-            bufReader.close();
-            inStream.close();
-        } catch (IOException e) {
-            LOG.error("Forward Request Errors: " + e);
-        }
-
-        LOG.info("EI Http Reponse Status Code: " + eiResponse.getStatusLine().getStatusCode()
-                + "\nEI Recevied jsonContent:\n" + jsonContent + "\nForwarding response back to EI Frontend WebUI.");
-
-        if (jsonContent.isEmpty()) {
-            jsonContent = "[]";
-        }
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(jsonContent, headers,
-                HttpStatus.valueOf(eiResponse.getStatusLine().getStatusCode()));
-
-        return responseEntity;
+        return getResponse(eiRequest);
     }
 
     /**
@@ -293,38 +216,50 @@ public ResponseEntity<String> deleteRequests(Model model, HttpServletRequest req
         LOG.info("Got HTTP Request with method DELETE.\nUrlSuffix: " + eiBackendAddressSuffix
                 + "\nForwarding Request to EI Backend with url: " + newRequestUrl);
 
-        HttpClient client = HttpClients.createDefault();
         HttpDelete eiRequest = new HttpDelete(newRequestUrl);
 
-        String jsonContent = "";
-        HttpResponse eiResponse = null;
-        try {
-            eiResponse = client.execute(eiRequest);
+        return getResponse(eiRequest);
+    }
+
+    private String getEIBackendSubscriptionAddress() {
+        String httpMethod = "http";
+        if (useSecureHttp) {
+            httpMethod = "https";
+        }
+
+        if (backendContextPath != null && !backendContextPath.isEmpty()) {
+            return httpMethod + "://" + this.getBackendServerHost() + ":" + this.getBackendServerPort() + "/"
+                + backendContextPath;
+        }
+        return httpMethod + "://" + this.getBackendServerHost() + ":" + this.getBackendServerPort();
+    }
 
+    private ResponseEntity<String> getResponse(HttpRequestBase request) {
+        String jsonContent = "";
+        int statusCode = 0;
+        try (CloseableHttpResponse eiResponse = client.execute(request)) {
             InputStream inStream = eiResponse.getEntity().getContent();
             BufferedReader bufReader = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
             for (String line = bufReader.readLine(); line != null; line = bufReader.readLine()) {
                 jsonContent += line;
             }
+            if (jsonContent.isEmpty()) {
+                jsonContent = "[]";
+            }
+            statusCode = eiResponse.getStatusLine().getStatusCode();
+            LOG.info("EI Http Reponse Status Code: " + eiResponse.getStatusLine().getStatusCode()
+                + "\nEI Recevied jsonContent:\n" + jsonContent
+                + "\nForwarding response back to EI Frontend WebUI.");
             bufReader.close();
             inStream.close();
         } catch (IOException e) {
             LOG.error("Forward Request Errors: " + e);
         }
 
-        LOG.info("EI Http Reponse Status Code: " + eiResponse.getStatusLine().getStatusCode()
-                + "\nEI Recevied jsonContent:\n" + jsonContent + "\nForwarding response back to EI Frontend WebUI.");
-
-        if (jsonContent.isEmpty()) {
-            jsonContent = "[]";
-        }
-
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        ResponseEntity<String> responseEntity = new ResponseEntity<>(jsonContent, headers,
-                HttpStatus.valueOf(eiResponse.getStatusLine().getStatusCode()));
-        return responseEntity;
+        return new ResponseEntity<>(jsonContent, headers, HttpStatus.valueOf(statusCode));
     }
 
 }

src/main/java/com/ericsson/ei/frontend/WebController.java

@@ -85,18 +85,6 @@ public String login(Model model) {
         return "login";
     }
 
-    @RequestMapping("/register.html")
-    public String register(Model model) {
-
-        return "register";
-    }
-
-    @RequestMapping("/forgot-password.html")
-    public String forgotPassword(Model model) {
-
-        return "forgot-password";
-    }
-
     // Added documentation for JMESPath rules usage
     @RequestMapping("/jmesPathRulesSetUp.html")
     public String jmesPathRulesSetUp(Model model) {