Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .claude/rules/security-convention.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ paths:
`SecurityConfig`์˜ ๋‹จ์ผ `SecurityFilterChain`:

- `csrf`, `httpBasic`, `formLogin` ๋น„ํ™œ์„ฑํ™”. ์„ธ์…˜์€ `SessionCreationPolicy.STATELESS`.
- CORS๋Š” `corsConfigurationSource` ๋นˆ์œผ๋กœ ์ผ ๋‹ค. ํ—ˆ์šฉ ์ถœ์ฒ˜๋Š” ํ”„๋กœํŒŒ์ผ๋ณ„ `app.cors.allowed-origins`(๊ฐœ๋ฐœ ์„œ๋ฒ„๋Š” `FRONT_BASE_URL` + ๋กœ์ปฌ ํ”„๋ก ํŠธ)์—์„œ ์ฝ๊ณ , RT ์ฟ ํ‚ค๋ฅผ ์ฃผ๊ณ ๋ฐ›์•„์•ผ ํ•ด์„œ ์ž๊ฒฉ ์ฆ๋ช…์„ ํ—ˆ์šฉํ•œ๋‹ค(์ถœ์ฒ˜์— `*` ๋ถˆ๊ฐ€). ํ—ˆ์šฉ ํ—ค๋”๋Š” `Authorization` ยท `Content-Type`.
- `allowUris`(`/oauth2/**`, `/login/**`, `/api/v1/auth/reissue`, Swagger ๊ฒฝ๋กœ `/swagger-ui/**`ยท`/swagger-ui.html`ยท`/v3/api-docs/**`)๋งŒ `permitAll`, ๋‚˜๋จธ์ง€๋Š” `authenticated`. ์žฌ๋ฐœ๊ธ‰์€ AT๊ฐ€ ๋งŒ๋ฃŒ๋œ ์ƒํƒœ๋กœ ํ˜ธ์ถœ๋˜๋ฏ€๋กœ ์ธ์ฆ์„ ๊ฑธ ์ˆ˜ ์—†๊ณ , ์ธ์ฆ ์ฃผ์ฒด๊ฐ€ RT ์ฟ ํ‚ค๋‹ค.
- `oauth2Login`์— `CustomOAuth2UserService`(userInfo) + `OAuth2LoginSuccessHandler` + `OAuth2LoginFailureHandler`๋ฅผ ์—ฐ๊ฒฐ.
- `JwtAuthenticationFilter`๋ฅผ `UsernamePasswordAuthenticationFilter` ์•ž์— ๋“ฑ๋ก(๋นˆ์ด ์•„๋‹ˆ๋ผ `new`๋กœ ๋งŒ๋“ค์–ด `JwtUtil`ยท`TokenStore`๋ฅผ ๋„˜๊ธด๋‹ค). `exceptionHandling`์— `CustomAuthenticationEntryPoint`(401) + `CustomAccessDeniedHandler`(403) ์—ฐ๊ฒฐ.
Expand Down Expand Up @@ -62,10 +63,10 @@ paths:

## ๋‚จ์•„ ์žˆ๋Š” TODO (๊ฑด๋“œ๋ฆด ๋•Œ ํ•จ๊ป˜ ์ฒ˜๋ฆฌ)

- RT ์ฟ ํ‚ค๊ฐ€ ๋กœ์ปฌ ๊ธฐ์ค€(`secure` ์—†์Œ / `SameSite=Lax`)์ด๋‹ค. HTTPSยท๋‹ค๋ฅธ ๋„๋ฉ”์ธ์œผ๋กœ ๋ฐฐํฌํ•˜๋ฉด `CookieUtil`์—์„œ `secure(true)` / `sameSite("None")`์œผ๋กœ ๋ฐ”๊ฟ”์•ผ ํ•œ๋‹ค.
- RT ์ฟ ํ‚ค๋Š” `SameSite=Lax` ๊ณ ์ •์ด๊ณ  `Secure`๋งŒ ํ”„๋กœํŒŒ์ผ๋ณ„ `app.cookie.secure`๋ฅผ ๋”ฐ๋ฅธ๋‹ค(๋กœ์ปฌ false, ๊ฐœ๋ฐœ ์„œ๋ฒ„ true). ํ”„๋ก ํŠธ(`sudam.app`)์™€ API(`api.sudam.app`)๊ฐ€ ๊ฐ™์€ ์‚ฌ์ดํŠธ๋ผ Lax๋กœ ์ถฉ๋ถ„ํ•˜๋‹ค. ํ”„๋ก ํŠธ๋ฅผ **๋‹ค๋ฅธ ์‚ฌ์ดํŠธ**(๋‹ค๋ฅธ ๋“ฑ๋ก ๋„๋ฉ”์ธ)๋กœ ์˜ฎ๊ธฐ๋ฉด `sameSite("None")`์œผ๋กœ ๋ฐ”๊ฟ”์•ผ ํ•œ๋‹ค.
- ๋‹ค์ค‘ ๊ธฐ๊ธฐ ๋กœ๊ทธ์ธ์„ ์ง€์›ํ•˜์ง€ ์•Š๋Š”๋‹ค. `rt:{userId}`๊ฐ€ ํšŒ์›๋‹น 1๊ฐœ๋ผ ๋‘ ๋ฒˆ์งธ ๋กœ๊ทธ์ธ์ด ์ฒซ ๋ฒˆ์งธ ์„ธ์…˜์˜ RT๋ฅผ ๋ฌดํšจํ™”ํ•œ๋‹ค. ๊ธฐ๊ธฐ๋ณ„๋กœ ๋‘๋ ค๋ฉด ํ‚ค๋ฅผ `rt:{userId}:{deviceId}`๋กœ ๋ฐ”๊ฟ”์•ผ ํ•œ๋‹ค.
- ๋กœ๊ทธ์•„์›ƒยทํƒˆํ‡ด๋Š” **์š”์ฒญ์— ์“ฐ์ธ AT ํ•˜๋‚˜๋งŒ** ์ฐจ๋‹จํ•œ๋‹ค. ๋‹ค๋ฅธ ๊ธฐ๊ธฐ์˜ AT๊ฐ€ ์‚ด์•„ ์žˆ๋‹ค๋ฉด ๋งŒ๋ฃŒ(์ตœ๋Œ€ 30๋ถ„)๊นŒ์ง€ ์œ ํšจํ•˜๋‹ค.
- AT ์—†์ด RT ์ฟ ํ‚ค๋งŒ์œผ๋กœ ๋กœ๊ทธ์•„์›ƒํ•˜๋Š” ๊ฒฝ๋กœ๊ฐ€ ์—†๋‹ค. AT๊ฐ€ ๋งŒ๋ฃŒ๋์œผ๋ฉด ์žฌ๋ฐœ๊ธ‰ ํ›„ ๋กœ๊ทธ์•„์›ƒํ•ด์•ผ ํ•œ๋‹ค.
- ํƒˆํ‡ด ์‹œ ์นด์นด์˜ค ์—ฐ๊ฒฐ ๋Š๊ธฐ(unlink)๋ฅผ ํ˜ธ์ถœํ•˜์ง€ ์•Š๋Š”๋‹ค (ERD 1.2.3). ๋„ฃ์„ ๋•Œ๋Š” ์™ธ๋ถ€ API ํ˜ธ์ถœ์ด๋ฏ€๋กœ ํŠธ๋žœ์žญ์…˜ ๋ฐ–์—์„œ ์ฒ˜๋ฆฌํ•œ๋‹ค.
- ํƒˆํ‡ด๊ฐ€ `users` ํ–‰๋งŒ ์ •๋ฆฌํ•œ๋‹ค. ์—ฐ๋ฝ์ฒ˜๊ฐ€ ๋‹ด๊ธด ๋‹ค๋ฅธ ํ…Œ์ด๋ธ”(`tutoring_drafts` ๋“ฑ)์€ ํ•ด๋‹น ๋„๋ฉ”์ธ์ด ์ƒ๊ธธ ๋•Œ ํ•จ๊ป˜ ์ฒ˜๋ฆฌํ•œ๋‹ค.
- CORS ์„ค์ •์ด ์—†๋‹ค. ํ”„๋ก ํŠธ๋ฅผ ๋‹ค๋ฅธ ๋„๋ฉ”์ธ์— ๋ฐฐํฌํ•˜๋ฉด `SecurityConfig`์— ์ถ”๊ฐ€ํ•ด์•ผ ํ•œ๋‹ค.
- ํ”„๋ก ํŠธ ์ถœ์ฒ˜๊ฐ€ ๋Š˜๊ฑฐ๋‚˜ ๋ฐ”๋€Œ๋ฉด `SecurityConfig`๊ฐ€ ์•„๋‹ˆ๋ผ ํ”„๋กœํŒŒ์ผ yaml์˜ `app.cors.allowed-origins`๋ฅผ ๊ณ ์นœ๋‹ค. ์ƒˆ ์š”์ฒญ ํ—ค๋”๋ฅผ ์“ฐ๊ฒŒ ๋˜๋ฉด `corsConfigurationSource`์˜ ํ—ˆ์šฉ ํ—ค๋”์— ์ถ”๊ฐ€ํ•œ๋‹ค.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ์ด๋ฏธ์ง€์—๋Š” ์‹คํ–‰ jar๋งŒ ๋“ค์–ด๊ฐ„๋‹ค. .env ๊ฐ™์€ ๋น„๋ฐ€ ๊ฐ’์ด ๋นŒ๋“œ ์ปจํ…์ŠคํŠธ๋กœ ๋„˜์–ด๊ฐ€์ง€ ์•Š๊ฒŒ ๋‚˜๋จธ์ง€๋Š” ๋ชจ๋‘ ์ œ์™ธํ•œ๋‹ค.
*
!build/libs/*.jar
5 changes: 5 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ KAKAO_CLIENT_SECRET=
JWT_SECRET=
# ๊ณ„์ขŒ๋ฒˆํ˜ธ ์•”ํ˜ธํ™” ํ‚ค. Base64๋กœ ์ธ์ฝ”๋”ฉํ•œ 32๋ฐ”์ดํŠธ (์˜ˆ: openssl rand -base64 32)
ACCOUNT_ENCRYPTION_KEY=
# ์•„๋ž˜ ๋‘ ํ‚ค๋Š” ๊ฐœ๋ฐœ ์„œ๋ฒ„(dev ํ”„๋กœํŒŒ์ผ)์—์„œ๋งŒ ์“ด๋‹ค. ๋กœ์ปฌ ์‹คํ–‰์—๋Š” ํ•„์š” ์—†๋‹ค.
# ๋ฐฑ์—”๋“œ ์ฃผ์†Œ (์˜ˆ: https://api.example.com). ์นด์นด์˜ค redirect-uri์— ์“ด๋‹ค
APP_BASE_URL=
# ํ”„๋ก ํŠธ ์ฃผ์†Œ (์˜ˆ: https://example.com). ๋กœ๊ทธ์ธ ์„ฑ๊ณต ยท ์‹คํŒจ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ์— ์“ด๋‹ค
FRONT_BASE_URL=
# ์‹œ์—ฐ์šฉ ๊ฐ€์ƒ ๋ฐ์ดํ„ฐ. true๋ฉด ๋ถ€ํŒ… ๋•Œ ๋งŒ๋“ ๋‹ค (๊ธฐ๋ณธ false)
SUDAM_SEED_ENABLED=
# ์‹œ๋“œ ์„ ์ƒ๋‹˜ ์นด์นด์˜ค ํšŒ์›๋ฒˆํ˜ธ. ๋น„์šฐ๋ฉด ๊ฐ€์งœ ๊ณ„์ • seed-teacher-1
Expand Down
80 changes: 80 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: CI # dev๋กœ ๋จธ์ง€๋˜๊ธฐ ์ „์— ํ…Œ์ŠคํŠธ๋กœ ๊ฒ€์ฆํ•˜๋Š” ์›Œํฌํ”Œ๋กœ

on:
pull_request:
branches: [ "dev" ] # dev๋ฅผ ๋Œ€์ƒ์œผ๋กœ ํ•˜๋Š” PR์—์„œ ์‹คํ–‰

permissions:
contents: read # ์˜ค์ง ์ฝ๊ธฐ ๊ถŒํ•œ๋งŒ ๋ถ€์—ฌ

jobs:
test:
runs-on: ubuntu-latest

# @SpringBootTest๊ฐ€ ๋œจ๋ ค๋ฉด DB์™€ Redis๊ฐ€ ๋–  ์žˆ์–ด์•ผ ํ•œ๋‹ค.
# runner์˜ localhost๋กœ ํฌํŠธ๊ฐ€ ์—ด๋ ค application-local.yaml(Redis localhost:6379)๊ณผ ์•„๋ž˜ DB_URL์— ๊ทธ๋Œ€๋กœ ๋งž๋Š”๋‹ค.
services:
mysql:
image: mysql:8.0 # ์ž ๊ธˆ/๊ฒฉ๋ฆฌ ์ˆ˜์ค€ ๋™์ž‘์ด ๋ฒ„์ „์— ๋”ฐ๋ผ ๋‹ฌ๋ผ ๋กœ์ปฌ๊ณผ ๊ฐ™์€ ๋ฒ„์ „์œผ๋กœ ๊ณ ์ •
env:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: sudam_test
ports:
- 3306:3306
# ์ปจํ…Œ์ด๋„ˆ๊ฐ€ ๋– ๋„ MySQL์ด ์ ‘์†์„ ๋ฐ›๊ธฐ๊นŒ์ง€๋Š” ์‹œ๊ฐ„์ด ๊ฑธ๋ฆฌ๋ฏ€๋กœ ์ค€๋น„๋  ๋•Œ๊นŒ์ง€ ๊ธฐ๋‹ค๋ฆฐ๋‹ค
options: >-
--health-cmd="mysqladmin ping -h 127.0.0.1 -uroot -proot"
--health-interval=10s
--health-timeout=5s
--health-retries=10

redis:
image: redis:7-alpine
ports:
- 6379:6379
options: >-
--health-cmd="redis-cli ping"
--health-interval=10s
--health-timeout=5s
--health-retries=10

# .env๋Š” ์ €์žฅ์†Œ์— ์—†์œผ๋ฏ€๋กœ(gitignore) ํ”Œ๋ ˆ์ด์Šคํ™€๋”๋ฅผ ์ฑ„์šธ ๊ฐ’์„ ์ง์ ‘ ๋„ฃ๋Š”๋‹ค.
# ์ „๋ถ€ ํ…Œ์ŠคํŠธ ์ „์šฉ ๋”๋ฏธ์ด๋ฉฐ ์šด์˜ ๊ฐ’๊ณผ ๋ฌด๊ด€ํ•˜๋‹ค.
env:
DB_URL: jdbc:mysql://localhost:3306/sudam_test
DB_USERNAME: root
DB_PASSWORD: root
JWT_SECRET: ci-dummy-jwt-secret-key-not-for-production-use
KAKAO_CLIENT_ID: ci-dummy-kakao-client-id
KAKAO_CLIENT_SECRET: ci-dummy-kakao-client-secret
# Base64๋กœ ์ธ์ฝ”๋”ฉํ•œ 32๋ฐ”์ดํŠธ์—ฌ์•ผ ๊ธฐ๋™๋œ๋‹ค (AccountNumberConverter๊ฐ€ ๊ธฐ๋™ ์‹œ ๊ธธ์ด๋ฅผ ๊ฒ€์‚ฌ)
ACCOUNT_ENCRYPTION_KEY: Y2ktZHVtbXktYWNjb3VudC1lbmNyeXB0aW9uLWtleSE=

steps:
# PR์˜ ์†Œ์Šค ์ฝ”๋“œ๋ฅผ runner ๋จธ์‹  (์—ฌ๊ธฐ์„œ๋Š” ubuntu-latest)์œผ๋กœ ๋‚ด๋ ค๋ฐ›๋Š”๋‹ค.
- name: Checkout source code
uses: actions/checkout@v7

# ํ”„๋กœ์ ํŠธ๋ฅผ ๋นŒ๋“œํ•˜๊ณ  ํ…Œ์ŠคํŠธํ•  ์ˆ˜ ์žˆ๋„๋ก JDK 21์„ ์„ค์น˜ํ•œ๋‹ค.
- name: Set up JDK 21
uses: actions/setup-java@v6
with:
java-version: '21'
distribution: 'temurin'

# ์‹คํ–‰ ํ™˜๊ฒฝ์„ ์ค€๋น„ํ•˜๊ณ  ์˜์กด์„ฑ ์บ์‹œ๋ฅผ ์„ค์ •ํ•ด ๋‹ค์Œ ์‹คํ–‰๋ถ€ํ„ฐ ๋นŒ๋“œ๋ฅผ ๋น ๋ฅด๊ฒŒ ํ•œ๋‹ค.
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v6

# ์œ ๋‹› ํ…Œ์ŠคํŠธ์™€ ํ†ตํ•ฉ ํ…Œ์ŠคํŠธ๋ฅผ ํฌํ•จํ•œ ์ „์ฒด ํ…Œ์ŠคํŠธ๋ฅผ ์‹คํ–‰ํ•ด PR ์ฝ”๋“œ๋ฅผ ๊ฒ€์ฆํ•œ๋‹ค.
- name: Run tests
run: ./gradlew test

# ํ…Œ์ŠคํŠธ๊ฐ€ ์‹คํŒจํ–ˆ์„ ๊ฒฝ์šฐ HTML ํ…Œ์ŠคํŠธ ๋ฆฌํฌํŠธ๋ฅผ ์•„ํ‹ฐํŒฉํŠธ๋กœ ์˜ฌ๋ ค 7์ผ๊ฐ„ ๋‚ด๋ ค๋ฐ›์•„ ๋ณผ ์ˆ˜ ์žˆ๊ฒŒ ํ•œ๋‹ค.
- name: Upload test report
if: failure()
uses: actions/upload-artifact@v4
with:
name: test-report
path: build/reports/tests/test
retention-days: 7
116 changes: 116 additions & 0 deletions .github/workflows/dev-deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: Deploy (dev) # dev ๋ฐ˜์˜๋œ ์ฝ”๋“œ๋ฅผ EC2์— ๋ฐฐํฌํ•˜๋Š” ์›Œํฌํ”Œ๋กœ

# ํ…Œ์ŠคํŠธ ๊ฒ€์ฆ์€ PR ๋‹จ๊ณ„์˜ ci.yaml์ด ๋‹ด๋‹นํ•˜๋ฏ€๋กœ ์—ฌ๊ธฐ์„œ๋Š” ๋นŒ๋“œ์™€ ๋ฐฐํฌ๋งŒ ํ•œ๋‹ค.
on:
push:
branches: [ "dev" ] # ์ง์ ‘ push์™€ PR ๋จธ์ง€ ๋ชจ๋‘ push ์ด๋ฒคํŠธ๋กœ ์‹คํ–‰๋œ๋‹ค

# ์›Œํฌ ํ”Œ๋กœ์— ์ฝ”๋“œ ์ฝ๊ธฐ ๊ถŒํ•œ๋งŒ ๋ถ€์—ฌ (์ตœ์†Œ ๊ถŒํ•œ)
permissions:
contents: read

# ๋ฐฐํฌ๋ฅผ ํ•œ ๋ฒˆ์— ํ•˜๋‚˜์”ฉ ์ˆœ์„œ๋Œ€๋กœ ์‹คํ–‰ํ•œ๋‹ค. ์—ฐ๋‹ฌ์•„ ๋จธ์ง€ํ•ด๋„ ์ด์ „ ์ปค๋ฐ‹์ด ๋‚˜์ค‘์— ์˜ฌ๋ผ๊ฐ€์ง€ ์•Š๋Š”๋‹ค.
concurrency:
group: dev-deploy
cancel-in-progress: false

# ๋ชจ๋“  job์—์„œ ๊ณต์œ ํ•˜๋Š” ๊ฐ’ (ํƒœ๊ทธ์— ์ปค๋ฐ‹ SHA๋ฅผ ๋„ฃ์–ด ๋ฐฐํฌ ๋ฒ„์ „ ์ถ”์ )
env:
IMAGE_NAME: ${{ vars.DOCKER_IMAGE_NAME }}
IMAGE_TAG: dev-${{ github.sha }}

jobs:
# 1๋‹จ๊ณ„: ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ๋นŒ๋“œ ํ›„ Docker ์ด๋ฏธ์ง€๋ฅผ Docker Hub์— push
build-and-push:
runs-on: ubuntu-latest
steps:
# ์ €์žฅ์†Œ ์ฝ”๋“œ๋ฅผ runner๋กœ ๊ฐ€์ ธ์˜ด
- name: Checkout source code
uses: actions/checkout@v7

# JDK 21 ์„ค์น˜
- name: Set up JDK 21
uses: actions/setup-java@v6
with:
java-version: '21'
distribution: 'temurin'

# Gradle ์‹คํ–‰ ํ™˜๊ฒฝ ๊ตฌ์„ฑ + ์˜์กด์„ฑ ์บ์‹ฑ
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v6

# ์‹คํ–‰ ๊ฐ€๋Šฅํ•œ Spring Boot jar ์ƒ์„ฑ
- name: Build with Gradle
run: ./gradlew bootJar

# Secrets์— ์ €์žฅํ•œ ๊ณ„์ •์œผ๋กœ Docker Hub ๋กœ๊ทธ์ธ
- name: Login to Docker Hub
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

# Dockerfile๋กœ ์ด๋ฏธ์ง€๋ฅผ ๋งŒ๋“ค๊ณ  Docker Hub์— ์—…๋กœ๋“œ
- name: Build and push image
run: |
docker build -t "$IMAGE_NAME:$IMAGE_TAG" .
docker push "$IMAGE_NAME:$IMAGE_TAG"

# 2๋‹จ๊ณ„: EC2์— ์ ‘์†ํ•ด ์ƒˆ ์ด๋ฏธ์ง€๋กœ ์ปจํ…Œ์ด๋„ˆ ๊ต์ฒด
deploy:
needs: build-and-push # build-and-push๊ฐ€ ์„ฑ๊ณตํ•ด์•ผ ์‹คํ–‰
runs-on: ubuntu-latest
steps:

# ์•„๋ž˜ scp ๋‹จ๊ณ„๋ฅผ ์œ„ํ•ด์„œ ์ฝ”๋“œ๋ฅผ ๊ฐ€์ ธ์˜จ๋‹ค.
- name: Checkout source code
uses: actions/checkout@v7

# EC2์— compose ํŒŒ์ผ ๋ณต์‚ฌ
- name: Copy compose files to EC2
uses: appleboy/scp-action@v1
with:
host: ${{ secrets.EC2_HOST }}
username: ubuntu
key: ${{ secrets.EC2_KEY }}
source: "docker-compose.yaml"
target: "/home/ubuntu/app"

# EC2์—์„œ ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ์‹คํ–‰
- name: Deploy to EC2
uses: appleboy/ssh-action@v1
env:
ENV_VARS: ${{ secrets.ENV_VARS }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
with:
host: ${{ secrets.EC2_HOST }}
username: ubuntu
key: ${{ secrets.EC2_KEY }}
# ์ง€์ •ํ•œ ํ™˜๊ฒฝ๋ณ€์ˆ˜๋ฅผ EC2 ์ชฝ ์Šคํฌ๋ฆฝํŠธ๋กœ ์ „๋‹ฌ
envs: ENV_VARS,IMAGE_NAME,IMAGE_TAG,DOCKER_USERNAME,DOCKER_PASSWORD
script: |

# ๋ช…๋ น์ด ํ•˜๋‚˜๋ผ๋„ ์‹คํŒจํ•˜๋ฉด ์ฆ‰์‹œ ์ค‘๋‹จ
set -e

# ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ๋ฐฐํฌ ๋””๋ ‰ํ† ๋ฆฌ๋กœ ์ด๋™
cd /home/ubuntu/app

# ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ์‹คํ–‰์— ํ•„์š”ํ•œ ํ™˜๊ฒฝ๋ณ€์ˆ˜ ํŒŒ์ผ์„ ์ƒ์„ฑ (๋น„๋ฐ€ ๊ฐ’์ด๋ฏ€๋กœ ์†Œ์œ ์ž๋งŒ ์ฝ๋„๋ก 600)
umask 077
printf '%s\n' "$ENV_VARS" > .env
chmod 600 .env

# Docker Hub ์ €์žฅ์†Œ๊ฐ€ private์ด์–ด๋„ pullํ•  ์ˆ˜ ์žˆ๋„๋ก ๋กœ๊ทธ์ธ (DOCKER_PASSWORD๋Š” ์ฝ๊ธฐ ์ „์šฉ ์•ก์„ธ์Šค ํ† ํฐ ๊ถŒ์žฅ)
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

# ์ƒˆ ์ด๋ฏธ์ง€ pull. ์‹คํŒจํ•ด๋„ ์ธ์ฆ ์ •๋ณด๊ฐ€ EC2(~/.docker/config.json)์— ๋‚จ์ง€ ์•Š๊ฒŒ ๋กœ๊ทธ์•„์›ƒํ•œ๋‹ค
docker compose pull spring-app || { docker logout; exit 1; }
docker logout

# ๋ณ€๊ฒฝ๋œ ์ด๋ฏธ์ง€๋กœ ์ปจํ…Œ์ด๋„ˆ ๊ต์ฒด
docker compose up -d

# ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” ์ด์ „ ์ด๋ฏธ์ง€ ์ •๋ฆฌ
docker image prune -af
15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM eclipse-temurin:21-jre-alpine

# ์ปจํ…Œ์ด๋„ˆ ์‹œ๊ฐ์„ ํ•œ๊ตญ ์‹œ๊ฐ„์œผ๋กœ ๋งž์ถ˜๋‹ค (๋กœ๊ทธ ยท LocalDateTime.now)
ENV TZ=Asia/Seoul
RUN apk add --no-cache tzdata

# root๊ฐ€ ์•„๋‹Œ ์‚ฌ์šฉ์ž๋กœ ์‹คํ–‰ํ•œ๋‹ค
RUN addgroup -S spring && adduser -S spring -G spring

# CI์—์„œ ./gradlew bootJar๋กœ ๋งŒ๋“  ์‹คํ–‰ jar (plain jar๋Š” build.gradle์—์„œ ๋งŒ๋“ค์ง€ ์•Š๋Š”๋‹ค)
COPY build/libs/*.jar app.jar

USER spring:spring

ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.jar"]
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ dependencies {
tasks.named('test') {
useJUnitPlatform()
}

// ์‹คํ–‰ jar(bootJar)๋งŒ ๋งŒ๋“ ๋‹ค. plain jar๊ฐ€ ํ•จ๊ป˜ ์ƒ๊ธฐ๋ฉด Dockerfile์˜ COPY build/libs/*.jar๊ฐ€ ํŒŒ์ผ ๋‘ ๊ฐœ์™€ ๋งค์นญ๋ผ ์‹คํŒจํ•œ๋‹ค.
tasks.named('jar') {
enabled = false
}
45 changes: 45 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: sudam-app

services:
# Spring Boot ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ (DB๋Š” ์™ธ๋ถ€ RDS๋ฅผ ์‚ฌ์šฉํ•˜๋ฏ€๋กœ ์ปจํ…Œ์ด๋„ˆ๋กœ ๋„์šฐ์ง€ ์•Š์Œ)
spring-app:
# CD(dev-deploy.yaml)๊ฐ€ ์ „๋‹ฌํ•˜๋Š” IMAGE_NAME / IMAGE_TAG ๋กœ ๊ต์ฒด๋จ
image: ${IMAGE_NAME}:${IMAGE_TAG}
container_name: spring-app
# .env.example์˜ ํ‚ค(DB_*, KAKAO_*, JWT_SECRET, ACCOUNT_ENCRYPTION_KEY, APP_BASE_URL, FRONT_BASE_URL)๋ฅผ ์ฃผ์ž…
env_file:
- .env
environment:
# application-dev.yaml ์ ์šฉ (ddl-auto: update, Redis ํ˜ธ์ŠคํŠธ, ๋„๋ฉ”์ธ ๊ธฐ์ค€ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ URI)
SPRING_PROFILES_ACTIVE: dev
TZ: Asia/Seoul
# Nginx๋งŒ ์ ‘๊ทผํ•˜๋„๋ก ํ˜ธ์ŠคํŠธ์˜ ๋ฃจํ”„๋ฐฑ์—๋งŒ ์—ฐ๋‹ค (์™ธ๋ถ€์—์„œ 8080 ์ง์ ‘ ์ ‘๊ทผ ๋ถˆ๊ฐ€)
ports:
- "127.0.0.1:8080:8080"
depends_on:
redis:
condition: service_healthy
restart: unless-stopped
logging:
driver: json-file
options:
max-size: "10m"
max-file: "3"

# ๋ฆฌํ”„๋ ˆ์‹œ ํ† ํฐ(rt:{userId}) ยท ์•ก์„ธ์Šค ํ† ํฐ ์ฐจ๋‹จ ๋ชฉ๋ก(bl:{jti}) ์ €์žฅ์†Œ. ์™ธ๋ถ€ ๋…ธ์ถœ ์—†์ด ๋‚ด๋ถ€ ๋„คํŠธ์›Œํฌ๋กœ๋งŒ ์ ‘๊ทผ
redis:
image: redis:7-alpine
container_name: redis
# ์žฌ์‹œ์ž‘ํ•ด๋„ ๋กœ๊ทธ์ธ ์„ธ์…˜์ด ์œ ์ง€๋˜๋„๋ก AOF๋กœ ๋””์Šคํฌ์— ๋‚จ๊ธด๋‹ค
command: ["redis-server", "--appendonly", "yes"]
volumes:
- redis-data:/data
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 10s
timeout: 3s
retries: 5
restart: unless-stopped

volumes:
redis-data:
2 changes: 1 addition & 1 deletion docs/api-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
| `POST` | `/api/v1/auth/logout` | ๋กœ๊ทธ์•„์›ƒ |

**์นด์นด์˜ค ์ฝœ๋ฐฑ** โ€” ํ•„์ˆ˜ ๋™์˜: `profile_nickname`, `account_email` (๋ˆ„๋ฝ ์‹œ `AUTH401_1`). ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ ๋Œ€์ƒ์€ `app.oauth2.success-redirect-uri` / `failure-redirect-uri`.
- ์„ฑ๊ณต: `302 {์„ฑ๊ณต URI}#accessToken={AT}` + `Set-Cookie: refreshToken={RT}; Path=/; Max-Age=1209600; HttpOnly; SameSite=Lax`
- ์„ฑ๊ณต: `302 {์„ฑ๊ณต URI}#accessToken={AT}` + `Set-Cookie: refreshToken={RT}; Path=/; Max-Age=1209600; HttpOnly; SameSite=Lax` (๊ฐœ๋ฐœ ์„œ๋ฒ„๋Š” `Secure` ์ถ”๊ฐ€)
- ์‹คํŒจ: `302 {์‹คํŒจ URI}#code={์—๋Ÿฌ ์ฝ”๋“œ}`

**์ธ์ฆ ํ•„ํ„ฐ** โ€” ์„œ๋ช… ยท ๋งŒ๋ฃŒ ยท `typ=access` ํ™•์ธ ํ›„ `jti`๊ฐ€ Redis ์ฐจ๋‹จ ๋ชฉ๋ก(`bl:{jti}`)์— ์žˆ๋Š”์ง€ ๋ณธ๋‹ค. AT 30๋ถ„ / RT 14์ผ.
Expand Down
3 changes: 1 addition & 2 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ GET /api/v1/users/me/settings profile ยท provider๋งŒ DB ๊ฐ’, ์†Œ๊ฐœ์„œ

- ๋‹ค์ค‘ ๊ธฐ๊ธฐ ๋กœ๊ทธ์ธ โ€” `rt:{userId}`๊ฐ€ ํšŒ์›๋‹น 1๊ฐœ๋ผ ๋‘ ๋ฒˆ์งธ ๋กœ๊ทธ์ธ์ด ์ฒซ ์„ธ์…˜์„ ๋Š๋Š”๋‹ค.
- ํƒˆํ‡ด ๋ณด๊ฐ• โ€” ์นด์นด์˜ค unlink, ์žฌ๊ฐ€์ž… ์ œํ•œ, ํƒ€ ๋„๋ฉ”์ธ ์—ฐ๋ฝ์ฒ˜ ์ •๋ฆฌ.
- ์šด์˜ ํ”„๋กœํŒŒ์ผ โ€” `application-prod.yaml`, `ddl-auto` ์ „๋žต, ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ ๋„๊ตฌ, ์ฟ ํ‚ค `secure` / `SameSite=None` ์ „ํ™˜.
- CORS โ€” `SecurityConfig`์— ์„ค์ • ์—†์Œ.
- ์šด์˜ ํ”„๋กœํŒŒ์ผ โ€” `application-prod.yaml`, `ddl-auto` ์ „๋žต, ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ ๋„๊ตฌ. ๊ฐœ๋ฐœ ์„œ๋ฒ„๋Š” `application-dev.yaml`(`ddl-auto: update`, ์ฟ ํ‚ค `Secure`, ๋„๋ฉ”์ธ ๊ธฐ์ค€ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ ยท CORS ์ถœ์ฒ˜)์„ ์“ด๋‹ค.
- ERD์˜ ์ƒ์„ฑ ์ปฌ๋Ÿผ + ์œ ์ผ ์ œ์•ฝ โ€” `ddl-auto`๋กœ ๋งŒ๋“ค ์ˆ˜ ์—†์–ด ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ ๋„๊ตฌ ๋„์ž… ์ „๊นŒ์ง€ ์„œ๋น„์Šค์—์„œ ๋ณด์žฅํ•œ๋‹ค.
- ๊ณผ์™ธ ยท ์ฐธ์—ฌ์ž ยท ๊ต์œก๋น„ API โ€” ์—”ํ‹ฐํ‹ฐ๋งŒ ์žˆ๊ณ  ์ปจํŠธ๋กค๋Ÿฌ ยท ์„œ๋น„์Šค๋Š” ์•„์ง ์—†๋‹ค. ์ •์‚ฐ์€ ์ˆ˜์—… ๊ธฐ๋ก ์ €์žฅ์ด ๊ฐ™์€ ํŠธ๋žœ์žญ์…˜์—์„œ ์‹คํ–‰ํ•œ๋‹ค (`RecordService` โ†’ `SettlementService.settleIfReached`).
Empty file modified gradlew
100644 โ†’ 100755
Empty file.
31 changes: 31 additions & 0 deletions src/main/java/com/sudam/global/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,22 @@
import com.sudam.global.security.token.TokenStore;
import com.sudam.global.security.util.JwtUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;

import java.util.List;

@Configuration
@EnableWebSecurity
Expand All @@ -43,6 +51,9 @@ public class SecurityConfig {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
return http
// ์•„๋ž˜ corsConfigurationSource ๋นˆ์„ ์“ด๋‹ค. ํ”„๋ฆฌํ”Œ๋ผ์ดํŠธ(OPTIONS)๋Š” ์ธ์ฆ ๊ฒ€์‚ฌ ์ „์— ์—ฌ๊ธฐ์„œ ์‘๋‹ตํ•œ๋‹ค.
.cors(Customizer.withDefaults())

.csrf(AbstractHttpConfigurer::disable)

.httpBasic(AbstractHttpConfigurer::disable)
Expand All @@ -68,4 +79,24 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {

.build();
}

/***
* ํ•จ์ˆ˜ ๊ธฐ๋Šฅ: ํ”„๋ก ํŠธ ์ถœ์ฒ˜์—์„œ ์˜ค๋Š” ์š”์ฒญ์„ ํ—ˆ์šฉํ•˜๋Š” CORS ์„ค์ •์„ ๋งŒ๋“ ๋‹ค.
* RT ์ฟ ํ‚ค(์žฌ๋ฐœ๊ธ‰ ยท ๋กœ๊ทธ์•„์›ƒ)๋ฅผ ์ฃผ๊ณ ๋ฐ›์•„์•ผ ํ•˜๋ฏ€๋กœ ์ž๊ฒฉ ์ฆ๋ช…์„ ํ—ˆ์šฉํ•˜๊ณ , ๊ทธ๋ž˜์„œ ์ถœ์ฒ˜๋Š” "*"๊ฐ€ ์•„๋‹ˆ๋ผ ๋ชฉ๋ก์œผ๋กœ ์ง€์ •ํ•œ๋‹ค.
* @param allowedOrigins ํ—ˆ์šฉํ•  ํ”„๋ก ํŠธ ์ถœ์ฒ˜ (ํ”„๋กœํŒŒ์ผ๋ณ„ app.cors.allowed-origins)
* @return ๋ชจ๋“  ๊ฒฝ๋กœ์— ์ ์šฉ๋˜๋Š” CORS ์„ค์ •
*/
@Bean
public CorsConfigurationSource corsConfigurationSource(
@Value("${app.cors.allowed-origins}") List<String> allowedOrigins) {
CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(allowedOrigins);
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
configuration.setAllowedHeaders(List.of(HttpHeaders.AUTHORIZATION, HttpHeaders.CONTENT_TYPE));
configuration.setAllowCredentials(true);

UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", configuration);
return source;
}
}
Loading
Loading