X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.java;h=a637f83d462c899ac668a1839e22e6bbda77f1bb;hb=03d27b5bdaea6253e674cdf2779465873b657900;hp=4fca9450613f3cebe1deed54237e11292d14752c;hpb=cfccf094c856476a7618edfe4dc8ff1c2e198b1a;p=gigi.git diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java index 4fca9450..a637f83d 100644 --- a/src/org/cacert/gigi/pages/main/Signup.java +++ b/src/org/cacert/gigi/pages/main/Signup.java @@ -3,24 +3,23 @@ package org.cacert.gigi.pages.main; import java.io.IOException; import java.io.PrintWriter; import java.sql.Date; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Enumeration; import java.util.HashMap; -import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.cacert.gigi.EmailAddress; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.User; import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.database.GigiPreparedStatement; +import org.cacert.gigi.database.GigiResultSet; +import org.cacert.gigi.dbObjects.EmailAddress; +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.DateSelector; -import org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.Page; import org.cacert.gigi.util.HTMLEncoder; @@ -38,12 +37,9 @@ public class Signup extends Form { public Signup(HttpServletRequest hsr) { super(hsr); t = new Template(Signup.class.getResource("Signup.templ")); - buildup.setFname(""); - buildup.setMname(""); - buildup.setLname(""); - buildup.setSuffix(""); + buildup.setName(new Name("", "", "", "")); buildup.setEmail(""); - buildup.setDob(new Date(0)); + buildup.setDoB(new Date(0)); } DateSelector myDoB = new DateSelector("day", "month", "year"); @@ -51,10 +47,11 @@ public class Signup extends Form { @Override public void outputContent(PrintWriter out, Language l, Map outerVars) { HashMap vars = new HashMap(); - vars.put("fname", HTMLEncoder.encodeHTML(buildup.getFname())); - vars.put("mname", HTMLEncoder.encodeHTML(buildup.getMname())); - vars.put("lname", HTMLEncoder.encodeHTML(buildup.getLname())); - vars.put("suffix", HTMLEncoder.encodeHTML(buildup.getSuffix())); + Name buildupName = buildup.getName(); + vars.put("fname", HTMLEncoder.encodeHTML(buildupName.getFname())); + vars.put("mname", HTMLEncoder.encodeHTML(buildupName.getMname())); + vars.put("lname", HTMLEncoder.encodeHTML(buildupName.getLname())); + vars.put("suffix", HTMLEncoder.encodeHTML(buildupName.getSuffix())); vars.put("dob", myDoB); vars.put("email", HTMLEncoder.encodeHTML(buildup.getEmail())); vars.put("general", general ? " checked=\"checked\"" : ""); @@ -67,21 +64,26 @@ public class Signup extends Form { } private void update(HttpServletRequest r) { + String fname = buildup.getName().getFname(); + String lname = buildup.getName().getLname(); + String mname = buildup.getName().getMname(); + String suffix = buildup.getName().getSuffix(); if (r.getParameter("fname") != null) { - buildup.setFname(r.getParameter("fname")); + fname = r.getParameter("fname"); } if (r.getParameter("lname") != null) { - buildup.setLname(r.getParameter("lname")); + lname = r.getParameter("lname"); } if (r.getParameter("mname") != null) { - buildup.setMname(r.getParameter("mname")); + mname = r.getParameter("mname"); } if (r.getParameter("suffix") != null) { - buildup.setSuffix(r.getParameter("suffix")); + suffix = r.getParameter("suffix"); } if (r.getParameter("email") != null) { buildup.setEmail(r.getParameter("email")); } + buildup.setName(new Name(fname, lname, mname, suffix)); general = "1".equals(r.getParameter("general")); country = "1".equals(r.getParameter("country")); regional = "1".equals(r.getParameter("regional")); @@ -95,8 +97,8 @@ public class Signup extends Form { @Override public synchronized boolean submit(PrintWriter out, HttpServletRequest req) { update(req); - if (buildup.getFname().equals("") || buildup.getLname().equals("")) { - outputError(out, req, "First and/or last names were blank."); + if (buildup.getName().getLname().trim().equals("")) { + outputError(out, req, "Last name were blank."); } if ( !myDoB.isValid()) { outputError(out, req, "Invalid date of birth"); @@ -121,34 +123,29 @@ public class Signup extends Form { if (isFailed(out)) { return false; } - try { - PreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted`=0"); - PreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from `users` where `email`=? and `deleted`=0"); - q1.setString(1, buildup.getEmail()); - q2.setString(1, buildup.getEmail()); - ResultSet r1 = q1.executeQuery(); - ResultSet r2 = q2.executeQuery(); - if (r1.next() || r2.next()) { - outputError(out, req, "This email address is currently valid in the system."); - } - r1.close(); - r2.close(); - PreparedStatement q3 = DatabaseConnection.getInstance().prepare("select `domain` from `baddomains` where `domain`=RIGHT(?, LENGTH(`domain`))"); - q3.setString(1, buildup.getEmail()); - - ResultSet r3 = q3.executeQuery(); - if (r3.next()) { - String domain = r3.getString(1); - outputError(out, req, "We don't allow signups from people using email addresses from %s", domain); - } - r3.close(); - } catch (SQLException e) { - e.printStackTrace(); - outputError(out, req, "an internal error happened"); - } + GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("SELECT * FROM `emails` WHERE `email`=? AND `deleted` IS NULL"); + GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("SELECT * FROM `certOwners` INNER JOIN `users` ON `users`.`id`=`certOwners`.`id` WHERE `email`=? AND `deleted` IS NULL"); + q1.setString(1, buildup.getEmail()); + q2.setString(1, buildup.getEmail()); + GigiResultSet r1 = q1.executeQuery(); + GigiResultSet r2 = q2.executeQuery(); + if (r1.next() || r2.next()) { + outputError(out, req, "This email address is currently valid in the system."); + } + r1.close(); + r2.close(); + GigiPreparedStatement q3 = DatabaseConnection.getInstance().prepare("SELECT `domain` FROM `baddomains` WHERE `domain`=RIGHT(?, LENGTH(`domain`))"); + q3.setString(1, buildup.getEmail()); + + GigiResultSet r3 = q3.executeQuery(); + if (r3.next()) { + String domain = r3.getString(1); + outputError(out, req, "We don't allow signups from people using email addresses from %s", domain); + } + r3.close(); String mailResult = EmailProvider.FAIL; try { - mailResult = EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail()); + mailResult = HTMLEncoder.encodeHTML(EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail())); } catch (IOException e) { } if ( !mailResult.equals(EmailProvider.OK)) { @@ -171,29 +168,31 @@ public class Signup extends Form { run(req, pw1); } catch (SQLException e) { e.printStackTrace(); + } catch (GigiApiException e) { + outputError(out, req, e.getMessage()); + return false; } return true; } - private void run(HttpServletRequest req, String password) throws SQLException { + private void run(HttpServletRequest req, String password) throws SQLException, GigiApiException { try { DatabaseConnection.getInstance().beginTransaction(); - Enumeration locales = req.getLocales(); buildup.setPreferredLocale(Page.getLanguage(req).getLocale()); - buildup.setDob(myDoB.getDate()); + buildup.setDoB(myDoB.getDate()); buildup.insert(password); int memid = buildup.getId(); - EmailAddress ea = new EmailAddress(buildup.getEmail(), buildup); + EmailAddress ea = new EmailAddress(buildup, buildup.getEmail()); ea.insert(Page.getLanguage(req)); - PreparedStatement ps = DatabaseConnection.getInstance().prepare("insert into `alerts` set `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `alerts` SET `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?"); ps.setInt(1, memid); - ps.setString(2, general ? "1" : "0"); - ps.setString(3, country ? "1" : "0"); - ps.setString(4, regional ? "1" : "0"); - ps.setString(5, radius ? "1" : "0"); + ps.setBoolean(2, general); + ps.setBoolean(3, country); + ps.setBoolean(4, regional); + ps.setBoolean(5, radius); ps.execute(); - Notary.writeUserAgreement(memid, "CCA", "account creation", "", true, 0); + Notary.writeUserAgreement(buildup, "CCA", "account creation", "", true, 0); DatabaseConnection.getInstance().commitTransaction(); } finally {