private String email;
- private Assurance[] receivedAssurances, madeAssurances;
+ private Assurance[] receivedAssurances;
+
+ private Assurance[] madeAssurances;
private Locale locale;
- private Set<Group> groups = new HashSet<>();
+ private final Set<Group> groups = new HashSet<>();
protected User(GigiResultSet rs) {
super(rs.getInt("id"));
locale = Language.getLocaleFromString(localeStr);
}
- GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT permission FROM user_groups WHERE user=? AND deleted is NULL");
+ GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT `permission` FROM `user_groups` WHERE `user`=? AND `deleted` is NULL");
psg.setInt(1, rs.getInt("id"));
try (GigiResultSet rs2 = psg.executeQuery()) {
}
}
- public User() {}
-
- public String getFName() {
- return name.fname;
- }
-
- public String getLName() {
- return name.lname;
- }
-
- public String getMName() {
- return name.mname;
+ public User(String email, String password, Name name, Date dob, Locale locale) throws GigiApiException {
+ this.email = email;
+ this.dob = dob;
+ this.name = name;
+ this.locale = locale;
+ GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("INSERT INTO `users` SET `email`=?, `password`=?, " + "`fname`=?, `mname`=?, `lname`=?, " + "`suffix`=?, `dob`=?, `language`=?, id=?");
+ query.setString(1, email);
+ query.setString(2, PasswordHash.hash(password));
+ query.setString(3, name.getFname());
+ query.setString(4, name.getMname());
+ query.setString(5, name.getLname());
+ query.setString(6, name.getSuffix());
+ query.setDate(7, dob);
+ query.setString(8, locale.toString());
+ query.setInt(9, getId());
+ query.execute();
+ new EmailAddress(this, email, locale);
}
public Name getName() {
return name;
}
- public void setMName(String mname) {
- this.name.mname = mname;
- }
-
- public String getSuffix() {
- return name.suffix;
- }
-
- public void setSuffix(String suffix) {
- this.name.suffix = suffix;
- }
-
public Date getDoB() {
return dob;
}
this.email = email;
}
- public void setFName(String fname) {
- this.name.fname = fname;
- }
-
- public void setLName(String lname) {
- this.name.lname = lname;
- }
-
- public void insert(String password) {
- int id = super.insert();
- GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("insert into `users` set `email`=?, `password`=?, " + "`fname`=?, `mname`=?, `lname`=?, " + "`suffix`=?, `dob`=?, `language`=?, id=?");
- query.setString(1, email);
- query.setString(2, PasswordHash.hash(password));
- query.setString(3, name.fname);
- query.setString(4, name.mname);
- query.setString(5, name.lname);
- query.setString(6, name.suffix);
- query.setDate(7, new java.sql.Date(dob.getTime()));
- query.setString(8, locale.toString());
- query.setInt(9, id);
- query.execute();
- }
-
public void changePassword(String oldPass, String newPass) throws GigiApiException {
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM users WHERE id=?");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `password` FROM `users` WHERE `id`=?");
ps.setInt(1, getId());
try (GigiResultSet rs = ps.executeQuery()) {
if ( !rs.next()) {
}
}
- PasswordStrengthChecker.assertStrongPassword(newPass, this);
+ PasswordStrengthChecker.assertStrongPassword(newPass, getName(), getEmail());
ps = DatabaseConnection.getInstance().prepare("UPDATE users SET `password`=? WHERE id=?");
ps.setString(1, PasswordHash.hash(newPass));
ps.setInt(2, getId());
}
public void updateDefaultEmail(EmailAddress newMail) throws GigiApiException {
- EmailAddress[] adrs = getEmails();
- for (int i = 0; i < adrs.length; i++) {
- if (adrs[i].getAddress().equals(newMail.getAddress())) {
- if ( !adrs[i].isVerified()) {
+ for (EmailAddress email : getEmails()) {
+ if (email.getAddress().equals(newMail.getAddress())) {
+ if ( !email.isVerified()) {
throw new GigiApiException("Email not verified.");
}
+
GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE users SET email=? WHERE id=?");
ps.setString(1, newMail.getAddress());
ps.setInt(2, getId());
ps.execute();
- email = newMail.getAddress();
+
+ this.email = newMail.getAddress();
return;
}
}
+
throw new GigiApiException("Given address not an address of the user.");
}
- public void deleteEmail(EmailAddress mail) throws GigiApiException {
- if (getEmail().equals(mail.getAddress())) {
+ public void deleteEmail(EmailAddress delMail) throws GigiApiException {
+ if (getEmail().equals(delMail.getAddress())) {
throw new GigiApiException("Can't delete user's default e-mail.");
}
- EmailAddress[] emails = getEmails();
- for (int i = 0; i < emails.length; i++) {
- if (emails[i].getId() == mail.getId()) {
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE emails SET deleted=? WHERE id=?");
- ps.setDate(1, new Date(System.currentTimeMillis()));
- ps.setInt(2, mail.getId());
+
+ for (EmailAddress email : getEmails()) {
+ if (email.getId() == delMail.getId()) {
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `emails` SET `deleted`=CURRENT_TIMESTAMP WHERE `id`=?");
+ ps.setInt(1, delMail.getId());
ps.execute();
return;
}
public synchronized Assurance[] getReceivedAssurances() {
if (receivedAssurances == null) {
- GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `to`=? AND deleted IS NULL");
+ GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM `notary` WHERE `to`=? AND `deleted` IS NULL");
query.setInt(1, getId());
try (GigiResultSet res = query.executeQuery()) {
return receivedAssurances;
}
- public Assurance[] getMadeAssurances() {
+ public synchronized Assurance[] getMadeAssurances() {
if (madeAssurances == null) {
GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT * FROM notary WHERE `from`=? AND deleted is NULL");
query.setInt(1, getId());
return madeAssurances;
}
- public void invalidateMadeAssurances() {
+ public synchronized void invalidateMadeAssurances() {
madeAssurances = null;
}
- public void invalidateReceivedAssurances() {
+ public synchronized void invalidateReceivedAssurances() {
receivedAssurances = null;
}
if (getAssurancePoints() != 0) {
throw new GigiApiException("No change after assurance allowed.");
}
-
- GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?");
- update.setString(1, getFName());
- update.setString(2, getLName());
- update.setString(3, getMName());
- update.setString(4, getSuffix());
- update.setDate(5, getDoB());
- update.setInt(6, getId());
- update.executeUpdate();
+ rawUpdateUserData();
}
}
+ protected void rawUpdateUserData() {
+ GigiPreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?");
+ update.setString(1, name.getFname());
+ update.setString(2, name.getLname());
+ update.setString(3, name.getMname());
+ update.setString(4, name.getSuffix());
+ update.setDate(5, getDoB());
+ update.setInt(6, getId());
+ update.executeUpdate();
+ }
+
public Locale getPreferredLocale() {
return locale;
}
public void grantGroup(User granter, Group toGrant) {
groups.add(toGrant);
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO user_groups SET user=?, permission=?, grantedby=?");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?");
ps.setInt(1, getId());
ps.setString(2, toGrant.getDatabaseName());
ps.setInt(3, granter.getId());
public void revokeGroup(User revoker, Group toRevoke) {
groups.remove(toRevoke);
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE user_groups SET deleted=CURRENT_TIMESTAMP, revokedby=? WHERE deleted is NULL AND permission=? AND user=?");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `user_groups` SET `deleted`=CURRENT_TIMESTAMP, `revokedby`=? WHERE `deleted` IS NULL AND `permission`=?::`userGroup` AND `user`=?");
ps.setInt(1, revoker.getId());
ps.setString(2, toRevoke.getDatabaseName());
ps.setInt(3, getId());
public List<Organisation> getOrganisations() {
List<Organisation> orgas = new ArrayList<>();
- GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT orgid FROM org_admin WHERE `memid`=? AND deleted is NULL");
+ GigiPreparedStatement query = DatabaseConnection.getInstance().prepare("SELECT `orgid` FROM `org_admin` WHERE `memid`=? AND `deleted` IS NULL");
query.setInt(1, getId());
try (GigiResultSet res = query.executeQuery()) {
while (res.next()) {
}
public static User getByEmail(String mail) {
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT users.id FROM users INNER JOIN certOwners ON certOwners.id = users.id WHERE email=? AND deleted IS NULL");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `users`.`id` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id` = `users`.`id` WHERE `email`=? AND `deleted` IS NULL");
ps.setString(1, mail);
try (GigiResultSet rs = ps.executeQuery()) {
if ( !rs.next()) {
public static User[] findByEmail(String mail) {
LinkedList<User> results = new LinkedList<User>();
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT users.id FROM users INNER JOIN certOwners ON certOwners.id = users.id WHERE users.email LIKE ? AND deleted IS NULL GROUP BY users.id ASC LIMIT 100");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `users`.`id` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id` = `users`.`id` WHERE `users`.`email` LIKE ? AND `deleted` IS NULL GROUP BY `users`.`id` LIMIT 100");
ps.setString(1, mail);
try (GigiResultSet rs = ps.executeQuery()) {
while (rs.next()) {
}
}
- public boolean canIssue(CertificateProfile p) {
- switch (p.getCAId()) {
- case 0:
- return true;
- case 1:
- return getAssurancePoints() > 50;
- case 2:
- return getAssurancePoints() > 50 && isInGroup(Group.getByString("codesigning"));
- case 3:
- case 4:
- return getOrganisations().size() > 0;
- default:
- return false;
+ public EmailAddress[] getEmails() {
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `emails` WHERE `memid`=? AND `deleted` IS NULL");
+ ps.setInt(1, getId());
+
+ try (GigiResultSet rs = ps.executeQuery()) {
+ LinkedList<EmailAddress> data = new LinkedList<EmailAddress>();
+
+ while (rs.next()) {
+ data.add(EmailAddress.getById(rs.getInt(1)));
+ }
+
+ return data.toArray(new EmailAddress[0]);
}
}
+ @Override
+ public boolean isValidEmail(String email) {
+ for (EmailAddress em : getEmails()) {
+ if (em.getAddress().equals(email)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
}
projects / gigi.git / blobdiff