try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `password`, `id` FROM `users` WHERE `email`=? AND verified='1'")) {
ps.setString(1, un);
GigiResultSet rs = ps.executeQuery();
- if (rs.next()) {
- String dbHash = rs.getString(1);
- String hash = PasswordHash.verifyHash(pw, dbHash);
- if (hash != null) {
- if ( !hash.equals(dbHash)) {
- try (GigiPreparedStatement gps = new GigiPreparedStatement("UPDATE `users` SET `password`=? WHERE `email`=?")) {
- gps.setString(1, hash);
- gps.setString(2, un);
- gps.executeUpdate();
- }
+ if ( !rs.next()) {
+ throw new GigiApiException("Username and password didn't match.");
+ }
+
+ User user = User.getById(rs.getInt(2));
+ if (user == null) {
+ throw new GigiApiException("Username and password didn't match.");
+ }
+
+ String dbHash = rs.getString(1);
+ String hash = PasswordHash.verifyHash(pw, dbHash);
+ if (hash != null) {
+ if ( !hash.equals(dbHash)) {
+ try (GigiPreparedStatement gps = new GigiPreparedStatement("UPDATE `users` SET `password`=? WHERE `email`=?")) {
+ gps.setString(1, hash);
+ gps.setString(2, un);
+ gps.executeUpdate();
}
- loginSession(req, User.getById(rs.getInt(2)));
- req.getSession().setAttribute(LOGIN_METHOD, new TranslateCommand("Password"));
- return;
}
+
+ loginSession(req, user);
+ req.getSession().setAttribute(LOGIN_METHOD, new TranslateCommand("Password"));
+ return;
}
}
- throw new GigiApiException("Username and password didn't match.");
}
public static User getUser(HttpServletRequest req) {
private static final long serialVersionUID = -2596733469159940154L;
- private CertificateOwner target;
+ private final CertificateOwner target;
- private User actor;
+ private final User actor;
- private String supporterTicketId;
+ private final String supporterTicketId;
public AuthorizationContext(CertificateOwner target, User actor) {
+ if (actor == null) {
+ throw new Error("Internal Error: The actor of an AuthorizationContext must not be null!");
+ }
+ if (target == null) {
+ throw new Error("Internal Error: The target of an AuthorizationContext must not be null!");
+ }
this.target = target;
this.actor = actor;
+ this.supporterTicketId = null;
}
public AuthorizationContext(User actor, String supporterTicket) throws GigiApiException {
+ if (actor == null) {
+ throw new Error("Internal Error: The actor of an AuthorizationContext must not be null!");
+ }
+ if (supporterTicket == null) {
+ throw new Error("Internal Error: The AuthorizationContext for a Support Engineer requires a valid ticket!");
+ }
this.target = actor;
this.actor = actor;
if ( !isInGroup(Group.SUPPORTER)) {
throw new GigiApiException("requires a supporter");
}
- supporterTicketId = supporterTicket;
+ this.supporterTicketId = supporterTicket;
}
public CertificateOwner getTarget() {
return actor.isInGroup(g);
}
- public User getActor(AuthorizationContext ac) {
+ public static User getActor(AuthorizationContext ac) {
if (ac == null) {
return null;
}