From a7d847a8e88dce26267fbd7bddab1ec26878b626 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <daniel.gredler@dhl.com>
Date: Fri, 7 Sep 2018 13:55:37 -0400
Subject: [PATCH] Small DoS mitigation: add start delay sanity check

These types of denial of service issues are more common in web applications, but even here an attacker could tie up system resources indefinitely by specifying a very large start delay.

(Triggered by internal security audit and Fortify analysis.)
---
 .../com/threerings/getdown/data/SysProps.java |  6 +++--
 .../threerings/getdown/data/SysPropsTest.java | 23 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/threerings/getdown/data/SysProps.java b/core/src/main/java/com/threerings/getdown/data/SysProps.java
index e57d6a8..0d164b3 100644
--- a/core/src/main/java/com/threerings/getdown/data/SysProps.java
+++ b/core/src/main/java/com/threerings/getdown/data/SysProps.java
@@ -70,10 +70,12 @@ public class SysProps
         return "launch".equals(System.getProperty("silent"));
     }
 
-    /** Specifies the a delay (in minutes) to wait before starting the update and install process.
+    /** Specifies the delay (in minutes) to wait before starting the update and install process.
+      * Minimum delay is 0 minutes, or no delay (negative values are rounded up to 0 minutes).
+      * Maximum delay is 1 day, or 1440 minutes (larger values are rounded down to 1 day).
       * Usage: {@code -Ddelay=N}. */
     public static int startDelay () {
-        return Integer.getInteger("delay", 0);
+        return Math.min(Math.max(Integer.getInteger("delay", 0), 0), 60 * 24);
     }
 
     /** If true, Getdown will not unpack {@code uresource} jars. Usage: {@code -Dno_unpack}. */
diff --git a/core/src/test/java/com/threerings/getdown/data/SysPropsTest.java b/core/src/test/java/com/threerings/getdown/data/SysPropsTest.java
index 12a1510..449b227 100644
--- a/core/src/test/java/com/threerings/getdown/data/SysPropsTest.java
+++ b/core/src/test/java/com/threerings/getdown/data/SysPropsTest.java
@@ -11,17 +11,38 @@ import static org.junit.Assert.*;
 public class SysPropsTest {
 
     @After public void clearProps () {
+        System.clearProperty("delay");
         System.clearProperty("appbase_domain");
         System.clearProperty("appbase_override");
     }
 
-    public static String[] APPBASES = {
+    private static final String[] APPBASES = {
         "http://foobar.com/myapp",
         "https://foobar.com/myapp",
         "http://foobar.com:8080/myapp",
         "https://foobar.com:8080/myapp"
     };
 
+    @Test public void testStartDelay () {
+
+        assertEquals(0, SysProps.startDelay());
+
+        System.setProperty("delay", "x");
+        assertEquals(0, SysProps.startDelay());
+
+        System.setProperty("delay", "-7");
+        assertEquals(0, SysProps.startDelay());
+
+        System.setProperty("delay", "7");
+        assertEquals(7, SysProps.startDelay());
+
+        System.setProperty("delay", "1440");
+        assertEquals(1440, SysProps.startDelay());
+
+        System.setProperty("delay", "1441");
+        assertEquals(1440, SysProps.startDelay());
+    }
+
     @Test public void testAppbaseDomain () {
         System.setProperty("appbase_domain", "https://barbaz.com");
         for (String appbase : APPBASES) {