From 02c21e5c1980b9484dbf3a9b2ba9ba432699f1a2 Mon Sep 17 00:00:00 2001 From: xpp Date: Wed, 21 Oct 2026 23:09:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:"=E4=BF=9D=E8=AF=81=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E6=B6=88=E8=B4=B9=E4=B8=8E=E8=B4=A6=E5=8F=B7=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=8E=9F=E5=AD=90=E6=8F=90=E4=BA=A4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../controlplane/auth/AuthController.java | 15 +- .../auth/VerifiedAccountService.java | 60 +++++ .../PlatformAdminPostgresTest.java | 3 +- .../controlplane/auth/AuthPostgresTest.java | 4 +- .../auth/AuthSecurityPostgresTest.java | 4 +- .../auth/VerifiedAccountPostgresTest.java | 227 ++++++++++++++++++ docs/24-security-and-cpr-task-tracker.md | 7 +- docs/27-verified-account-transactions.md | 37 +++ 9 files changed, 345 insertions(+), 14 deletions(-) create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/auth/VerifiedAccountService.java create mode 100644 control-plane-java/src/test/java/com/moyi/controlplane/auth/VerifiedAccountPostgresTest.java create mode 100644 docs/27-verified-account-transactions.md diff --git a/README.md b/README.md index 713572b..89d9285 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ 2026-10-21:当前产品为 Java/Vue 自研控制面与多模型网关,已补请求模块化、账务恢复、异步幂等和审计核账,并继续加固认证与 HTTP 边界。本轮补齐了服务端参考图下载的 DNS 地址绑定与直连隔离;生产网络策略仍需验收。下文包含产品演进目标,不等于功能均已实现。**尚未完成完整 Codex WebSocket/续接、长请求续租、公平排队、账号全生命周期和生产安全验收。** -逐项完成状态与剩余验收见 [安全与 CPR 任务追踪](docs/24-security-and-cpr-task-tracker.md),认证边界见 [认证及有界 HTTP 增量](docs/25-auth-and-bounded-transport.md),最新出站加固与验收阻塞见 [媒体 DNS 绑定与验收状态](docs/26-media-dns-binding-and-acceptance.md)。本地验证通过不代表已部署或全仓库安全审计完成。 +逐项完成状态与剩余验收见 [安全与 CPR 任务追踪](docs/24-security-and-cpr-task-tracker.md),认证边界见 [认证及有界 HTTP 增量](docs/25-auth-and-bounded-transport.md),出站加固与验收阻塞见 [媒体 DNS 绑定与验收状态](docs/26-media-dns-binding-and-acceptance.md),注册/重置原子性见 [验证码与账号事务](docs/27-verified-account-transactions.md)。本地验证通过不代表已部署或全仓库安全审计完成。 ## 一、产品简介 diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java index 6fbaf76..e27582a 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java @@ -28,17 +28,20 @@ public class AuthController { private static final String SESSION_COOKIE = "moyi_session"; private final AuthService authService; private final VerificationService verification; + private final VerifiedAccountService verifiedAccounts; private final int sessionTtlHours; private final boolean secureCookie; public AuthController( AuthService authService, VerificationService verification, + VerifiedAccountService verifiedAccounts, @Value("${moyi.auth.session-ttl-hours}") int sessionTtlHours, @Value("${moyi.auth.secure-cookie}") boolean secureCookie ) { this.authService = authService; this.verification = verification; + this.verifiedAccounts = verifiedAccounts; this.sessionTtlHours = sessionTtlHours; this.secureCookie = secureCookie; } @@ -67,10 +70,8 @@ public class AuthController { @PostMapping("/auth/password-reset") public ResponseEntity resetPassword(@RequestBody PasswordResetRequest input,HttpServletRequest request) { - PasswordPolicy.validate(input.newPassword()); - String account = verification.consumeReset(input.account(), input.verificationCode()); - authService.resetPassword(account, input.newPassword(), meta(request)); - return ResponseEntity.noContent().build(); + verifiedAccounts.resetPassword(input.account(), input.verificationCode(), input.newPassword(), meta(request)); + return ResponseEntity.noContent().header(HttpHeaders.SET_COOKIE, sessionCookie("", Duration.ZERO).toString()).build(); } public record InvitationRequest(String label, Integer maxUses, OffsetDateTime expiresAt) {} @@ -103,10 +104,8 @@ public class AuthController { HttpServletRequest request, HttpServletResponse response ) { - PasswordPolicy.validate(input.password()); - verification.consume(input.account(),input.verificationCode()); - AuthService.AuthResult result = authService.register( - input.invitationCode(), input.account(), input.password(), input.displayName(), meta(request) + AuthService.AuthResult result = verifiedAccounts.register( + input.invitationCode(), input.account(), input.password(), input.displayName(), input.verificationCode(), meta(request) ); response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), null).toString()); return ResponseEntity.status(HttpStatus.CREATED).body(Map.of("user", result.user())); diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/VerifiedAccountService.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/VerifiedAccountService.java new file mode 100644 index 0000000..72e982b --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/VerifiedAccountService.java @@ -0,0 +1,60 @@ +package com.moyi.controlplane.auth; + +import com.moyi.controlplane.common.ApiException; +import java.util.function.Function; +import java.util.function.Supplier; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.support.TransactionTemplate; + +/** Public registration/recovery transaction boundary. Never call these flows inside a business transaction. */ +@Service +public class VerifiedAccountService { + private final AuthService auth; + private final VerificationService verification; + private final TransactionTemplate transactions; + + public VerifiedAccountService(AuthService auth, VerificationService verification, PlatformTransactionManager manager) { + this.auth = auth; + this.verification = verification; + transactions = new TransactionTemplate(manager); + // Own the public operation; a caller rollback cannot erase committed incorrect-code counters. + transactions.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); + } + + public AuthService.AuthResult register(String invitation, String account, String password, String displayName, + String code, AuthService.RequestMeta meta) { + PasswordPolicy.validate(password); + return complete(() -> { verification.consume(account, code); return account; }, + verified -> auth.register(invitation, verified, password, displayName, meta)); + } + + public void resetPassword(String account, String code, String password, AuthService.RequestMeta meta) { + PasswordPolicy.validate(password); + complete(() -> verification.consumeReset(account, code), verified -> { + auth.resetPassword(verified, password, meta); + return Boolean.TRUE; + }); + } + + private record Completion(T result, ApiException rejectedCode) {} + + private T complete(Supplier consume, Function changeAccount) { + Completion outcome = transactions.execute(status -> { + String account; + try { account = consume.get(); } + catch (ApiException rejected) { + // VerificationService intentionally commits wrong-code attempts. Return the rejection, + // then throw AFTER commit. No account mutation has run at this point. + return new Completion(null, rejected); + } + // Do not catch business/audit/storage failures here: roll back successful code consumption, + // invitation redemption, password/session changes and audit as one operation. + return new Completion<>(changeAccount.apply(account), null); + }); + if (outcome == null) throw new IllegalStateException("Verified account transaction returned no outcome"); + if (outcome.rejectedCode() != null) throw outcome.rejectedCode(); + return outcome.result(); + } +} diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java index e585c85..c177a62 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java @@ -323,7 +323,8 @@ class PlatformAdminPostgresTest { } @Test void directCreationCannotEscalateAndOtpIsRequiredOnBothChannels() throws Exception { - MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth,verification,168,false)).setControllerAdvice(new ApiExceptionHandler()).build(); + var verifiedAccounts = new VerifiedAccountService(auth, verification, context.getBean(DataSourceTransactionManager.class)); + MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth,verification,verifiedAccounts,168,false)).setControllerAdvice(new ApiExceptionHandler()).build(); http.perform(post("/api/admin/users").cookie(new Cookie("moyi_session",ownerToken)).contentType("application/json").content("{\"account\":\"created_user\",\"password\":\"test-password\",\"role\":\"super_admin\"}")) .andExpect(status().isCreated()).andExpect(jsonPath("$.user.role").value("user")).andExpect(jsonPath("$.user.password").doesNotExist()); http.perform(post("/api/admin/users").cookie(new Cookie("moyi_session",memberToken)).contentType("application/json").content("{\"account\":\"bad_user\",\"password\":\"test-password\"}")) diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java index 16a1e4c..b777d6d 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java @@ -65,7 +65,9 @@ class AuthPostgresTest { assertThrows(DataIntegrityViolationException.class, () -> jdbc.update("UPDATE users SET role = 'super_admin' WHERE id = ?", operatorId)); assertThrows(IllegalStateException.class, () -> auth.ensureAdmin("operator", "test-password", "Other")); - MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth, org.mockito.Mockito.mock(VerificationService.class), 168, true)) + var verification = org.mockito.Mockito.mock(VerificationService.class); + var verifiedAccounts = new VerifiedAccountService(auth, verification, context.getBean(DataSourceTransactionManager.class)); + MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth, verification, verifiedAccounts, 168, true)) .setControllerAdvice(new ApiExceptionHandler()).build(); var ownerCookie = login(http, "adimin", "super_admin"); var operatorCookie = login(http, "operator", "admin"); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthSecurityPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthSecurityPostgresTest.java index e689b43..3af3a10 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthSecurityPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthSecurityPostgresTest.java @@ -60,7 +60,9 @@ class AuthSecurityPostgresTest { context.registerBean(AuthService.class, () -> new AuthService(jdbc, hasher, json, 168)); context.registerBean(TotpService.class, () -> new TotpService(jdbc, new SecretCipher("isolated-mfa-key"))); context.refresh(); auth = context.getBean(AuthService.class); - http = MockMvcBuilders.standaloneSetup(new AuthController(auth, mock(VerificationService.class), 168, true)).setControllerAdvice(new ApiExceptionHandler()).build(); + var verification = mock(VerificationService.class); + var verifiedAccounts = new VerifiedAccountService(auth, verification, context.getBean(DataSourceTransactionManager.class)); + http = MockMvcBuilders.standaloneSetup(new AuthController(auth, verification, verifiedAccounts, 168, true)).setControllerAdvice(new ApiExceptionHandler()).build(); } @AfterEach void cleanup() { diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/auth/VerifiedAccountPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/auth/VerifiedAccountPostgresTest.java new file mode 100644 index 0000000..2061f22 --- /dev/null +++ b/control-plane-java/src/test/java/com/moyi/controlplane/auth/VerifiedAccountPostgresTest.java @@ -0,0 +1,227 @@ +package com.moyi.controlplane.auth; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.moyi.controlplane.common.ApiException; +import com.moyi.controlplane.common.ApiExceptionHandler; +import com.moyi.controlplane.security.SecretCipher; +import jakarta.servlet.http.Cookie; +import java.util.ArrayList; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import javax.sql.DataSource; +import org.flywaydb.core.Flyway; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Configuration; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.transaction.support.TransactionTemplate; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@EnabledIfEnvironmentVariable(named="MOYI_AUTH_TEST_JDBC_URL", matches="jdbc:postgresql://127[.]0[.]0[.]1:[0-9]+/.+") +class VerifiedAccountPostgresTest { + @Configuration @EnableTransactionManagement(proxyTargetClass=true) static class Transactions {} + private static final String ACCOUNT = "verified@example.test", CODE = "123456", PASSWORD = "synthetic-original-password"; + private final UUID invitationCreator = UUID.randomUUID(); + private final AuthService.RequestMeta meta = new AuthService.RequestMeta("127.0.0.1", "isolated-verified-workflow"); + private final ObjectMapper json = new ObjectMapper().findAndRegisterModules(); + private DriverManagerDataSource base; + private String schema; + private JdbcTemplate jdbc; + private AnnotationConfigApplicationContext context; + private AuthService auth; + private VerifiedAccountService verified; + private VerificationService verification; + private PasswordHasher hasher; + private MockMvc http; + + @BeforeEach void setup() { + String url = System.getenv("MOYI_AUTH_TEST_JDBC_URL"); + schema = "verified_account_" + UUID.randomUUID().toString().replace("-", ""); + base = new DriverManagerDataSource(url, "moyi_role_test", ""); + var source = new DriverManagerDataSource(url + "?currentSchema=" + schema, "moyi_role_test", ""); + Flyway.configure().dataSource(base).schemas(schema).defaultSchema(schema).load().migrate(); + jdbc = new JdbcTemplate(source); hasher = new PasswordHasher("isolated-verified-pepper"); + jdbc.update("INSERT INTO users(id,account,account_kind,password_hash,display_name,role) VALUES (?,'invitation_creator','username','not-a-login-hash','Synthetic Creator','admin')", invitationCreator); + context = new AnnotationConfigApplicationContext(); context.register(Transactions.class); + context.registerBean(DataSource.class, () -> source); + context.registerBean(DataSourceTransactionManager.class, () -> new DataSourceTransactionManager(source)); + context.registerBean(AuthService.class, () -> new AuthService(jdbc, hasher, json, 168)); + context.registerBean(TotpService.class, () -> new TotpService(jdbc, new SecretCipher("isolated-totp"))); + context.registerBean(VerificationService.class, () -> new VerificationService(jdbc, mock(VerificationSender.class), "isolated-verified-pepper")); + context.registerBean(VerifiedAccountService.class); context.refresh(); + auth = context.getBean(AuthService.class); verification = context.getBean(VerificationService.class); verified = context.getBean(VerifiedAccountService.class); + http = MockMvcBuilders.standaloneSetup(new AuthController(auth, verification, verified, 168, true)) + .setControllerAdvice(new ApiExceptionHandler()).build(); + } + @AfterEach void cleanup() { + if (context != null) context.close(); + if (base != null && schema != null) new JdbcTemplate(base).execute("DROP SCHEMA " + schema + " CASCADE"); + } + private String invitation() { + String value = "synthetic-invite-" + UUID.randomUUID(); + jdbc.update("INSERT INTO invitation_codes(id,code_hash,code_prefix,label,max_uses,used_count,created_by) VALUES (?,?,?,'test',1,0,?)", UUID.randomUUID(), AuthService.hashSecret(value), "synthetic", invitationCreator); + return value; + } + private UUID user() { + UUID id = UUID.randomUUID(); + jdbc.update("INSERT INTO users(id,account,account_kind,password_hash,display_name) VALUES (?,?,'email',?,'Test')", id, ACCOUNT, hasher.hash(PASSWORD)); + return id; + } + private void code(boolean reset) { + String table = reset ? "password_reset_codes" : "registration_codes"; + String purpose = reset ? "password-reset" : "registration"; + jdbc.update("INSERT INTO " + table + "(account,code_hash,expires_at) VALUES (?,?,clock_timestamp()+interval '5 minutes')", + ACCOUNT, AuthService.hashSecret("isolated-verified-pepper:" + purpose + ":" + ACCOUNT + ":" + CODE)); + } + private void assertUnconsumed(boolean reset, int attempts) { + var row = jdbc.queryForMap("SELECT consumed,attempts FROM " + (reset ? "password_reset_codes" : "registration_codes") + " WHERE account=?", ACCOUNT); + assertEquals(false, row.get("consumed")); assertEquals(attempts, ((Number)row.get("attempts")).intValue()); + } + private void rejectAudit(String event) { + // Constraint is isolated to this random test schema; only synthetic event types are supplied. + jdbc.execute("ALTER TABLE auth_audit_log ADD CONSTRAINT injected_audit_failure CHECK (event_type <> '" + event + "') NOT VALID"); + } + + @Test void invalidInvitationKeepsTheCodeUsableForTheSameAccount() { + code(false); String invite = invitation(); + assertEquals("INVITATION_INVALID", assertThrows(ApiException.class, () -> verified.register("invalid", ACCOUNT, PASSWORD, "Test", CODE, meta)).getCode()); + assertUnconsumed(false, 0); + assertEquals(0, jdbc.queryForObject("SELECT count(*) FROM users WHERE account=?", Integer.class, ACCOUNT)); + assertEquals(0, jdbc.queryForObject("SELECT sum(used_count) FROM invitation_codes", Integer.class)); + var result = verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta); + assertEquals(ACCOUNT, result.user().account()); assertNotNull(auth.requireUser(result.token())); + assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM invitation_redemptions", Integer.class)); + assertEquals("VERIFICATION_EXPIRED", assertThrows(ApiException.class, () -> verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta)).getCode()); + } + + @Test void invalidDisplayNameAndDuplicateAccountDoNotBurnAValidCode() { + code(false); String invite = invitation(); + assertEquals("INVALID_NAME", assertThrows(ApiException.class, () -> verified.register(invite, ACCOUNT, PASSWORD, "x".repeat(81), CODE, meta)).getCode()); + assertUnconsumed(false, 0); + user(); + assertEquals("ACCOUNT_EXISTS", assertThrows(ApiException.class, () -> verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta)).getCode()); + assertUnconsumed(false, 0); + assertEquals(0, jdbc.queryForObject("SELECT count(*) FROM invitation_redemptions", Integer.class)); + } + + @Test void registrationAuditFailureRollsBackCodeInvitationUserAndSessionTogether() { + code(false); String invite = invitation(); rejectAudit("user.registered"); + assertThrows(DataIntegrityViolationException.class, () -> verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta)); + assertUnconsumed(false, 0); + assertEquals(0, jdbc.queryForObject("SELECT count(*) FROM users WHERE account=?", Integer.class, ACCOUNT)); + for (String table : java.util.List.of("auth_sessions", "invitation_redemptions", "auth_audit_log")) { + assertEquals(0, jdbc.queryForObject("SELECT count(*) FROM " + table, Integer.class), table); + } + assertEquals(0, jdbc.queryForObject("SELECT sum(used_count) FROM invitation_codes", Integer.class)); + jdbc.execute("ALTER TABLE auth_audit_log DROP CONSTRAINT injected_audit_failure"); + assertNotNull(verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta).token()); + } + + @Test void resetAuditFailureRollsBackCodeHashAndSessionRevocations() { + UUID id = user(); code(true); + String first = auth.login(ACCOUNT, PASSWORD, meta).token(), second = auth.login(ACCOUNT, PASSWORD, meta).token(); + String original = jdbc.queryForObject("SELECT password_hash FROM users WHERE id=?", String.class, id); + rejectAudit("user.password_reset"); + assertThrows(DataIntegrityViolationException.class, () -> verified.resetPassword(ACCOUNT, CODE, "replacement-password", meta)); + assertUnconsumed(true, 0); + assertEquals(original, jdbc.queryForObject("SELECT password_hash FROM users WHERE id=?", String.class, id)); + assertNotNull(auth.requireUser(first)); assertNotNull(auth.requireUser(second)); + jdbc.execute("ALTER TABLE auth_audit_log DROP CONSTRAINT injected_audit_failure"); + verified.resetPassword(ACCOUNT, CODE, "replacement-password", meta); + assertEquals(401, assertThrows(ApiException.class, () -> auth.requireUser(first)).getStatus()); + assertEquals(401, assertThrows(ApiException.class, () -> auth.requireUser(second)).getStatus()); + assertNotNull(auth.login(ACCOUNT, "replacement-password", meta).token()); + assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM auth_audit_log WHERE event_type='user.password_reset'", Integer.class)); + } + + @ParameterizedTest @ValueSource(booleans = {false, true}) + void wrongCodeAttemptsCommitEvenWhenAnOuterCallerRollsBack(boolean reset) { + if (reset) user(); code(reset); String invite = invitation(); + var outer = new TransactionTemplate(context.getBean(DataSourceTransactionManager.class)); + outer.executeWithoutResult(status -> { + for (int i = 0; i < 5; i++) { + var failure = assertThrows(ApiException.class, () -> { + if (reset) verified.resetPassword(ACCOUNT, "000000", "replacement-password", meta); + else verified.register(invite, ACCOUNT, PASSWORD, "Test", "000000", meta); + }); + assertEquals("VERIFICATION_INVALID", failure.getCode()); + } + status.setRollbackOnly(); + }); + assertUnconsumed(reset, 5); + assertEquals("VERIFICATION_EXPIRED", assertThrows(ApiException.class, () -> { + if (reset) verified.resetPassword(ACCOUNT, CODE, "replacement-password", meta); + else verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta); + }).getCode()); + } + + @ParameterizedTest @ValueSource(booleans = {false, true}) + void weakNewPasswordsNeverConsumeCodes(boolean reset) { + code(reset); String invite = invitation(); + assertEquals("WEAK_PASSWORD", assertThrows(ApiException.class, () -> { + if (reset) verified.resetPassword(ACCOUNT, CODE, "short", meta); + else verified.register(invite, ACCOUNT, "short", "Test", CODE, meta); + }).getCode()); + assertUnconsumed(reset, 0); + } + + @Test void disabledResetAccountLeavesTheValidCodeUnconsumed() { + UUID id = user(); code(true); jdbc.update("UPDATE users SET status='disabled' WHERE id=?", id); + assertEquals("ACCOUNT_NOT_FOUND", assertThrows(ApiException.class, () -> verified.resetPassword(ACCOUNT, CODE, "replacement-password", meta)).getCode()); + assertUnconsumed(true, 0); + } + + @ParameterizedTest @ValueSource(booleans = {false, true}) + void concurrentCodeUseCompletesExactlyOneAccountOperation(boolean reset) throws Exception { + if (reset) user(); code(reset); String invite = invitation(); + var start = new CountDownLatch(1); var results = new ArrayList(); + try (var executor = Executors.newFixedThreadPool(2)) { + var futures = new ArrayList>(); + for (int i = 0; i < 2; i++) futures.add(executor.submit(() -> { + assertTrue(start.await(3, TimeUnit.SECONDS)); + try { + if (reset) verified.resetPassword(ACCOUNT, CODE, "replacement-password", meta); + else verified.register(invite, ACCOUNT, PASSWORD, "Test", CODE, meta); + return "completed"; + } catch (ApiException error) { return error.getCode(); } + })); + start.countDown(); + for (var future : futures) results.add(future.get(15, TimeUnit.SECONDS)); + } + assertEquals(1, results.stream().filter("completed"::equals).count()); + assertEquals(1, results.stream().filter("VERIFICATION_EXPIRED"::equals).count()); + assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM users WHERE account=?", Integer.class, ACCOUNT)); + assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM auth_audit_log WHERE event_type=?", Integer.class, reset ? "user.password_reset" : "user.registered")); + if (!reset) assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM invitation_redemptions", Integer.class)); + } + + @Test void publicResetClearsTheCookieAndRevokesTheServerSessionOnlyAfterSuccess() throws Exception { + user(); code(true); String token = auth.login(ACCOUNT, PASSWORD, meta).token(); + http.perform(post("/api/auth/password-reset").cookie(new Cookie("moyi_session", token)).contentType("application/json") + .content(json.writeValueAsBytes(Map.of("account", ACCOUNT, "verificationCode", "000000", "newPassword", "replacement-password")))) + .andExpect(status().isBadRequest()).andExpect(cookie().doesNotExist("moyi_session")); + assertNotNull(auth.requireUser(token)); assertUnconsumed(true, 1); + http.perform(post("/api/auth/password-reset").cookie(new Cookie("moyi_session", token)).contentType("application/json") + .content(json.writeValueAsBytes(Map.of("account", ACCOUNT, "verificationCode", CODE, "newPassword", "replacement-password")))) + .andExpect(status().isNoContent()).andExpect(cookie().maxAge("moyi_session", 0)) + .andExpect(cookie().httpOnly("moyi_session", true)).andExpect(cookie().secure("moyi_session", true)); + assertEquals(401, assertThrows(ApiException.class, () -> auth.requireUser(token)).getStatus()); + } +} diff --git a/docs/24-security-and-cpr-task-tracker.md b/docs/24-security-and-cpr-task-tracker.md index fe95dc6..0d79e17 100644 --- a/docs/24-security-and-cpr-task-tracker.md +++ b/docs/24-security-and-cpr-task-tracker.md @@ -9,6 +9,7 @@ - `5be06a9`:上游受理未知不重发不退款,持久终态日志和本地结算恢复。 - `c716ec7`:人工核账、共享任务结算、provider/model 绑定、幂等审计回执、Redis 同任务续期。221 项后端与 25 项前端测试的结果仅对应该提交,不代表整个建议清单完成。 - `d994ffb`:本轮认证修复,包含共享登录窗口、统一新密码策略、会话撤销与竞态保护、首次管理员配置检查及隔离界面回归。 +- `32f6f67`:服务端参考图 DNS 绑定与无凭据直连传输,补齐媒体本地下载边界及 109 项回归,生产网络验收仍未完成。 ## 待补任务与当前证据 @@ -20,7 +21,7 @@ | SEC-04 | 任务用户隔离与回执安全 | 已实现核心用户级查询/幂等/冻结/核账,并补跨用户读取回归;完整授权审计仍待继续 | 跨用户读取/列表不可见;核账拒绝普通用户 | | SEC-05 | Provider 有界 HTTP Transport | 部分完成:异步 JSON/multipart/音频/媒体已接有界读取和总期限;同步/SSE 生命周期尚未统一抽取 | 超大 chunk、慢响应体、已观察拒绝状态、取消、重定向及原适配器回归 | | SEC-06 | 媒体下载出站 / SSRF | 服务端参考图下载的代码级 DNS 绑定已实现并通过本地回归;生产网络隔离与实际部署验收仍未完成 | 一次解析、整组地址校验、固定地址直连、原域名 TLS/SNI、禁代理与跳转;109 项新增回归,见 26 号文档 | -| SEC-07 | 整体安全审查与生产验收 | 未完成:管理接口、注册/重置原子性、默认配置、依赖、备份恢复需继续 | 独立用例、部署与恢复演练,禁止宣称“全仓库安全” | +| SEC-07 | 整体安全审查与生产验收 | 未完成:本轮已补注册/重置中验证码成功消费与业务修改的原子性;管理接口全审查、重置发送侧信道、默认配置、依赖与备份恢复仍需继续 | 新增 12 项真实数据库回归;独立验收、部署与恢复演练未完成,禁止宣称“全仓库安全” | | COD-01 | Codex 协议能力及验收矩阵 | 未实现完整兼容;保留有限文本 Responses 的明确拒绝语义 | 指定客户端版本、模型、工具和计费联合验收 | | COD-02 | Responses WebSocket 与响应归属续接 | 未实现,不可宣传完整 Codex 支持 | 原账号/凭据版本归属、断线、取消、租约、费用一致性 | | COD-03 | 长请求连接/空闲/总期限与续租 | 未完成,不只修改 90 秒常量 | 并发租约、钱包预留恢复、长流/取消共同验证 | @@ -31,10 +32,12 @@ ## 实施边界 -已补 SEC-01/02/03 和 SEC-06 的本地下载代码边界,下一优先级是注册/密码重置事务审查、同步 Transport 与完整 provider 配置版本,再处理 COD-01/02/03 的协议/续接/长请求合同。SEC-06 的生产网络隔离仍属待验收。Codex WebSocket 与 OAuth 不是添加 URL 即可安全完成的能力,须连同状态归属、计量、预留续期和客户端验收逐步实施。未部署、未真实供应商验证或待设计的项必须保持未完成标记。 +已补 SEC-01/02/03、SEC-06 的本地下载代码边界,以及注册/密码重置中成功验证码与业务修改的原子性。下一优先级是验证发送侧信道和资源约束、管理授权审查、同步 Transport 与完整 provider 配置版本,再处理 COD-01/02/03 的协议/续接/长请求合同。SEC-06 的生产网络隔离仍属待验收。Codex WebSocket 与 OAuth 不是添加 URL 即可安全完成的能力,须连同状态归属、计量、预留续期和客户端验收逐步实施。未部署、未真实供应商验证或待设计的项必须保持未完成标记。 本轮设计与验证细节见 `25-auth-and-bounded-transport.md`。这份表按用户粘贴报告的锁定基线追踪本地实施,不把旧的 CPR 版本号冒充实时最新版,也没有重新部署 CPR。只做本地 Git commit,不 push,不修改业务数据库。 2026-10-21 本轮最终验证:247 项后端测试全部通过(含真实 PostgreSQL/Redis,0 跳过),前端构建与 25 项测试通过,另完成隔离改密界面交互检查。新增 GitHub 配置只保存本地,远端未执行。本轮没有把剩余 COD/SCH/出站/运营验收项目标为完成。 2026-10-21 媒体安全后续增量:使用 HttpClient 5.6.5 / HttpCore 5.4.4 重新执行 `mvn -B -o clean verify`,356 项后端测试通过(0 失败/错误/跳过),前端构建及 25 项测试通过。服务端本地下载不再使用 DNS 预检后交给 JDK 客户端二次解析的路径。用户指定的规格驱动验收尚未执行:`testingflow` 的 `.venv` 指向不存在的 Python,首个 `qa project list` 失败;没有绕过工具门禁,也没有自行批准规格。细节及下一步审阅范围见 `26-media-dns-binding-and-acceptance.md`。 + +2026-10-21 验证码事务后续增量:新增 `VerifiedAccountService`,公开注册/重置不再在业务成功前永久消费有效验证码;错误验证码尝试仍提交,审计失败时成功消费、账号、邀请码和会话一起回滚。`mvn -B -o clean verify` 最终 368 项全部通过(0 失败/错误/跳过,2026-10-21 23:05:46 Asia/Shanghai),包含新增 12 项数据库验证;前端沿用本轮已通过的构建及 25 项测试,未修改前端代码。详见 `27-verified-account-transactions.md`。规格驱动验收环境阻塞未解除,没有生成通过报告。 diff --git a/docs/27-verified-account-transactions.md b/docs/27-verified-account-transactions.md new file mode 100644 index 0000000..7f3f16d --- /dev/null +++ b/docs/27-verified-account-transactions.md @@ -0,0 +1,37 @@ +# 验证码与账号事务 + +日期:2026-10-21。范围为公开注册和密码重置的本地事务一致性,不包含真实短信/邮件发送、生产用户操作或完整认证安全验收。 + +## 缺陷与修复 + +此前 `AuthController` 先调用 `VerificationService.consume/consumeReset` 并提交消费,再调用独立事务里的账号操作。即使邀请码无效、显示名称不合法、账号已存在、账号停用或后续审计失败,正确验证码也已经消耗,造成失败后无法重试。简单给外层加默认事务又会让错误验证码次数随异常一起回滚,破坏原有五次上限。 + +新增 `auth.VerifiedAccountService` 作为公开注册/恢复流程的应用事务边界: + +1. 新密码策略先校验,不因弱密码消耗验证码。 +2. 开启本次操作拥有的 `REQUIRES_NEW` 事务,验证码行锁、消费和账号业务在同一事务中完成。入口仅用于公开操作,不应嵌入其他业务事务;若未来复用,须重新审查连接池预算及锁顺序,避免持外层连接等待新连接。 +3. 验证码失败时,仅将已知校验异常作为结果返回,让事务正常提交尝试计数,再在事务结束后向调用方抛出。尚未调用任何账号修改,不会创建用户或撤销会话;外层调用者回滚也不能抹去错误次数。`VerificationService` 原有 `noRollbackFor=ApiException` 语义保持不变。 +4. 验证成功后不捕获业务/审计/存储异常。邀请码消费、兑换记录、用户/密码、会话和审计任一步失败,连同本次成功验证码消费一起回滚;没有补偿式重置验证码,也没有失去行锁后再尝试恢复状态。 +5. Controller 不再自行拼接消费和业务写入。注册 Cookie 只在事务成功后签发;重置成功撤销原账号全部服务端浏览器会话,并清理响应中的会话 Cookie,失败不清 Cookie。API Key 不因本增量自动撤销。 + +## 验证 + +新增 `VerifiedAccountPostgresTest`,共 12 项真实 PostgreSQL 回归: + +- 无效邀请码、显示名称过长、重复账号时有效验证码保持可用。 +- 注册审计故障注入后,验证码、用户、会话、邀请码计数和兑换记录全部回滚;排除故障后同一码可成功。 +- 重置审计故障注入后,验证码、密码哈希和会话撤销全部回滚;排除故障后可成功,旧会话失效。 +- 注册与重置的错误码尝试计数各达到五次,外层事务回滚仍不丢计数,正确码随后被拒绝。 +- 注册与重置弱密码不消费验证码;停用账号重置失败也不消耗正确码。 +- 注册与重置并发消费同一码都恰好成功一次,另一次返回验证码已失效,审计/兑换不重复。 +- HTTP 重置失败保留原 Cookie 和有效会话;成功返回 204、清 Cookie 且服务端会话撤销。 + +针对测试 `mvn -B -o -Dtest=VerifiedAccountPostgresTest test`:12 项通过,0 失败/错误/跳过。修正了新测试中的 Java 正则转义和遗漏邀请码创建者的 fixture 后重新执行,未跳过失败用例、未降低断言或放宽数据库约束。 + +最终完整后端命令 `mvn -B -o clean verify`:**368 项,0 失败、0 错误、0 跳过,JAR 构建成功**。结束时间为 2026-10-21 23:05:46(Asia/Shanghai)。Java 21 / Maven 3.9.9 与独立 PostgreSQL 15.18、Redis 7 测试容器,不连接业务库、不对外映射测试数据库端口。原有认证、角色、MFA、媒体 TLS/DNS、任务隔离、幂等、核账和钱包回归均参与执行。日志 `.tools/verified-account-final-verify.log` 被忽略。前端未修改,本轮先前 `npm run build` 和 `npm test` 已通过,25 项测试。 + +## 保留的待办 + +这不是注册/找回密码的全部安全闭环。`sendReset` 对不存在账号提前返回,对存在账号可能暴露限速/发送错误差异,仍需统一可观察语义与资源预算;短信/邮件调用持事务锁的设计、发送失败和超时、验证码行生命周期、管理敏感操作二次验证也要继续审查。未做真实发送、付费请求、部署或生产迁移。 + +用户指定的规格驱动功能验收仍受共享 `testingflow` 虚拟环境缺失 Python 阻塞,详见 26 号文档。本次仅为源码、单元/数据库集成回归,不能称作 `qa run --project` 验收通过。修复共享环境与人工审阅 draft 规格仍是正式执行前置条件。只对已审阅且验证通过的本任务改动创建本地 Git 提交,绝不 push。