complete reset async billing and upstream key rotation
This commit is contained in:
1 parent
b54b6a8ac4
commit
a80896e3c7
19 files changed
+531
-50
No files matched your search
+41
-3
@@ -29,7 +29,9 @@ public class VerificationService {
|
||||
if(account.length()>254 || (!account.matches("^[^\\s@,;<>]+@[^\\s@,;<>]+\\.[^\\s@,;<>]+$") && !account.matches("^(?:\\+86)?1[3-9][0-9]{9}$"))) throw new ApiException("INVALID_ACCOUNT","请输入有效邮箱或中国大陆手机号");
|
||||
return account;
|
||||
}
|
||||
private String digest(String account,String code) { return AuthService.hashSecret(pepper+":registration:"+account+":"+code); }
|
||||
private String digest(String purpose,String account,String code) { return AuthService.hashSecret(pepper+":"+purpose+":"+account+":"+code); }
|
||||
private String registrationDigest(String account,String code) { return digest("registration",account,code); }
|
||||
private String resetDigest(String account,String code) { return digest("password-reset",account,code); }
|
||||
|
||||
@Transactional(noRollbackFor=ApiException.class)
|
||||
public Map<String,Object> send(String raw,String invitation,String ip) {
|
||||
@@ -47,7 +49,7 @@ public class VerificationService {
|
||||
if(limited>0 || daily>=10 || hourly>=30 || total>=1000) throw new ApiException("VERIFICATION_RATE_LIMIT","发送过于频繁,请稍后重试",429);
|
||||
String code=String.format(Locale.ROOT,"%06d",random.nextInt(1000000));
|
||||
jdbc.update("INSERT INTO verification_send_events(id,account,ip_address) VALUES (?,?,?)",UUID.randomUUID(),account,source);
|
||||
jdbc.update("INSERT INTO registration_codes(account,code_hash,expires_at) VALUES (?,?,now()+interval '5 minutes') ON CONFLICT(account) DO UPDATE SET code_hash=excluded.code_hash, expires_at=excluded.expires_at, attempts=0, consumed=false, created_at=now()",account,digest(account,code));
|
||||
jdbc.update("INSERT INTO registration_codes(account,code_hash,expires_at) VALUES (?,?,now()+interval '5 minutes') ON CONFLICT(account) DO UPDATE SET code_hash=excluded.code_hash, expires_at=excluded.expires_at, attempts=0, consumed=false, created_at=now()",account,registrationDigest(account,code));
|
||||
try { sender.send(channel,account,code); }
|
||||
catch(ApiException exception) { jdbc.update("UPDATE registration_codes SET consumed=true WHERE account=?",account); throw exception; }
|
||||
jdbc.update("DELETE FROM verification_send_events WHERE created_at<now()-interval '2 days'");
|
||||
@@ -63,7 +65,43 @@ public class VerificationService {
|
||||
java.time.Instant expiry=((java.sql.Timestamp)row.get("expires_at")).toInstant();
|
||||
if(Boolean.TRUE.equals(row.get("consumed")) || expiry.isBefore(java.time.Instant.now()) || ((Number)row.get("attempts")).intValue()>=5) throw new ApiException("VERIFICATION_EXPIRED","验证码已失效,请重新获取");
|
||||
jdbc.update("UPDATE registration_codes SET attempts=attempts+1 WHERE account=?",account);
|
||||
if(code==null || !code.matches("[0-9]{6}") || !MessageDigest.isEqual(String.valueOf(row.get("code_hash")).getBytes(StandardCharsets.UTF_8),digest(account,code).getBytes(StandardCharsets.UTF_8))) throw new ApiException("VERIFICATION_INVALID","验证码错误");
|
||||
if(code==null || !code.matches("[0-9]{6}") || !MessageDigest.isEqual(String.valueOf(row.get("code_hash")).getBytes(StandardCharsets.UTF_8),registrationDigest(account,code).getBytes(StandardCharsets.UTF_8))) throw new ApiException("VERIFICATION_INVALID","验证码错误");
|
||||
jdbc.update("UPDATE registration_codes SET consumed=true WHERE account=?",account);
|
||||
}
|
||||
|
||||
@Transactional(noRollbackFor=ApiException.class)
|
||||
public Map<String,Object> sendReset(String raw,String ip) {
|
||||
String account=normalize(raw), channel=account.contains("@")?"email":"phone";
|
||||
if(!sender.available(channel)) throw new ApiException("VERIFICATION_UNAVAILABLE","该验证码发送服务尚未配置,请联系管理员",503);
|
||||
Integer exists=jdbc.queryForObject("SELECT count(*) FROM users WHERE account=? AND status='active'",Integer.class,account);
|
||||
// Do not reveal whether an account exists. The client receives the same response either way.
|
||||
if(exists==null || exists==0) return Map.of("sent",true,"retryAfterSeconds",60,"expiresInSeconds",300);
|
||||
String source=ip==null?"unknown":ip;
|
||||
jdbc.queryForList("SELECT pg_advisory_xact_lock(734092615)");
|
||||
Integer limited=jdbc.queryForObject("SELECT count(*) FROM verification_send_events WHERE account=? AND created_at>now()-interval '60 seconds'",Integer.class,account);
|
||||
Integer daily=jdbc.queryForObject("SELECT count(*) FROM verification_send_events WHERE account=? AND created_at>now()-interval '24 hours'",Integer.class,account);
|
||||
Integer hourly=jdbc.queryForObject("SELECT count(*) FROM verification_send_events WHERE ip_address=? AND created_at>now()-interval '1 hour'",Integer.class,source);
|
||||
Integer total=jdbc.queryForObject("SELECT count(*) FROM verification_send_events WHERE created_at>now()-interval '24 hours'",Integer.class);
|
||||
if(limited>0 || daily>=10 || hourly>=30 || total>=1000) throw new ApiException("VERIFICATION_RATE_LIMIT","发送过于频繁,请稍后重试",429);
|
||||
String code=String.format(Locale.ROOT,"%06d",random.nextInt(1000000));
|
||||
jdbc.update("INSERT INTO verification_send_events(id,account,ip_address) VALUES (?,?,?)",UUID.randomUUID(),account,source);
|
||||
jdbc.update("INSERT INTO password_reset_codes(account,code_hash,expires_at) VALUES (?,?,now()+interval '5 minutes') ON CONFLICT(account) DO UPDATE SET code_hash=excluded.code_hash, expires_at=excluded.expires_at, attempts=0, consumed=false, created_at=now()",account,resetDigest(account,code));
|
||||
try { sender.send(channel,account,code); }
|
||||
catch(ApiException exception) { jdbc.update("UPDATE password_reset_codes SET consumed=true WHERE account=?",account); throw exception; }
|
||||
return Map.of("sent",true,"retryAfterSeconds",60,"expiresInSeconds",300);
|
||||
}
|
||||
|
||||
@Transactional(noRollbackFor=ApiException.class)
|
||||
public String consumeReset(String raw,String code) {
|
||||
String account=normalize(raw);
|
||||
var rows=jdbc.queryForList("SELECT * FROM password_reset_codes WHERE account=? FOR UPDATE",account);
|
||||
if(rows.isEmpty()) throw new ApiException("VERIFICATION_INVALID","请先获取验证码");
|
||||
var row=rows.getFirst();
|
||||
java.time.Instant expiry=((java.sql.Timestamp)row.get("expires_at")).toInstant();
|
||||
if(Boolean.TRUE.equals(row.get("consumed")) || expiry.isBefore(java.time.Instant.now()) || ((Number)row.get("attempts")).intValue()>=5) throw new ApiException("VERIFICATION_EXPIRED","验证码已失效,请重新获取");
|
||||
jdbc.update("UPDATE password_reset_codes SET attempts=attempts+1 WHERE account=?",account);
|
||||
if(code==null || !code.matches("[0-9]{6}") || !MessageDigest.isEqual(String.valueOf(row.get("code_hash")).getBytes(StandardCharsets.UTF_8),resetDigest(account,code).getBytes(StandardCharsets.UTF_8))) throw new ApiException("VERIFICATION_INVALID","验证码错误");
|
||||
jdbc.update("UPDATE password_reset_codes SET consumed=true WHERE account=?",account);
|
||||
return account;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user