X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util-testing%2Fclub%2Fwpia%2Fgigi%2Fpages%2FManager.java;h=b33d52c439429be5e4d744cbb7341865be91cb24;hp=bd254d502155352bdb79ff49af2c00e90cfb31f6;hb=fbff6c6e84a984a7a869467e0a03d0e7464fd8f6;hpb=7fdcb19d8efdad5839f56d0c95028cad0460da3d;ds=sidebyside
diff --git a/util-testing/club/wpia/gigi/pages/Manager.java b/util-testing/club/wpia/gigi/pages/Manager.java
index bd254d50..b33d52c4 100644
--- a/util-testing/club/wpia/gigi/pages/Manager.java
+++ b/util-testing/club/wpia/gigi/pages/Manager.java
@@ -32,7 +32,9 @@ import club.wpia.gigi.GigiApiException;
import club.wpia.gigi.crypto.SPKAC;
import club.wpia.gigi.database.GigiPreparedStatement;
import club.wpia.gigi.dbObjects.CATS;
+import club.wpia.gigi.dbObjects.CATS.CATSType;
import club.wpia.gigi.dbObjects.Certificate;
+import club.wpia.gigi.dbObjects.Certificate.CertificateStatus;
import club.wpia.gigi.dbObjects.CertificateOwner;
import club.wpia.gigi.dbObjects.Country;
import club.wpia.gigi.dbObjects.Digest;
@@ -41,21 +43,19 @@ import club.wpia.gigi.dbObjects.DomainPingType;
import club.wpia.gigi.dbObjects.EmailAddress;
import club.wpia.gigi.dbObjects.Group;
import club.wpia.gigi.dbObjects.NamePart;
-import club.wpia.gigi.dbObjects.User;
-import club.wpia.gigi.dbObjects.Assurance.AssuranceType;
-import club.wpia.gigi.dbObjects.CATS.CATSType;
-import club.wpia.gigi.dbObjects.Certificate.CertificateStatus;
import club.wpia.gigi.dbObjects.NamePart.NamePartType;
+import club.wpia.gigi.dbObjects.User;
+import club.wpia.gigi.dbObjects.Verification.VerificationType;
import club.wpia.gigi.email.DelegateMailProvider;
import club.wpia.gigi.localisation.Language;
import club.wpia.gigi.output.template.IterableDataset;
import club.wpia.gigi.output.template.Template;
-import club.wpia.gigi.pages.Page;
import club.wpia.gigi.pages.account.certs.CertificateRequest;
import club.wpia.gigi.ping.DomainPinger;
import club.wpia.gigi.ping.PingerDaemon;
import club.wpia.gigi.util.AuthorizationContext;
import club.wpia.gigi.util.DayDate;
+import club.wpia.gigi.util.HTMLEncoder;
import club.wpia.gigi.util.Notary;
import club.wpia.gigi.util.TimeConditions;
import sun.security.x509.X509Key;
@@ -110,7 +110,7 @@ public class Manager extends Page {
return supporter;
}
try {
- User u = createAssurer( -1);
+ User u = createAgent( -1);
if ( !u.isInGroup(Group.SUPPORTER)) {
try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?")) {
ps.setInt(1, u.getId());
@@ -127,29 +127,29 @@ public class Manager extends Page {
return supporter;
}
- public User getAssurer(int i) {
- if (assurers[i] != null) {
- return assurers[i];
+ public User getAgent(int i) {
+ if (agents[i] != null) {
+ return agents[i];
}
try {
- User u = createAssurer(i);
- assurers[i] = u;
+ User u = createAgent(i);
+ agents[i] = u;
} catch (ReflectiveOperationException | GigiApiException e) {
e.printStackTrace();
}
- return assurers[i];
+ return agents[i];
}
- private User createAssurer(int i) throws GigiApiException, IllegalAccessException {
+ private User createAgent(int i) throws GigiApiException, IllegalAccessException {
try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?")) {
- String mail = "test-assurer" + i + "@example.com";
+ String mail = "test-agent" + i + "@example.com";
User u = User.getByEmail(mail);
if (u == null) {
System.out.println("Creating RA-Agent");
createUser(mail);
u = User.getByEmail(mail);
- passCATS(u, CATSType.ASSURER_CHALLENGE);
+ passCATS(u, CATSType.AGENT_CHALLENGE);
ps.setInt(1, u.getId());
ps.setInt(2, u.getPreferredName().getId());
ps.setInt(3, 100);
@@ -290,7 +290,7 @@ public class Manager extends Page {
// ea.verify(hash);
}
- User[] assurers = new User[25];
+ User[] agents = new User[25];
User supporter;
@@ -334,8 +334,8 @@ public class Manager extends Page {
CATSType test = CATSType.values()[Integer.parseInt(testId)];
passCATS(byEmail, test);
resp.getWriter().println("Test '" + test.getDisplayName() + "' was added to user account.");
- } else if (req.getParameter("assure") != null) {
- String mail = req.getParameter("assureEmail");
+ } else if (req.getParameter("verify") != null) {
+ String mail = req.getParameter("verifyEmail");
String verificationPoints = req.getParameter("verificationPoints");
User byEmail = User.getByEmail(mail);
@@ -363,7 +363,7 @@ public class Manager extends Page {
if (vp < 10) {
currentVP = vp;
}
- Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", validVerificationDateString(), AssuranceType.FACE_TO_FACE, getRandomCountry());
+ Notary.verify(getAgent(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", validVerificationDateString(), VerificationType.FACE_TO_FACE, getRandomCountry());
agentNumber += 1;
vp -= currentVP;
}
@@ -372,18 +372,23 @@ public class Manager extends Page {
throw new Error(e);
}
- resp.getWriter().println("User has been assured " + agentNumber + " times.");
+ resp.getWriter().println("User has been verified " + agentNumber + " times.");
- } else if (req.getParameter("letassure") != null) {
- String mail = req.getParameter("letassureEmail");
+ } else if (req.getParameter("letverify") != null) {
+ String mail = req.getParameter("letverifyEmail");
User byEmail = User.getByEmail(mail);
- try {
- for (int i = 0; i < 25; i++) {
- User a = getAssurer(i);
- Notary.assure(byEmail, a, a.getNames()[0], a.getDoB(), 10, "Testmanager exp up code", validVerificationDateString(), AssuranceType.FACE_TO_FACE, getRandomCountry());
+ if (byEmail == null || !byEmail.canVerify()) {
+ resp.getWriter().println("User not found, or found user is not allowed to verify.");
+ } else {
+ try {
+ for (int i = 0; i < 25; i++) {
+ User a = getAgent(i);
+ Notary.verify(byEmail, a, a.getNames()[0], a.getDoB(), 10, "Testmanager exp up code", validVerificationDateString(), VerificationType.FACE_TO_FACE, getRandomCountry());
+ }
+ resp.getWriter().println("Successfully added experience points.");
+ } catch (GigiApiException e) {
+ throw new Error(e);
}
- } catch (GigiApiException e) {
- throw new Error(e);
}
} else if (req.getParameter("addEmail") != null) {
User u = User.getByEmail(req.getParameter("addEmailEmail"));
@@ -425,16 +430,17 @@ public class Manager extends Page {
}
} else if (req.getParameter("addExDom") != null) {
- String dom = req.getParameter("exemtDom");
+ String dom = req.getParameter("exemptDom");
pingExempt.add(dom);
resp.getWriter().println("Updated domains exempt from pings. Current set:
");
- resp.getWriter().println(pingExempt);
+ resp.getWriter().println(HTMLEncoder.encodeHTML(pingExempt.toString()));
} else if (req.getParameter("delExDom") != null) {
- String dom = req.getParameter("exemtDom");
+ String dom = req.getParameter("exemptDom");
pingExempt.remove(dom);
resp.getWriter().println("Updated domains exempt from pings. Current set:
");
- resp.getWriter().println(pingExempt);
+ resp.getWriter().println(HTMLEncoder.encodeHTML(pingExempt.toString()));
}
+ resp.getWriter().println("
Go back");
}
private void fetchMails(HttpServletRequest req, HttpServletResponse resp, String mail) throws IOException {