upd: cleanup Test Manager and add an "add verified email"-form

[gigi.git] / util-testing / org / cacert / gigi / pages / Manager.java

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 486ba2c57614de75ad30b4f8511bf6bc2fc78fe3..d8cd700600d6e6d995ba280f53b922e5a4e0a7db 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -21,10 +21,10 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.util.Notary;
@@ -56,6 +56,7 @@ public class Manager extends Page {
                 String mail = "test-assurer" + i + "@example.com";
                 User u = User.getByEmail(mail);
                 if (u == null) {
+                    System.out.println("Creating assurer");
                     createUser(mail);
                     u = User.getByEmail(mail);
                     passCATS(u);
@@ -115,24 +116,6 @@ public class Manager extends Page {
 
     }
 
-    public class ManagementForm extends Form {
-
-        public ManagementForm(HttpServletRequest hsr) {
-            super(hsr);
-        }
-
-        @Override
-        public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
-            return false;
-        }
-
-        @Override
-        protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-            getDefaultTemplate().output(out, l, vars);
-        }
-
-    }
-
     public void batchCreateUsers(String mailPrefix, String domain, int amount, PrintWriter out) {
 
         try {
@@ -155,14 +138,11 @@ public class Manager extends Page {
 
     private void createUser(String email) throws GigiApiException, IllegalAccessException {
         User u = new User();
-        u.setFname("Först");
-        u.setMname("Müddle");
-        u.setLname("Läst");
-        u.setSuffix("Süffix");
+        u.setName(new Name("Först", "Läst", "Müddle", "Süffix"));
         u.setEmail(email);
         Calendar gc = GregorianCalendar.getInstance();
         gc.set(1990, 0, 1);
-        u.setDob(new Date(gc.getTime().getTime()));
+        u.setDoB(new Date(gc.getTime().getTime()));
         u.setPreferredLocale(Locale.ENGLISH);
         u.insert("xvXV12°§");
         EmailAddress ea = new EmailAddress(u, email);
@@ -178,6 +158,7 @@ public class Manager extends Page {
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         if (req.getParameter("create") != null) {
             batchCreateUsers(req.getParameter("prefix"), req.getParameter("suffix"), Integer.parseInt(req.getParameter("amount")), resp.getWriter());
+            resp.getWriter().println("User batch created.");
         } else if (req.getParameter("addpriv") != null || req.getParameter("delpriv") != null) {
             User u = User.getByEmail(req.getParameter("email"));
             if (u == null) {
@@ -186,10 +167,11 @@ public class Manager extends Page {
             }
             if (req.getParameter("addpriv") != null) {
                 u.grantGroup(u, Group.getByString(req.getParameter("priv")));
+                resp.getWriter().println("Privilege granted");
             } else {
                 u.revokeGroup(u, Group.getByString(req.getParameter("priv")));
+                resp.getWriter().println("Privilege revoked");
             }
-
         } else if (req.getParameter("fetch") != null) {
             String mail = req.getParameter("femail");
             fetchMails(req, resp, mail);
@@ -201,6 +183,7 @@ public class Manager extends Page {
                 return;
             }
             passCATS(byEmail);
+            resp.getWriter().println("User has been passed CATS");
         } else if (req.getParameter("assure") != null) {
             String mail = req.getParameter("assureEmail");
             User byEmail = User.getByEmail(mail);
@@ -210,11 +193,30 @@ public class Manager extends Page {
             }
             try {
                 for (int i = 0; i < getAssurers().length; i++) {
-                    Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDob(), 10, "Testmanager Assure up code", "2014-11-06");
+                    Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06");
                 }
             } catch (GigiApiException e) {
                 throw new Error(e);
             }
+            resp.getWriter().println("User has been assured.");
+        } else if (req.getParameter("addEmail") != null) {
+            User u = User.getByEmail(req.getParameter("addEmailEmail"));
+            EmailAddress ea = new EmailAddress(u, req.getParameter("addEmailNew"));
+            try {
+                ea.insert(Language.getInstance(Locale.ENGLISH));
+                String hash = (String) f.get(ea);
+                ea.verify(hash);
+                resp.getWriter().println("Email added and verified");
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+                resp.getWriter().println("An internal error occured.");
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+                resp.getWriter().println("An internal error occured.");
+            } catch (GigiApiException e) {
+                e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH));
+            }
+
         }
     }
 
@@ -229,8 +231,9 @@ public class Manager extends Page {
 
                 @Override
                 public boolean next(Language l, Map<String, Object> vars) {
-                    if ( !s.hasNext())
+                    if ( !s.hasNext()) {
                         return false;
+                    }
                     vars.put("body", s.next().replaceAll("(https?://\\S+)", "<a href=\"$1\">$1</a>"));
                     return true;
                 }
@@ -243,6 +246,8 @@ public class Manager extends Page {
         }
     }
 
+    private Template form = new Template(Manager.class.getResource("Manager.templ"));
+
     @Override
     public boolean needsLogin() {
         return false;
@@ -258,6 +263,6 @@ public class Manager extends Page {
             return;
         }
 
-        new ManagementForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        form.output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
     }
 }