Add a hint what the "Request reping" is used for on the email page

fixes issue #56

Change-Id: I518082eb4c95beed01b846690264d174757790dd

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index 87087b7484c2de0a48295fda323b645087f9914b..5d0ce7ec7e8f06c5d09466a859ffc94d7b321635 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -14,6 +14,7 @@ import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

+import org.cacert.gigi.util.TimeConditions;

 
 public class MailManagementForm extends Form {
 
 
 public class MailManagementForm extends Form {
 


@@ -86,6 +87,7 @@ public class MailManagementForm extends Form {
 
         };
         vars.put("emails", ds);
 
         };
         vars.put("emails", ds);

+        vars.put("maxMonth", TimeConditions.getInstance().getEmailPingMonths());

         t.output(out, l, vars);
     }
 }
         t.output(out, l, vars);
     }
 }

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
index 10d44328e786ad54d3209c31d6752ed00805f340..2449bca10f0f2ee6b6a0acf60cda9a7b62986a33 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
@@ -8,7 +8,7 @@
   <tr>
     <td><?=_Default?></td>
     <td><?=_Status?></td>
   <tr>
     <td><?=_Default?></td>
     <td><?=_Status?></td>

-    <td><?=_Last successful verification?></td>
+    <td><?=_Last successful verification?>*</td>

     <td><?=_Address?></td>
     <td><?=_Delete?></td>
     <td><?=_Request reping?></td>
     <td><?=_Address?></td>
     <td><?=_Delete?></td>
     <td><?=_Request reping?></td>


@@ -23,5 +23,8 @@
                <td><button class="btn btn-primary" type="submit" name="reping" value="<?=$id?>"><?=_Request reping?></button></td>
        </tr>
  <? } ?>
                <td><button class="btn btn-primary" type="submit" name="reping" value="<?=$id?>"><?=_Request reping?></button></td>
        </tr>
  <? } ?>

+  <tr>
+    <td colspan=6>* <?=_To issue certificates for an email address listed above, the last successful verification of the email address must not be older than ${maxMonth} months. Use "Request Reping" to start a new email verification.?></td>
+  </tr>

   </tbody>
 </table>
   </tbody>
 </table>

diff --git a/src/org/cacert/gigi/util/TimeConditions.java b/src/org/cacert/gigi/util/TimeConditions.java
index dce98001b0de3a2bc92ea6afa3a11b1f51ab3bde..b851dc9d83e6d99bf634083599fc1ce805d948b3 100644 (file)
--- a/src/org/cacert/gigi/util/TimeConditions.java
+++ b/src/org/cacert/gigi/util/TimeConditions.java
@@ -16,11 +16,14 @@ public class TimeConditions {
 
     private final int verificationMaxAgeMonths;
 
 
     private final int verificationMaxAgeMonths;
 

+    private final int emailPingMonths;
+

     private TimeConditions(Properties ppts) {
         testValidMonths = Integer.parseInt(ppts.getProperty("time.testValidMonths", "12"));
         reverificationDays = Integer.parseInt(ppts.getProperty("time.reverificationDays", "90"));
         verificationFreshMonths = Integer.parseInt(ppts.getProperty("time.verificationFreshMonths", "39"));
         verificationMaxAgeMonths = Integer.parseInt(ppts.getProperty("time.verificationMaxAgeMonths", "24"));
     private TimeConditions(Properties ppts) {
         testValidMonths = Integer.parseInt(ppts.getProperty("time.testValidMonths", "12"));
         reverificationDays = Integer.parseInt(ppts.getProperty("time.reverificationDays", "90"));
         verificationFreshMonths = Integer.parseInt(ppts.getProperty("time.verificationFreshMonths", "39"));
         verificationMaxAgeMonths = Integer.parseInt(ppts.getProperty("time.verificationMaxAgeMonths", "24"));

+        emailPingMonths = Integer.parseInt(ppts.getProperty("time.emailPingMonths", "6"));

     }
 
     public static synchronized TimeConditions getInstance() {
     }
 
     public static synchronized TimeConditions getInstance() {


@@ -76,4 +79,13 @@ public class TimeConditions {
         return verificationMaxAgeMonths;
     }
 
         return verificationMaxAgeMonths;
     }
 

+    /**
+     * Maximum time in months that an email address can be used for creating
+     * client certificates before a reping is neccessary
+     * 
+     * @return the configured number of months
+     */
+    public int getEmailPingMonths() {
+        return emailPingMonths;
+    }

 }
 }

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 3244bb42b6649f42fa1d1ed725a948ba42645425..38b45f6eb11f6be12edeb5d69f5ee171e2d651df 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -501,6 +501,7 @@ public class Manager extends Page {
         vars.put("reverificationDays", TimeConditions.getInstance().getVerificationLimitDays());
         vars.put("verificationFreshMonths", TimeConditions.getInstance().getVerificationMonths());
         vars.put("verificationMaxAgeMonths", TimeConditions.getInstance().getVerificationMaxAgeMonths());
         vars.put("reverificationDays", TimeConditions.getInstance().getVerificationLimitDays());
         vars.put("verificationFreshMonths", TimeConditions.getInstance().getVerificationMonths());
         vars.put("verificationMaxAgeMonths", TimeConditions.getInstance().getVerificationMaxAgeMonths());

+        vars.put("emailPingMonths", TimeConditions.getInstance().getEmailPingMonths());

 
         form.output(resp.getWriter(), getLanguage(req), vars);
     }
 
         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 8556d68626ae6cb5888da442906af92a0f402cf9..dcd6883d1c75f8ce027576f27b99d5c262a5f9c4 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.templ
+++ b/util-testing/org/cacert/gigi/pages/Manager.templ
@@ -125,4 +125,10 @@ Maximum time that a verification is accepted
 </td><td>
 <?=$verificationMaxAgeMonths?> months
 </td></tr>
 </td><td>
 <?=$verificationMaxAgeMonths?> months
 </td></tr>

+
+<tr><td>
+Maximum time before reping of email address needed
+</td><td>
+<?=$emailPingMonths?> months
+</td></tr>

 </table>
 </table>