Restrict HTTP redirects to max 10 attempts

FAIRDataTeam · Dec 11, 2019 · ffe3777 · ffe3777
1 parent 35585ea
commit ffe3777
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/main/java/nl/dtls/adminpanel/entity/exception/HttpRedirectException.java b/src/main/java/nl/dtls/adminpanel/entity/exception/HttpRedirectException.java
@@ -0,0 +1,9 @@
+package nl.dtls.adminpanel.entity.exception;
+
+public class HttpRedirectException extends Exception {
+
+    public HttpRedirectException(String message) {
+        super(message);
+    }
+
+}
diff --git a/src/main/java/nl/dtls/adminpanel/service/deployment/DeploymentService.java b/src/main/java/nl/dtls/adminpanel/service/deployment/DeploymentService.java
@@ -63,12 +63,12 @@ public void dispose(Pipeline pipeline) throws IOException {
     }
 
     private void createDirectory(Pipeline pipeline) throws IOException {
-        log(pipeline, "1. Creating directory - started");
+        log(pipeline, "1. Create directory - started");
         Instance instance = pipeline.getInstance();
         Server server = instance.getServer();
         String createDirCommand = format("mkdir %s", instance.getPath());
         sshService.ssh(server, createDirCommand);
-        log(pipeline, "1. Creating directory - ended");
+        log(pipeline, "1. Create directory - ended");
     }
 
     private void copyBinaryFiles(Pipeline pipeline) throws IOException {

diff --git a/src/main/java/nl/dtls/adminpanel/service/instance/InstanceService.java b/src/main/java/nl/dtls/adminpanel/service/instance/InstanceService.java
@@ -15,6 +15,7 @@
 import nl.dtls.adminpanel.database.repository.instance.InstanceRepository;
 import nl.dtls.adminpanel.database.repository.server.ServerRepository;
 import nl.dtls.adminpanel.entity.application.Application;
+import nl.dtls.adminpanel.entity.exception.HttpRedirectException;
 import nl.dtls.adminpanel.entity.exception.ValidationException;
 import nl.dtls.adminpanel.entity.instance.Instance;
 import nl.dtls.adminpanel.entity.instance.InstanceStatus;
@@ -32,6 +33,8 @@
 @Service
 public class InstanceService {
 
+    private static final int MAX_HTTP_REDIRECT_ATTEMPTS = 10;
+
     @Autowired
     private InstanceRepository instanceRepository;
 
@@ -126,24 +129,32 @@ public boolean deleteInstance(String uuid) {
 
     private InstanceStatus computeInstanceStatus(Instance instance) {
         try {
-            doHttpCall(instance.getUrl());
+            doHttpCall(instance.getUrl(), 0);
             return InstanceStatus.RUNNING;
-        } catch (ResourceAccessException e) {
+        } catch (ResourceAccessException | HttpClientErrorException.NotFound e) {
             return InstanceStatus.NOT_RUNNING;
+        } catch (HttpRedirectException e) {
+            log.info("Instance {} ({}, status: {})", instance.getUrl(),
+                e.getMessage(), InstanceStatus.ERROR);
+            return InstanceStatus.ERROR;
         } catch (HttpClientErrorException e) {
             log.info("Instance {} (http: {}, status: {})", instance.getUrl(),
                 e.getStatusCode().toString(), InstanceStatus.ERROR);
             return InstanceStatus.ERROR;
         }
     }
 
-    private ResponseEntity<String> doHttpCall(String url) {
+    private ResponseEntity<String> doHttpCall(String url, int attempts)
+        throws HttpRedirectException {
+        if (attempts >= MAX_HTTP_REDIRECT_ATTEMPTS) {
+            throw new HttpRedirectException("Too many HTTP redirect attempts");
+        }
         ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
         if (response.getStatusCode() == HttpStatus.FOUND
             || response.getStatusCode() == HttpStatus.MOVED_PERMANENTLY) {
             List<String> locations = response.getHeaders().get(HttpHeaders.LOCATION);
             if (locations != null && locations.size() == 1) {
-                return doHttpCall(locations.get(0));
+                return doHttpCall(locations.get(0), attempts + 1);
             }
         }
         return response;