X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util-testing%2Fclub%2Fwpia%2Fgigi%2Fpages%2FManager.java;h=2f866b2d22db8a3dc2ae3cbeb53211852467f095;hp=7cecac2328dd1e11d4e972cb899277afefaffa71;hb=4bae004675e4814f0aee765f840e524a37d9c846;hpb=08c941629aea14473e5c42ab6f5d590be4af4bf8 diff --git a/util-testing/club/wpia/gigi/pages/Manager.java b/util-testing/club/wpia/gigi/pages/Manager.java index 7cecac23..2f866b2d 100644 --- a/util-testing/club/wpia/gigi/pages/Manager.java +++ b/util-testing/club/wpia/gigi/pages/Manager.java @@ -7,6 +7,7 @@ import java.security.GeneralSecurityException; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.Signature; +import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.Base64; import java.util.Calendar; @@ -36,9 +37,13 @@ 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.Contract; +import club.wpia.gigi.dbObjects.Contract.ContractType; import club.wpia.gigi.dbObjects.Country; import club.wpia.gigi.dbObjects.Digest; import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.dbObjects.DomainPingExecution; import club.wpia.gigi.dbObjects.DomainPingType; import club.wpia.gigi.dbObjects.EmailAddress; import club.wpia.gigi.dbObjects.Group; @@ -47,6 +52,7 @@ 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.email.EmailProvider; import club.wpia.gigi.localisation.Language; import club.wpia.gigi.output.template.IterableDataset; import club.wpia.gigi.output.template.Template; @@ -55,6 +61,7 @@ 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.DomainAssessment; import club.wpia.gigi.util.HTMLEncoder; import club.wpia.gigi.util.Notary; import club.wpia.gigi.util.TimeConditions; @@ -158,6 +165,7 @@ public class Manager extends Page { ps.setString(6, getRandomCountry().getCode()); ps.execute(); } + new Contract(u, ContractType.RA_AGENT_CONTRACT); return u; } } @@ -166,6 +174,17 @@ public class Manager extends Page { CATS.enterResult(u, t, new Date(System.currentTimeMillis()), "en_EN", "1"); } + private void expireCATS(User u, CATSType t) { + try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `cats_passed` SET `pass_date`=? WHERE `user_id`=? AND `variant_id`=? AND `pass_date`>?")) { + ps.setTimestamp(1, new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY * 367)); + ps.setInt(2, u.getId()); + ps.setInt(3, t.getId()); + ps.setTimestamp(4, new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY * 366)); + ps.execute(); + ps.close(); + } + } + private static Manager instance; private static final Template t = new Template(Manager.class.getResource("ManagerMails.templ")); @@ -231,12 +250,14 @@ public class Manager extends Page { } @Override - public void ping(Domain domain, String configuration, CertificateOwner target, int confId) { - System.out.println("Test: " + domain); + public DomainPingExecution ping(Domain domain, String configuration, CertificateOwner target, DomainPingConfiguration conf) { + System.err.println("TestManager: " + domain.getSuffix()); if (pingExempt.contains(domain.getSuffix())) { - enterPingResult(confId, DomainPinger.PING_SUCCEDED, "Succeeded by TestManager pass-by", null); + return enterPingResult(conf, DomainPinger.PING_SUCCEDED, "Succeeded by TestManager pass-by", null); } else { - dps.get(dpt).ping(domain, configuration, target, confId); + DomainPinger pinger = dps.get(dpt); + System.err.println("Forward to old pinger: " + pinger); + return pinger.ping(domain, configuration, target, conf); } } @@ -296,21 +317,41 @@ public class Manager extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + AuthorizationContext sessionAc = (AuthorizationContext) req.getSession().getAttribute(Gigi.AUTH_CONTEXT); 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."); + String prefix = req.getParameter("prefix"); + String domain = req.getParameter("suffix"); + try { + if (null == prefix) { + throw new GigiApiException("No prefix given."); + } + if (null == domain) { + throw new GigiApiException("No domain given."); + } + + DomainAssessment.checkCertifiableDomain(domain, false, true); + + if ( !EmailProvider.isValidMailAddress(prefix + "@" + domain)) { + throw new GigiApiException("Invalid email address template."); + } + + batchCreateUsers(prefix, domain, Integer.parseInt(req.getParameter("amount")), resp.getWriter()); + resp.getWriter().println("User batch created."); + } catch (GigiApiException e) { + throw new Error(e); + } } else if (req.getParameter("addpriv") != null || req.getParameter("delpriv") != null) { - User u = User.getByEmail(req.getParameter("email")); - if (u == null) { + User userByEmail = User.getByEmail(req.getParameter("email")); + if (userByEmail == null) { resp.getWriter().println("User not found."); return; } try { if (req.getParameter("addpriv") != null) { - u.grantGroup(getSupporter(), Group.getByString(req.getParameter("priv"))); + userByEmail.grantGroup(getSupporter(), Group.getByString(req.getParameter("priv"))); resp.getWriter().println("Privilege granted"); } else { - u.revokeGroup(getSupporter(), Group.getByString(req.getParameter("priv"))); + userByEmail.revokeGroup(getSupporter(), Group.getByString(req.getParameter("priv"))); resp.getWriter().println("Privilege revoked"); } } catch (GigiApiException e) { @@ -321,83 +362,124 @@ public class Manager extends Page { fetchMails(req, resp, mail); } else if (req.getParameter("cats") != null) { String mail = req.getParameter("catsEmail"); - String testId = req.getParameter("catsType"); + String catsTypeId = req.getParameter("catsType"); User byEmail = User.getByEmail(mail); if (byEmail == null) { resp.getWriter().println("User not found."); return; } - if (testId == null) { + if (catsTypeId == null) { resp.getWriter().println("No test given."); return; } - CATSType test = CATSType.values()[Integer.parseInt(testId)]; + CATSType test = null; + try { + test = CATSType.values()[Integer.parseInt(catsTypeId)]; + } catch (NumberFormatException e) { + resp.getWriter().println("No valid integer given."); + return; + } passCATS(byEmail, test); resp.getWriter().println("Test '" + test.getDisplayName() + "' was added to user account."); + } else if (req.getParameter("catsexpire") != null) { + String mail = req.getParameter("catsEmail"); + String catsTypeId = req.getParameter("catsType"); + User userByEmail = User.getByEmail(mail); + if (userByEmail == null) { + resp.getWriter().println("User not found."); + return; + } + if (catsTypeId == null) { + resp.getWriter().println("No test given."); + return; + } + CATSType test = null; + try { + test = CATSType.values()[Integer.parseInt(catsTypeId)]; + } catch (NumberFormatException e) { + resp.getWriter().println("No valid integer given."); + return; + } + expireCATS(userByEmail, test); + resp.getWriter().println("Test '" + test.getDisplayName() + "' is set expired for user account."); } else if (req.getParameter("verify") != null) { String mail = req.getParameter("verifyEmail"); String verificationPoints = req.getParameter("verificationPoints"); - User byEmail = User.getByEmail(mail); + User userByEmail = User.getByEmail(mail); - if (byEmail == null) { + if (userByEmail == null) { resp.getWriter().println("User not found."); return; } int vp = 0; - int agentNumber = 0; + int verifications = 0; + String info = ""; try { try { vp = Integer.parseInt(verificationPoints); } catch (NumberFormatException e) { - throw new GigiApiException("No valid Verification Points entered."); + resp.getWriter().println("The value for Verification Points must be an integer.
"); + vp = 0; } - if (vp > 100) { // only allow max 100 Verification points - vp = 100; - } + int agentNumber = addVerificationPoints(vp, userByEmail); while (vp > 0) { int currentVP = 10; if (vp < 10) { currentVP = vp; } - Notary.verify(getAgent(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", validVerificationDateString(), VerificationType.FACE_TO_FACE, getRandomCountry()); + if (Notary.checkVerificationIsPossible(getAgent(agentNumber), userByEmail.getPreferredName())) { + + Notary.verify(getAgent(agentNumber), userByEmail, userByEmail.getPreferredName(), userByEmail.getDoB(), currentVP, "Testmanager Verify up code", validVerificationDateString(), VerificationType.FACE_TO_FACE, getRandomCountry()); + vp -= currentVP; + verifications += 1; + + } agentNumber += 1; - vp -= currentVP; + if (agentNumber >= agents.length) { + info = "
The limit of agents is reached. You cannot add any more Verification Points to the preferred name of this user using this method."; + break; + } } } catch (GigiApiException e) { throw new Error(e); } - resp.getWriter().println("User has been verified " + agentNumber + " times."); + resp.getWriter().println("User has been verified " + verifications + " times." + info); } 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 = getAgent(i); - Notary.verify(byEmail, a, a.getNames()[0], a.getDoB(), 10, "Testmanager exp up code", validVerificationDateString(), VerificationType.FACE_TO_FACE, getRandomCountry()); + User userByEmail = User.getByEmail(mail); + if (userByEmail == null || !userByEmail.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(userByEmail, 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")); + User userByEmail = User.getByEmail(req.getParameter("addEmailEmail")); try { - EmailAddress ea = new EmailAddress(u, req.getParameter("addEmailNew"), Locale.ENGLISH); + EmailAddress ea = new EmailAddress(userByEmail, req.getParameter("addEmailNew"), Locale.ENGLISH); verify(ea.getAddress(), ea); } catch (IllegalArgumentException e) { e.printStackTrace(); resp.getWriter().println("An internal error occured."); } catch (GigiApiException e) { - e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH)); + e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH), getDefaultVars(req)); } } else if (req.getParameter("addCert") != null) { - User u = User.getByEmail(req.getParameter("addCertEmail")); + User userByEmail = User.getByEmail(req.getParameter("addCertEmail")); try { KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); kpg.initialize(4096); @@ -408,10 +490,10 @@ public class Manager extends Page { byte[] res = s.getEncoded(sign); - CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), Base64.getEncoder().encodeToString(res), "challenge"); - cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail()); + CertificateRequest cr = new CertificateRequest(new AuthorizationContext(userByEmail, userByEmail, sessionAc.isStronglyAuthenticated()), Base64.getEncoder().encodeToString(res), "challenge"); + cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + userByEmail.getEmail()); Certificate draft = cr.draft(); - draft.issue(null, "2y", u).waitFor(10000); + draft.issue(null, "2y", userByEmail).waitFor(10000); if (draft.getStatus() == CertificateStatus.ISSUED) { resp.getWriter().println("added certificate"); } else { @@ -421,7 +503,7 @@ public class Manager extends Page { e1.printStackTrace(); resp.getWriter().println("error"); } catch (GigiApiException e) { - e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH)); + e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH), getDefaultVars(req)); } } else if (req.getParameter("addExDom") != null) { @@ -434,7 +516,52 @@ public class Manager extends Page { pingExempt.remove(dom); resp.getWriter().println("Updated domains exempt from pings. Current set:
"); resp.getWriter().println(HTMLEncoder.encodeHTML(pingExempt.toString())); + } else if (req.getParameter("makeAgent") != null) { + User userByEmail = User.getByEmail(req.getParameter("agentEmail")); + if (userByEmail == null) { + resp.getWriter().println("User not found, or found user is not allowed to verify."); + } else { + if (userByEmail.getVerificationPoints() < 100) { + addVerificationPoints(100, userByEmail); + } + if ( !userByEmail.hasPassedCATS()) { + passCATS(userByEmail, CATSType.AGENT_CHALLENGE); + } + if ( !Contract.hasSignedContract(userByEmail, Contract.ContractType.RA_AGENT_CONTRACT)) { + try { + new Contract(userByEmail, Contract.ContractType.RA_AGENT_CONTRACT); + } catch (GigiApiException e) { + throw new Error(e); + } + } + resp.getWriter().println("User has all requirements to be an RA Agent"); + } + } + resp.getWriter().println("
Go back"); + } + + private int addVerificationPoints(int vp, User byEmail) throws Error { + int agentNumber = 0; + + try { + if (vp > 100) { // only allow max 100 Verification points + vp = 100; + } + + while (vp > 0) { + int currentVP = 10; + if (vp < 10) { + currentVP = vp; + } + Notary.verify(getAgent(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", validVerificationDateString(), VerificationType.FACE_TO_FACE, getRandomCountry()); + agentNumber += 1; + vp -= currentVP; + } + + } catch (GigiApiException e) { + throw new Error(e); } + return agentNumber; } private void fetchMails(HttpServletRequest req, HttpServletResponse resp, String mail) throws IOException {