import java.io.IOException;
import java.io.PrintWriter;
-import java.sql.Date;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
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;
public class Signup extends Form {
- private User buildup = new User();
+ Name buildupName = new Name("", "", "", "");
+
+ String email = "";
private Template t;
public Signup(HttpServletRequest hsr) {
super(hsr);
t = new Template(Signup.class.getResource("Signup.templ"));
- buildup.setFname("");
- buildup.setMname("");
- buildup.setLname("");
- buildup.setSuffix("");
- buildup.setEmail("");
- buildup.setDob(new Date(0));
}
DateSelector myDoB = new DateSelector("day", "month", "year");
@Override
public void outputContent(PrintWriter out, Language l, Map<String, Object> outerVars) {
HashMap<String, Object> vars = new HashMap<String, Object>();
- 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()));
+ 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("email", HTMLEncoder.encodeHTML(email));
vars.put("general", general ? " checked=\"checked\"" : "");
vars.put("country", country ? " checked=\"checked\"" : "");
vars.put("regional", regional ? " checked=\"checked\"" : "");
}
private void update(HttpServletRequest r) {
+ String fname = buildupName.getFname();
+ String lname = buildupName.getLname();
+ String mname = buildupName.getMname();
+ String suffix = buildupName.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"));
+ email = r.getParameter("email");
}
+ buildupName = new Name(fname, lname, mname, suffix);
general = "1".equals(r.getParameter("general"));
country = "1".equals(r.getParameter("country"));
regional = "1".equals(r.getParameter("regional"));
@Override
public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
update(req);
- if (buildup.getLname().trim().equals("")) {
+ if (buildupName.getLname().trim().equals("")) {
outputError(out, req, "Last name were blank.");
}
if ( !myDoB.isValid()) {
if ( !"1".equals(req.getParameter("cca_agree"))) {
outputError(out, req, "You have to agree to the CAcert Community agreement.");
}
- if (buildup.getEmail().equals("")) {
+ if (email.equals("")) {
outputError(out, req, "Email Address was blank");
}
String pw1 = req.getParameter("pword1");
} else if ( !pw1.equals(pw2)) {
outputError(out, req, "Pass Phrases don't match");
}
- int pwpoints = PasswordStrengthChecker.checkpw(pw1, buildup);
+ int pwpoints = PasswordStrengthChecker.checkpw(pw1, buildupName, email);
if (pwpoints < 3) {
outputError(out, req, "The Pass Phrase you submitted failed to contain enough" + " differing characters and/or contained words from" + " your name and/or email address.");
}
if (isFailed(out)) {
return false;
}
- 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();
+ try (GigiPreparedStatement q1 = new GigiPreparedStatement("SELECT * FROM `emails` WHERE `email`=? AND `deleted` IS NULL"); GigiPreparedStatement q2 = new GigiPreparedStatement("SELECT * FROM `certOwners` INNER JOIN `users` ON `users`.`id`=`certOwners`.`id` WHERE `email`=? AND `deleted` IS NULL")) {
+ q1.setString(1, email);
+ q2.setString(1, email);
+ 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.");
+ }
+ }
+ try (GigiPreparedStatement q3 = new GigiPreparedStatement("SELECT `domain` FROM `baddomains` WHERE `domain`=RIGHT(?, LENGTH(`domain`))")) {
+ q3.setString(1, email);
+
+ 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);
+ }
+ }
String mailResult = EmailProvider.FAIL;
try {
- mailResult = EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail());
+ mailResult = HTMLEncoder.encodeHTML(EmailProvider.getInstance().checkEmailServer(0, email));
} catch (IOException e) {
}
if ( !mailResult.equals(EmailProvider.OK)) {
private void run(HttpServletRequest req, String password) throws SQLException, GigiApiException {
try {
DatabaseConnection.getInstance().beginTransaction();
- buildup.setPreferredLocale(Page.getLanguage(req).getLocale());
- buildup.setDob(myDoB.getDate());
- buildup.insert(password);
- int memid = buildup.getId();
- EmailAddress ea = new EmailAddress(buildup, buildup.getEmail());
- ea.insert(Page.getLanguage(req));
-
- 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.execute();
- Notary.writeUserAgreement(buildup, "CCA", "account creation", "", true, 0);
+ User u = new User(email, password, buildupName, myDoB.getDate(), Page.getLanguage(req).getLocale());
+
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `alerts` SET `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?")) {
+ ps.setInt(1, u.getId());
+ ps.setBoolean(2, general);
+ ps.setBoolean(3, country);
+ ps.setBoolean(4, regional);
+ ps.setBoolean(5, radius);
+ ps.execute();
+ }
+ Notary.writeUserAgreement(u, "CCA", "account creation", "", true, 0);
DatabaseConnection.getInstance().commitTransaction();
} finally {
projects / gigi.git / blobdiff