From 9f8ed5d9cb0d909874811b752f8ab99f39a801d4 Mon Sep 17 00:00:00 2001 From: si-zero Date: Thu, 19 Nov 2026 11:36:43 +0900 Subject: [PATCH] =?UTF-8?q?#653=20[Feat]=20=EC=9D=B4=EC=9A=A9=EA=B6=8C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20PKE+6=EC=9E=90=EB=A6=AC=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD=EA=B3=BC=20=EA=B3=84=EC=A0=95?= =?UTF-8?q?=EB=B3=84=20=EC=9E=85=EB=A0=A5=205=ED=9A=8C=20=EC=A0=9C?= =?UTF-8?q?=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api-specs/class-api.md | 11 ++- .../ticket/entity/TicketCodeAttempt.java | 64 +++++++++++++ .../TicketCodeAttemptRepository.java | 17 ++++ .../service/ClassTicketServiceImpl.java | 22 ++++- .../service/TicketCodeAttemptGuard.java | 59 ++++++++++++ .../ticket/util/TicketCodeGenerator.java | 36 +++----- .../global/common/exception/ErrorCode.java | 1 + ...261119_03__create_ticket_code_attempts.sql | 20 ++++ ..._rollback__create_ticket_code_attempts.sql | 3 + .../AdminFundingApiIntegrationTest.java | 2 +- .../ClassTicketApiIntegrationTest.java | 91 ++++++++++++++++++- .../service/ClassTicketServiceImplTest.java | 8 +- .../ticket/util/TicketCodeGeneratorTest.java | 26 +++--- 13 files changed, 314 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java create mode 100644 src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java create mode 100644 src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql create mode 100644 src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql diff --git a/docs/api-specs/class-api.md b/docs/api-specs/class-api.md index eb66a278..9f8c7999 100644 --- a/docs/api-specs/class-api.md +++ b/docs/api-specs/class-api.md @@ -117,10 +117,11 @@ - 이용 기간은 등록 시점부터 6개월이다. - 정원은 리워드 티어(5 / 15 / 30석)를 따른다. - 계정당 사용 중인(ACTIVE) 이용권은 1개다. -- 코드의 공백·하이픈·대소문자는 무시한다. +- 코드 형식은 `PKE` + 16진수 대문자 6자리다 (예: `PKE05D2E1`). 코드의 공백·하이픈·대소문자는 무시한다. +- **입력 5회 제한:** 코드 확인(1.1)과 등록(1.2)에서 없는 코드를 넣은 횟수를 계정별로 센다. 1시간 안에 5번 틀리면 그 응답부터 1시간 동안 429 `TICKET_429_LOCKED`다. 잠긴 동안에는 맞는 코드도 막힌다. 맞는 코드를 넣어도 틀린 횟수는 초기화되지 않는다. ### 1.1 이용권 코드 확인 (미리보기) -- `GET /api/v1/class-tickets/preview?code=PICKE-AB12-CD34` +- `GET /api/v1/class-tickets/preview?code=PKE05D2E1` - 코드를 소비하지 않고 정원과 등록 기한을 보여준다. ```json @@ -137,6 +138,7 @@ |---|---| | 빈 코드 | 400 `COMMON_400` | | 없는 코드 | 404 `TICKET_404_CODE` | +| 없는 코드를 1시간 안에 5번 넣음 (5번째부터 1시간) | 429 `TICKET_429_LOCKED` | | 재발급·환불로 무효화된 코드 | 409 `TICKET_409_REVOKED` | | 등록 기한 경과 | 409 `TICKET_409_REG_EXP` | | 다른 계정이 이미 등록 | 409 `TICKET_409_CLAIMED` | @@ -146,7 +148,7 @@ - `POST /api/v1/class-tickets/register` ```json -{ "code": "PICKE-AB12-CD34" } +{ "code": "PKE05D2E1" } ``` - 등록하면 즉시 ACTIVE가 되고 6개월 뒤 만료된다. @@ -1276,7 +1278,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 "ticketId": 3, "fundingOrderId": 1, "orderId": "T-0001", "supporterName": "홍길동", "supporterEmail": "...", "supporterPhone": "...", "capacity": 30, "registerBy": "2027-09-01T00:00:00", - "code": "XXXXXX-XXXXX-XXXXX-XXXXX-XXXXX" + "code": "PKE05D2E1" } ], "skipped": [ { "fundingOrderId": 2, "orderId": "T-0002", "reason": "ALREADY_ISSUED" } ] @@ -1471,6 +1473,7 @@ PRD "등록기한 30일·7일 전 알림은 허용된 연락 수단에서만 발 | 코드 | HTTP | 메시지 | |---|---|---| | `TICKET_404_CODE` | 404 | 유효하지 않은 이용권 코드입니다. | +| `TICKET_429_LOCKED` | 429 | 이용권 코드를 5번 잘못 입력해 1시간 동안 입력할 수 없어요. 잠시 후 다시 시도해 주세요. | | `TICKET_404` | 404 | 등록된 이용권이 없습니다. | | `TICKET_409_CLAIMED` | 409 | 이미 등록된 이용권 코드입니다. | | `TICKET_409_REVOKED` | 409 | 재발급되어 더 이상 사용할 수 없는 이용권 코드입니다. | diff --git a/src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java b/src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java new file mode 100644 index 00000000..c6d8be9a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java @@ -0,0 +1,64 @@ +package com.swyp.picke.domain.ticket.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +/** + * 이용권 코드 입력 실패 횟수 (계정별 1행). 짧은 코드(PKE+6자리)를 추측해 가로채지 못하게, + * 1시간 안에 없는 코드를 5번 넣으면 1시간 동안 코드 확인·등록을 막는다 (기획 결정 2026-11-19). + */ +@Getter +@Entity +@Table(name = "ticket_code_attempts") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class TicketCodeAttempt { + + @Id + @Column(name = "user_id") + private Long userId; + + @Column(name = "fail_count", nullable = false) + private int failCount; + + /** 실패 횟수를 세기 시작한 시각. 여기서 1시간이 지나면 횟수를 0부터 다시 센다 */ + @Column(name = "window_started_at") + private LocalDateTime windowStartedAt; + + @Column(name = "locked_until") + private LocalDateTime lockedUntil; + + @Column(name = "updated_at", nullable = false) + private LocalDateTime updatedAt; + + public TicketCodeAttempt(Long userId, LocalDateTime now) { + this.userId = userId; + this.updatedAt = now; + } + + public boolean isLocked(LocalDateTime now) { + return lockedUntil != null && now.isBefore(lockedUntil); + } + + /** 실패 1회를 기록하고, 이번 실패로 잠겼으면 true */ + public boolean recordFailure(LocalDateTime now, int maxFailures, long windowMinutes, long lockMinutes) { + if (windowStartedAt == null || !now.isBefore(windowStartedAt.plusMinutes(windowMinutes))) { + windowStartedAt = now; + failCount = 0; + } + failCount++; + updatedAt = now; + if (failCount >= maxFailures) { + lockedUntil = now.plusMinutes(lockMinutes); + failCount = 0; + windowStartedAt = null; + return true; + } + return false; + } +} diff --git a/src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java b/src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java new file mode 100644 index 00000000..34757574 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java @@ -0,0 +1,17 @@ +package com.swyp.picke.domain.ticket.repository; + +import com.swyp.picke.domain.ticket.entity.TicketCodeAttempt; +import jakarta.persistence.LockModeType; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface TicketCodeAttemptRepository extends JpaRepository { + + /** 동시에 여러 번 틀려도 횟수가 빠지지 않도록 행을 잠그고 읽는다 */ + @Lock(LockModeType.PESSIMISTIC_WRITE) + @Query("select a from TicketCodeAttempt a where a.userId = :userId") + Optional findByUserIdForUpdate(@Param("userId") Long userId); +} diff --git a/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java b/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java index 71e13f76..68e338b1 100644 --- a/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; +import org.springframework.dao.DataIntegrityViolationException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,6 +38,7 @@ public class ClassTicketServiceImpl implements ClassTicketService { private final ClassTicketRepository classTicketRepository; private final UserRepository userRepository; + private final TicketCodeAttemptGuard attemptGuard; @Override public ClassTicketPreviewResponse preview(Long userId, String code) { @@ -44,8 +46,9 @@ public ClassTicketPreviewResponse preview(Long userId, String code) { throw new CustomException(ErrorCode.COMMON_INVALID_PARAMETER); } LocalDateTime now = LocalDateTime.now(KST); + attemptGuard.checkNotLocked(userId, now); ClassTicket ticket = classTicketRepository.findByCodeHash(TicketCodeHasher.hash(code)) - .orElseThrow(() -> new CustomException(ErrorCode.TICKET_CODE_INVALID)); + .orElseThrow(() -> invalidCode(userId, now)); boolean registeredByMe = ticket.isRegisteredBy(userId); if (!registeredByMe) { @@ -71,8 +74,9 @@ public ClassTicketResponse register(Long userId, ClassTicketRegisterRequest requ User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + attemptGuard.checkNotLocked(userId, now); ClassTicket ticket = classTicketRepository.findByCodeHashForUpdate(TicketCodeHasher.hash(request.code())) - .orElseThrow(() -> new CustomException(ErrorCode.TICKET_CODE_INVALID)); + .orElseThrow(() -> invalidCode(userId, now)); if (ticket.isRevoked()) { throw new CustomException(ErrorCode.TICKET_CODE_REVOKED); @@ -106,6 +110,20 @@ public ClassTicketResponse getMyTicket(Long userId) { return ClassTicketConverter.toResponse(ticket, now); } + /** + * 없는 코드 입력. 실패를 기록하고 404 를 돌려준다. 이번 실패로 5회가 차면 바로 429(1시간 잠금)를 돌려준다. + * 같은 계정의 첫 실패가 동시에 들어와 기록 행 생성이 충돌하면 한 번 더 기록한다. + */ + private CustomException invalidCode(Long userId, LocalDateTime now) { + boolean locked; + try { + locked = attemptGuard.recordFailure(userId, now); + } catch (DataIntegrityViolationException e) { + locked = attemptGuard.recordFailure(userId, now); + } + return new CustomException(locked ? ErrorCode.TICKET_CODE_LOCKED : ErrorCode.TICKET_CODE_INVALID); + } + /** 상태를 바꾸지 않는 순수 검사. preview 와 register 가 같이 쓴다 */ private void validateCodeRegistrable(ClassTicket ticket, LocalDateTime now) { if (ticket.isRevoked()) { diff --git a/src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java b/src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java new file mode 100644 index 00000000..53e8be5a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java @@ -0,0 +1,59 @@ +package com.swyp.picke.domain.ticket.service; + +import com.swyp.picke.domain.ticket.entity.TicketCodeAttempt; +import com.swyp.picke.domain.ticket.repository.TicketCodeAttemptRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * 이용권 코드 입력 5회 제한 (기획 결정 2026-11-19). 계정별로 1시간 안에 없는 코드를 5번 넣으면 1시간 동안 막는다. + *

실패 기록은 호출한 쪽이 예외로 롤백돼도 남아야 하므로 별도 트랜잭션(REQUIRES_NEW)으로 저장한다. + * 맞는 코드를 넣어도 횟수를 초기화하지 않는다. 초기화하면 본인 코드로 횟수를 지우며 계속 추측할 수 있기 때문이다.

+ */ +@Slf4j +@Component +@RequiredArgsConstructor +public class TicketCodeAttemptGuard { + + public static final int MAX_FAILURES = 5; + public static final long WINDOW_MINUTES = 60; + public static final long LOCK_MINUTES = 60; + + private final TicketCodeAttemptRepository attemptRepository; + + /** 잠겨 있으면 429 */ + @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = true) + public void checkNotLocked(Long userId, LocalDateTime now) { + attemptRepository.findById(userId) + .filter(a -> a.isLocked(now)) + .ifPresent(a -> { + throw new CustomException(ErrorCode.TICKET_CODE_LOCKED); + }); + } + + /** 없는 코드 입력 1회 기록. 이번 실패로 잠기면 true */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public boolean recordFailure(Long userId, LocalDateTime now) { + TicketCodeAttempt attempt = attemptRepository.findByUserIdForUpdate(userId) + .orElseGet(() -> createRow(userId, now)); + boolean locked = attempt.recordFailure(now, MAX_FAILURES, WINDOW_MINUTES, LOCK_MINUTES); + if (locked) { + log.warn("이용권 코드 입력 잠금 - userId: {}, lockedUntil: {}", userId, attempt.getLockedUntil()); + } + return locked; + } + + /** + * 같은 계정의 첫 실패가 동시에 들어오면 한쪽은 PK 충돌(DataIntegrityViolationException)로 끝난다. + * 이 트랜잭션은 그대로 롤백되고, 호출한 쪽이 한 번 더 부르면 이미 만들어진 행을 잠그고 센다. + */ + private TicketCodeAttempt createRow(Long userId, LocalDateTime now) { + return attemptRepository.saveAndFlush(new TicketCodeAttempt(userId, now)); + } +} diff --git a/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java b/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java index f6d6bb81..1fcea4c5 100644 --- a/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java +++ b/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java @@ -3,40 +3,34 @@ import java.security.SecureRandom; /** - * 이용권 코드 생성. SecureRandom 130bit → Crockford Base32 26자 (0/O, 1/I/L 혼동 문자 제외). - * 표시 형식은 {@code XXXXXX-XXXXX-XXXXX-XXXXX-XXXXX} (6-5-5-5-5). 하이픈·소문자는 {@link TicketCodeHasher#normalize} 가 흡수한다. - * 원문은 관리자 발급/조회 응답으로만 노출하고 서버 로그에는 남기지 않는다. DB에는 별도 키로 암호화해 보관한다. + * 이용권 코드 생성. 형식은 {@code PKE} + 16진수 대문자 6자리 (예: {@code PKE05D2E1}, 기획 결정 2026-11-19). + *

무작위 부분이 24비트(약 1,678만 가지)라 추측 공격에 약하므로, 코드 확인·등록은 + * {@link com.swyp.picke.domain.ticket.service.TicketCodeAttemptGuard} 로 계정별 실패 횟수를 제한한다.

+ *

공백·하이픈·소문자는 {@link TicketCodeHasher#normalize} 가 흡수한다. 원문은 관리자 발급/조회 응답으로만 노출하고 + * 서버 로그에는 남기지 않는다. DB에는 별도 키로 암호화해 보관한다.

*/ public final class TicketCodeGenerator { - public static final int CODE_LENGTH = 26; - private static final String ALPHABET = "0123456789ABCDEFGHJKMNPQRSTVWXYZ"; - private static final int[] GROUPS = {6, 5, 5, 5, 5}; + public static final String PREFIX = "PKE"; + public static final int RANDOM_LENGTH = 6; + public static final int CODE_LENGTH = PREFIX.length() + RANDOM_LENGTH; + private static final String HEX = "0123456789ABCDEF"; private static final SecureRandom RANDOM = new SecureRandom(); private TicketCodeGenerator() { } - /** 하이픈 없는 26자 원문 (해시 입력·정규화 기준과 동일) */ + /** 정규화 기준과 같은 원문 (해시 입력) */ public static String generate() { - StringBuilder sb = new StringBuilder(CODE_LENGTH); - for (int i = 0; i < CODE_LENGTH; i++) { - sb.append(ALPHABET.charAt(RANDOM.nextInt(ALPHABET.length()))); + StringBuilder sb = new StringBuilder(CODE_LENGTH).append(PREFIX); + for (int i = 0; i < RANDOM_LENGTH; i++) { + sb.append(HEX.charAt(RANDOM.nextInt(HEX.length()))); } return sb.toString(); } - /** 사람이 받아 적기 쉬운 표시 형식 */ + /** 사람에게 보여주는 형식. 새 형식은 원문 그대로다 */ public static String format(String rawCode) { - StringBuilder sb = new StringBuilder(CODE_LENGTH + GROUPS.length - 1); - int pos = 0; - for (int i = 0; i < GROUPS.length; i++) { - if (i > 0) { - sb.append('-'); - } - sb.append(rawCode, pos, pos + GROUPS[i]); - pos += GROUPS[i]; - } - return sb.toString(); + return rawCode; } } diff --git a/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java index d2403026..76568f8e 100644 --- a/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java @@ -134,6 +134,7 @@ public enum ErrorCode { // ClassTicket (클래스 이용권) TICKET_CODE_INVALID(HttpStatus.NOT_FOUND, "TICKET_404_CODE", "유효하지 않은 이용권 코드입니다."), + TICKET_CODE_LOCKED(HttpStatus.TOO_MANY_REQUESTS, "TICKET_429_LOCKED", "이용권 코드를 5번 잘못 입력해 1시간 동안 입력할 수 없어요. 잠시 후 다시 시도해 주세요."), TICKET_CODE_ALREADY_CLAIMED(HttpStatus.CONFLICT, "TICKET_409_CLAIMED", "이미 등록된 이용권 코드입니다."), TICKET_CODE_REVOKED(HttpStatus.CONFLICT, "TICKET_409_REVOKED", "재발급되어 더 이상 사용할 수 없는 이용권 코드입니다."), TICKET_REGISTER_EXPIRED(HttpStatus.CONFLICT, "TICKET_409_REG_EXP", "등록 기한이 지난 이용권 코드입니다."), diff --git a/src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql b/src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql new file mode 100644 index 00000000..77b6934e --- /dev/null +++ b/src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql @@ -0,0 +1,20 @@ +-- #653 이용권 코드 입력 실패 횟수 (계정별 1행). +-- 코드가 PKE+16진수 6자리로 짧아져, 1시간 안에 없는 코드를 5번 넣으면 1시간 동안 코드 확인·등록을 막는다. +-- 서버 배포 전에 먼저 실행해야 한다 (없으면 코드 확인·등록이 500). +-- 멱등하게 작성되어 재실행해도 안전하다. + +CREATE TABLE IF NOT EXISTS ticket_code_attempts ( + user_id BIGINT PRIMARY KEY, + fail_count INT NOT NULL DEFAULT 0, + window_started_at TIMESTAMP, + locked_until TIMESTAMP, + updated_at TIMESTAMP NOT NULL +); + +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_ticket_code_attempts_user') THEN + ALTER TABLE ticket_code_attempts ADD CONSTRAINT fk_ticket_code_attempts_user + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE; + END IF; +END $$; diff --git a/src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql b/src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql new file mode 100644 index 00000000..80578cc1 --- /dev/null +++ b/src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql @@ -0,0 +1,3 @@ +-- Rollback for V20261119_03__create_ticket_code_attempts.sql +-- 애플리케이션 코드를 #653 이전으로 되돌린 뒤 실행할 것. +DROP TABLE IF EXISTS ticket_code_attempts; diff --git a/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java index c89cf226..515596b6 100644 --- a/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java @@ -55,7 +55,7 @@ class AdminFundingApiIntegrationTest { private static final String HEADER = "platform,campaign_id,order_id,reward_tier,quantity,supporter_name,supporter_email,supporter_phone,payment_status,paid_at\n"; - private static final String CODE_PATTERN = "[0-9A-Z]{6}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}"; + private static final String CODE_PATTERN = "PKE[0-9A-F]{6}"; @Autowired private MockMvc mockMvc; diff --git a/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java index a19b8b89..253f5d40 100644 --- a/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java @@ -11,6 +11,11 @@ import com.swyp.picke.domain.ticket.repository.ClassTicketRepository; import com.swyp.picke.domain.ticket.repository.FundingOrderRepository; import com.swyp.picke.domain.ticket.util.TicketCodeHasher; +import org.springframework.test.util.ReflectionTestUtils; +import com.swyp.picke.domain.ticket.util.TicketCodeGenerator; +import com.swyp.picke.domain.ticket.service.TicketCodeAttemptGuard; +import com.swyp.picke.domain.ticket.repository.TicketCodeAttemptRepository; +import com.swyp.picke.domain.ticket.entity.TicketCodeAttempt; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.enums.UserRole; import com.swyp.picke.domain.user.enums.UserStatus; @@ -54,9 +59,12 @@ class ClassTicketApiIntegrationTest { private FundingOrderRepository fundingOrderRepository; @Autowired private ClassTicketRepository classTicketRepository; + @Autowired + private TicketCodeAttemptRepository ticketCodeAttemptRepository; @BeforeEach void setUp() { + ticketCodeAttemptRepository.deleteAll(); classTicketRepository.deleteAll(); fundingOrderRepository.deleteAll(); } @@ -147,7 +155,7 @@ void register_validation() throws Exception { mockMvc.perform(post("/api/v1/class-tickets/register") .header("Authorization", "Bearer " + token) .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(Map.of("code", "PICKE-NOPE-0000")))) + .content(objectMapper.writeValueAsString(Map.of("code", "PKE000000")))) .andExpect(status().isNotFound()) .andExpect(jsonPath("$.error.code").value("TICKET_404_CODE")); @@ -262,6 +270,85 @@ void preview_rejections() throws Exception { .andExpect(status().isUnauthorized()); } + @Test + @DisplayName("없는 코드를 5번 넣으면 1시간 잠금(429): 맞는 코드도 막히고, 다른 계정은 영향 없고, 잠금이 풀리면 등록된다") + void wrongCodeFiveTimes_locksForAnHour() throws Exception { + User user = newUser(); + String token = jwtProvider.createAccessToken(user.getId(), UserRole.USER.name()); + String code = newCode(); + issueTicket(code, RewardTier.SEAT_5, LocalDateTime.now().minusDays(1)); + + for (int i = 0; i < TicketCodeAttemptGuard.MAX_FAILURES - 1; i++) { + register(token, wrongCode(code)).andExpect(status().isNotFound()) + .andExpect(jsonPath("$.error.code").value("TICKET_404_CODE")); + } + // 5번째 실패(미리보기도 같이 센다)에서 바로 잠긴다 + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", wrongCode(code)) + .header("Authorization", "Bearer " + token)) + .andExpect(status().isTooManyRequests()) + .andExpect(jsonPath("$.error.code").value("TICKET_429_LOCKED")); + // 잠긴 동안에는 맞는 코드도 막힌다 + register(token, code).andExpect(status().isTooManyRequests()); + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", code) + .header("Authorization", "Bearer " + token)) + .andExpect(status().isTooManyRequests()); + + // 다른 계정은 영향 없다 + String other = userToken(); + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", code) + .header("Authorization", "Bearer " + other)) + .andExpect(status().isOk()); + + // 1시간이 지나면 다시 등록할 수 있다 + TicketCodeAttempt attempt = ticketCodeAttemptRepository.findById(user.getId()).orElseThrow(); + ReflectionTestUtils.setField(attempt, "lockedUntil", LocalDateTime.now().minusSeconds(1)); + ticketCodeAttemptRepository.save(attempt); + register(token, code).andExpect(status().isOk()) + .andExpect(jsonPath("$.data.status").value("ACTIVE")); + } + + @Test + @DisplayName("맞는 코드를 넣어도 실패 횟수는 초기화되지 않는다 (본인 코드로 횟수를 지우며 추측하지 못하게)") + void validCode_doesNotResetFailures() throws Exception { + User user = newUser(); + String token = jwtProvider.createAccessToken(user.getId(), UserRole.USER.name()); + String code = newCode(); + issueTicket(code, RewardTier.SEAT_5, LocalDateTime.now().minusDays(1)); + + for (int i = 0; i < TicketCodeAttemptGuard.MAX_FAILURES - 1; i++) { + register(token, wrongCode(code)).andExpect(status().isNotFound()); + } + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", code) + .header("Authorization", "Bearer " + token)) + .andExpect(status().isOk()); + register(token, wrongCode(code)).andExpect(status().isTooManyRequests()); + } + + private org.springframework.test.web.servlet.ResultActions register(String token, String code) throws Exception { + return mockMvc.perform(post("/api/v1/class-tickets/register") + .header("Authorization", "Bearer " + token) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(Map.of("code", code)))); + } + + /** 발급한 코드와 다른, 같은 형식의 코드 */ + private static String wrongCode(String issued) { + String candidate; + do { + candidate = TicketCodeGenerator.generate(); + } while (candidate.equals(issued)); + return candidate; + } + + private User newUser() { + return userRepository.save(User.builder() + .userTag("tk-" + UUID.randomUUID().toString().substring(0, 8)) + .nickname("tester") + .role(UserRole.USER) + .status(UserStatus.ACTIVE) + .build()); + } + private void registerOk(String token, String code) throws Exception { mockMvc.perform(post("/api/v1/class-tickets/register") .header("Authorization", "Bearer " + token) @@ -271,7 +358,7 @@ private void registerOk(String token, String code) throws Exception { } private static String newCode() { - return "PICKE-" + UUID.randomUUID().toString().substring(0, 8).toUpperCase(); + return TicketCodeGenerator.generate(); } private void issueTicket(String code, RewardTier tier, LocalDateTime paidAt) { diff --git a/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java b/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java index 3f85fbe3..22d4a87d 100644 --- a/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java +++ b/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java @@ -41,13 +41,15 @@ class ClassTicketServiceImplTest { private static final Long USER_ID = 1L; - private static final String CODE = "PICKE-AB12-CD34"; + private static final String CODE = "PKE05D2E1"; private static final String HASH = TicketCodeHasher.hash(CODE); @Mock private ClassTicketRepository classTicketRepository; @Mock private UserRepository userRepository; + @Mock + private TicketCodeAttemptGuard attemptGuard; @InjectMocks private ClassTicketServiceImpl service; @@ -102,7 +104,7 @@ void register_activatesTicket() { when(classTicketRepository.findByRegisteredUserIdAndStatus(USER_ID, TicketStatus.ACTIVE)) .thenReturn(Optional.empty()); - ClassTicketResponse response = service.register(USER_ID, new ClassTicketRegisterRequest(" picke-ab12-cd34 ")); + ClassTicketResponse response = service.register(USER_ID, new ClassTicketRegisterRequest(" pke-05d2e1 ")); assertThat(ticket.getStatus()).isEqualTo(TicketStatus.ACTIVE); assertThat(ticket.getCodeStatus()).isEqualTo(TicketCodeStatus.CLAIMED); @@ -302,7 +304,7 @@ void preview_returnsCapacityAndRegisterBy() { when(classTicketRepository.findByRegisteredUserIdAndStatus(USER_ID, TicketStatus.ACTIVE)) .thenReturn(Optional.empty()); - ClassTicketPreviewResponse response = service.preview(USER_ID, " picke-ab12-cd34 "); + ClassTicketPreviewResponse response = service.preview(USER_ID, " pke-05d2e1 "); assertThat(response.capacity()).isEqualTo(5); assertThat(response.registerBy()).isEqualTo(paidAt.plusYears(1)); diff --git a/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java b/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java index fa4b53d2..f9e5ba36 100644 --- a/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java +++ b/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java @@ -10,31 +10,31 @@ class TicketCodeGeneratorTest { @Test - @DisplayName("26자 Crockford Base32 (혼동 문자 I/L/O/U 없음) 로 생성된다") - void generatesCrockfordBase32() { + @DisplayName("PKE + 16진수 대문자 6자리(예: PKE05D2E1)로 생성된다") + void generatesPkePlusSixHex() { for (int i = 0; i < 200; i++) { String raw = TicketCodeGenerator.generate(); - assertThat(raw).hasSize(26).matches("[0-9A-HJKMNP-TV-Z]{26}"); + assertThat(raw).hasSize(TicketCodeGenerator.CODE_LENGTH).matches("PKE[0-9A-F]{6}"); } } @Test - @DisplayName("표시 형식은 6-5-5-5-5 이고, 정규화하면 원문과 같아 해시가 일치한다") + @DisplayName("표시 형식은 원문 그대로이고, 소문자·공백·하이픈을 섞어 입력해도 정규화하면 같은 해시가 된다") void formatIsReversibleThroughNormalize() { String raw = TicketCodeGenerator.generate(); - String shown = TicketCodeGenerator.format(raw); - assertThat(shown).matches("[0-9A-Z]{6}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}"); - assertThat(TicketCodeHasher.normalize(shown)).isEqualTo(raw); - assertThat(TicketCodeHasher.hash(shown.toLowerCase())).isEqualTo(TicketCodeHasher.hash(raw)); + assertThat(TicketCodeGenerator.format(raw)).isEqualTo(raw); + assertThat(TicketCodeHasher.normalize(" pke-" + raw.substring(3).toLowerCase() + " ")).isEqualTo(raw); + assertThat(TicketCodeHasher.hash(raw.toLowerCase())).isEqualTo(TicketCodeHasher.hash(raw)); } @Test - @DisplayName("연속 생성 시 중복이 없다") - void noDuplicates() { - Set seen = new HashSet<>(); - for (int i = 0; i < 5000; i++) { - assertThat(seen.add(TicketCodeGenerator.generate())).isTrue(); + @DisplayName("무작위 6자리가 고르게 나온다 (한 글자 위치에 16가지가 모두 나온다)") + void randomPartUsesAllHexDigits() { + Set seen = new HashSet<>(); + for (int i = 0; i < 2000; i++) { + seen.add(TicketCodeGenerator.generate().charAt(3)); } + assertThat(seen).hasSize(16); } }