From: Benny Baumann <BenBE1987@gmx.net>
Date: Wed, 20 Dec 2017 22:27:40 +0000 (+0100)
Subject: Merge changes I86c1045b,I9fc533ac
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=e7f7dbb405adb8f3ea733da746842622b2693c4a;hp=7b709637bb12efc4a593a5ca6f312ed27566dad4

Merge changes I86c1045b,I9fc533ac

* changes:
  chg: revoke certificates if repeated ping failed
  fix: the "generateBrokenKeypair" can sometimes hang indefinitely
---

diff --git a/src/club/wpia/gigi/Gigi.java b/src/club/wpia/gigi/Gigi.java
index 2c61c071..00993b52 100644
--- a/src/club/wpia/gigi/Gigi.java
+++ b/src/club/wpia/gigi/Gigi.java
@@ -147,11 +147,11 @@ public final class Gigi extends HttpServlet {
             Menu certificates = createMenu("Certificates");
             putPage(Certificates.PATH + "/*", new Certificates(false), certificates);
             putPage(CertificateAdd.PATH, new CertificateAdd(), certificates);
-            putPage(MailOverview.DEFAULT_PATH, new MailOverview(), certificates);
-            putPage(DomainOverview.PATH, new DomainOverview(), certificates);
-            putPage(EditDomain.PATH + "*", new EditDomain(), null);
 
             Menu wot = createMenu("Verification");
+            putPage(MailOverview.DEFAULT_PATH, new MailOverview(), wot);
+            putPage(DomainOverview.PATH, new DomainOverview(), wot);
+            putPage(EditDomain.PATH + "*", new EditDomain(), null);
             putPage(VerifyPage.PATH + "/*", new VerifyPage(), wot);
             putPage(Points.PATH, new Points(false), wot);
             putPage(RequestTTPPage.PATH, new RequestTTPPage(), wot);
diff --git a/src/club/wpia/gigi/pages/LoginPage.templ b/src/club/wpia/gigi/pages/LoginPage.templ
index f34ffb13..ad3060c5 100644
--- a/src/club/wpia/gigi/pages/LoginPage.templ
+++ b/src/club/wpia/gigi/pages/LoginPage.templ
@@ -2,7 +2,7 @@
 <h1><?=_Login?></h1>
 <p class='smalltext'><?=_Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.?></p>
 <label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" required/><br />
-<label for="password"><?=_Pass Phrase?>:</label><input class="form-control" type='password' name='password' required/><br />
+<label for="password"><?=_Password?>:</label><input class="form-control" type='password' name='password' required/><br />
 <button type='submit' name="process" value="Login" class="btn btn-primary"><?=_Login?></button><br /><br />
 <p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !(/wiki/lostPassword)wiki page!'</a>' for more information?></p>
 </div>
diff --git a/src/club/wpia/gigi/pages/PasswordResetForm.templ b/src/club/wpia/gigi/pages/PasswordResetForm.templ
index a0e46a4f..9663547b 100644
--- a/src/club/wpia/gigi/pages/PasswordResetForm.templ
+++ b/src/club/wpia/gigi/pages/PasswordResetForm.templ
@@ -1,7 +1,7 @@
 <table class="table">
   <thead>
   <tr>
-    <th colspan="2" class="title"><?=_Change Pass Phrase?></th>
+    <th colspan="2" class="title"><?=_Change Password?></th>
   </tr>
   </thead>
   <tbody>
@@ -10,18 +10,18 @@
     <td><input type="password" name="private_token" required></td>
   </tr>
   <tr>
-    <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
+    <td><?=_New Password?><span class="formMandatory">*</span>: </td>
     <td><input type="password" name="pword1" required></td>
   </tr>
   <tr>
-    <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
+    <td><?=_Password Again?><span class="formMandatory">*</span>: </td>
     <td><input type="password" name="pword2" required></td>
   </tr>
   <tr>
     <td colspan="2"><span class="formMandatory">*</span><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. For the current requirements and to learn more, visit our !(/wiki/goodPassword)FAQ!'</a>'.?></td>
   </tr>
   <tr>
-    <td colspan="2"><input type="submit" name="process" value="<?=_Update Pass Phrase?>"></td>
+    <td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
   </tr>
   </tbody>
 </table>
diff --git a/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ b/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ
index 0fd8f76a..1e9136ea 100644
--- a/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ
+++ b/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ
@@ -1,27 +1,27 @@
 <table class="table">
   <thead>
   <tr>
-    <th colspan="2" class="title"><?=_Change Pass Phrase?></th>
+    <th colspan="2" class="title"><?=_Change Password?></th>
   </tr>
   </thead>
   <tbody>
   <tr>
-    <td><?=_Old Pass Phrase?>: </td>
+    <td><?=_Old Password?>: </td>
     <td><input class="form-control" type="password" name="oldpassword" required></td>
   </tr>
   <tr>
-    <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
+    <td><?=_New Password?><span class="formMandatory">*</span>: </td>
     <td><input class="form-control" type="password" name="pword1" required></td>
   </tr>
   <tr>
-    <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
+    <td><?=_Password Again?><span class="formMandatory">*</span>: </td>
     <td><input class="form-control" type="password" name="pword2" required></td>
   </tr>
   <tr>
     <td colspan="2"><span class="formMandatory">*</span><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. For the current requirements and to learn more, visit our !(/wiki/goodPassword)FAQ!'</a>'.?></td>
   </tr>
   <tr>
-    <td colspan="2"><input type="submit" name="process" value="<?=_Update Pass Phrase?>"></td>
+    <td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
   </tr>
   </tbody>
 </table>
diff --git a/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ
index 7b9c5353..494a7ff5 100644
--- a/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -48,8 +48,8 @@
       <label for='SANs'>SANs</label>
     </td>
     <td align="left">
-      <textarea class="form-control" rows='5' name='SANs' placeholder="dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com (or newline separated)"><?=$emails?></textarea><br />
-      <?=_Syntax for SAN?>: dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com <?=_(or newline separated)?><br />
+      <textarea class="form-control" rows='5' name='SANs' placeholder="dns:my.domain.example.org, dns:*.example.org, email:my.email@example.org (or newline separated)"><?=$emails?></textarea><br />
+      <?=_Syntax for SAN?>: dns:my.domain.example.org, dns:*.example.org, email:my.email@example.org <?=_(or newline separated)?><br />
       <?=_Recommendation for inexperienced users: only use one email address for client certificates.?>
       </td>
   </tr>
diff --git a/src/club/wpia/gigi/pages/account/mail/MailAddForm.templ b/src/club/wpia/gigi/pages/account/mail/MailAddForm.templ
index c709391a..a8fbcb8d 100644
--- a/src/club/wpia/gigi/pages/account/mail/MailAddForm.templ
+++ b/src/club/wpia/gigi/pages/account/mail/MailAddForm.templ
@@ -1,6 +1,6 @@
 <table class="table">
   <tr>
-    <td><?=_Email Addresses?> </td>
+    <td><?=_Email Address?> </td>
     <td><input class="form-control" type="text" name="newemail" value="" required></td>
   </tr>
   <tr>
diff --git a/src/club/wpia/gigi/pages/main/Signup.java b/src/club/wpia/gigi/pages/main/Signup.java
index 07d7f912..c5dcadf7 100644
--- a/src/club/wpia/gigi/pages/main/Signup.java
+++ b/src/club/wpia/gigi/pages/main/Signup.java
@@ -133,13 +133,13 @@ public class Signup extends Form {
         String pw1 = req.getParameter("pword1");
         String pw2 = req.getParameter("pword2");
         if (pw1 == null || pw1.equals("")) {
-            ga.mergeInto(new GigiApiException("Pass Phrases were blank"));
+            ga.mergeInto(new GigiApiException("Passwords were blank"));
         } else if ( !pw1.equals(pw2)) {
-            ga.mergeInto(new GigiApiException("Pass Phrases don't match"));
+            ga.mergeInto(new GigiApiException("Passwords don't match"));
         }
         int pwpoints = PasswordStrengthChecker.checkpw(pw1, ni.getNamePartsPlain(), email);
         if (pwpoints < 3) {
-            ga.mergeInto(new GigiApiException(new SprintfCommand("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
+            ga.mergeInto(new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
         }
         if ( !ga.isEmpty()) {
             throw ga;
diff --git a/src/club/wpia/gigi/pages/main/Signup.templ b/src/club/wpia/gigi/pages/main/Signup.templ
index 466eaaa3..d241a863 100644
--- a/src/club/wpia/gigi/pages/main/Signup.templ
+++ b/src/club/wpia/gigi/pages/main/Signup.templ
@@ -32,13 +32,13 @@
   </tr>
 
   <tr>
-    <td><?=_Pass Phrase?><font color="red">*</font>: </td>
+    <td><?=_Password?><font color="red">*</font>: </td>
     <td><input class="form-control" type="password" name="pword1" size="30" autocomplete="off"></td>
     <td rowspan="2">&nbsp;</td>
   </tr>
 
   <tr>
-    <td><?=_Pass Phrase Again?><font color="red">*</font>: </td>
+    <td><?=_Password Again?><font color="red">*</font>: </td>
     <td><input class="form-control" type="password" name="pword2" size="30" autocomplete="off"></td>
   </tr>
 
diff --git a/src/club/wpia/gigi/util/PasswordStrengthChecker.java b/src/club/wpia/gigi/util/PasswordStrengthChecker.java
index 0df62480..112f7128 100644
--- a/src/club/wpia/gigi/util/PasswordStrengthChecker.java
+++ b/src/club/wpia/gigi/util/PasswordStrengthChecker.java
@@ -80,7 +80,7 @@ public class PasswordStrengthChecker {
             }
         }
         if (checkpw(pw, parts.toArray(new String[parts.size()]), email) < 3) {
-            throw (new GigiApiException(new SprintfCommand("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
+            throw (new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
         }
     }