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 9f7e9b1bbe6c84d0c63b796c81f57134c921eb63..c5b3c2571748564518a7c5b723c91324abd98057 100644 (file)
--- 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 affc73ddc9512761e7233d7668788010d082a0fd..83ae72b03d3b3a86bb383996eadfb8ca24b1a0ea 100644 (file)
--- 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>