From: INOPIAE <m.maengel@inopiae.de>
Date: Wed, 27 Jul 2016 05:32:35 +0000 (+0200)
Subject: add: display the configured timeouts and timespans for certain
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=0dff9238feff9bc2d1ae79e5341c01b2811bcce8

add: display the configured timeouts and timespans for certain
operations like verifications.

fixes issue #98

Change-Id: Ia007806375309ae96d0d2d7d7ea8cac5b3bce0a3
---

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 9f7e9b1b..c5b3c257 100644
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -52,6 +52,7 @@ import org.cacert.gigi.ping.PingerDaemon;
 import org.cacert.gigi.util.AuthorizationContext;
 import org.cacert.gigi.util.DayDate;
 import org.cacert.gigi.util.Notary;
+import org.cacert.gigi.util.TimeConditions;
 
 import sun.security.x509.X509Key;
 
@@ -428,6 +429,12 @@ public class Manager extends Page {
                 return true;
             }
         });
+
+        vars.put("testValidMonths", TimeConditions.getInstance().getTestMonths());
+        vars.put("reverificationDays", TimeConditions.getInstance().getVerificationLimitDays());
+        vars.put("verificationFreshMonths", TimeConditions.getInstance().getVerificationMonths());
+        vars.put("verificationMaxAgeMonths", TimeConditions.getInstance().getVerificationMaxAgeMonths());
+
         form.output(resp.getWriter(), getLanguage(req), vars);
     }
 }
diff --git a/util-testing/org/cacert/gigi/pages/Manager.templ b/util-testing/org/cacert/gigi/pages/Manager.templ
index affc73dd..83ae72b0 100644
--- a/util-testing/org/cacert/gigi/pages/Manager.templ
+++ b/util-testing/org/cacert/gigi/pages/Manager.templ
@@ -95,3 +95,33 @@ Domain: <input type="text" name="exemtDom"/>
 <input type="submit" value="Do not exempt this domain from pings" name="delExDom"/>
 </td></tr>
 </table>
+
+<table>
+<tr><th colspan="2">
+Test server settings
+</th></tr>
+
+<tr><td>
+Time for valid tests
+</td><td>
+<?=$testValidMonths?> months
+</td></tr>
+
+<tr><td>
+Time between two verifications
+</td><td>
+<?=$reverificationDays?> days
+</td></tr>
+
+<tr><td>
+Time that a verification is considered recent
+</td><td>
+<?=$verificationFreshMonths?> months
+</td></tr>
+
+<tr><td>
+Maximum time that a verification is accepted
+</td><td>
+<?=$verificationMaxAgeMonths?> months
+</td></tr>
+</table>