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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ public CorsConfigurationSource corsConfigurationSource() {
config.setAllowedOrigins(Arrays.asList(CORS_ALLOWED_ORIGINS));
config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"));
config.setAllowedHeaders(
List.of("Authorization", "Content-Type", API_KEY_HEADER, SERVICE_NAME_HEADER));
List.of(
"Authorization",
"Content-Type",
"api-key",
"session-id",
API_KEY_HEADER,
SERVICE_NAME_HEADER));
config.setAllowCredentials(true);
config.setMaxAge(3600L);

Expand Down

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

쿠키 이름들이 여러 메서드에 흩어져서 선언돼있는데 공통 상수로 추출할 수 있지 않을까 합니다!

CookieFactory.java:13 "refreshToken"
AdminAuthController.java:34
AuthController.java:43

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.sopt.makers.api.common.factory;

import static org.sopt.makers.api.common.security.CookieConstant.ADMIN_REFRESH_TOKEN_COOKIE;

import java.time.Duration;
import lombok.RequiredArgsConstructor;
import org.sopt.makers.api.common.config.SecurityProperty;
Expand All @@ -10,17 +12,20 @@
@Component
@RequiredArgsConstructor
public class CookieFactory {
private static final String REFRESH_TOKEN_COOKIE_NAME = "refreshToken";
private static final String COOKIE_DOMAIN = ".sopt.org";
private static final String SAME_SITE_NONE = "None";
private static final String ROOT_PATH = "/";

private final SecurityProperty securityProperty;

public HttpHeaders setRefreshToken(final String refreshToken) {
return setRefreshToken(refreshToken, ADMIN_REFRESH_TOKEN_COOKIE);
}

public HttpHeaders setRefreshToken(final String refreshToken, final String cookieName) {
long durationSeconds = securityProperty.jwt().secret().expiration().refreshTokenExpiration();
ResponseCookie cookie =
ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken)
ResponseCookie.from(cookieName, refreshToken)
.httpOnly(true)
.secure(true)
.sameSite(SAME_SITE_NONE)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package org.sopt.makers.api.common.security;

public final class CookieConstant {
public static final String AUTH_REFRESH_TOKEN_COOKIE = "Refresh-Token";
public static final String ADMIN_REFRESH_TOKEN_COOKIE = "refreshToken";

private CookieConstant() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ private SecurityConstant() {}
"http://localhost:5173",
"https://sopt-internal-dev.sopt.org",
"https://playground.sopt.org",
"https://sopt.org",
"https://www.sopt.org",
"https://www.dev.sopt.org",
"https://admins.sopt.org",
"https://dev.admins.sopt.org",
Comment on lines +24 to +28

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

공홈 Origin인 https://www.sopt.org가 포함돼야 하지 않나요??

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아이쿠

"https://sopt-auth-frontend-test.pages.dev",
"https://sopt-org-frontend-git-test-daeuns-projects-025386f4.vercel.app",
"https://sopt-operation-frontend-3yc.pages.dev"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.sopt.makers.api.controller.admin.auth;

import static org.sopt.makers.api.common.security.CookieConstant.ADMIN_REFRESH_TOKEN_COOKIE;
import static org.sopt.makers.api.controller.admin.auth.AdminAuthSuccessCode.SUCCESS_CHANGE_PASSWORD;
import static org.sopt.makers.api.controller.admin.auth.AdminAuthSuccessCode.SUCCESS_LOGIN;
import static org.sopt.makers.api.controller.admin.auth.AdminAuthSuccessCode.SUCCESS_REFRESH_TOKEN;
Expand Down Expand Up @@ -31,8 +32,6 @@
@RequestMapping("/api/v1/auth")
public class AdminAuthController implements AdminAuthApi {

private static final String REFRESH_TOKEN_COOKIE = "refreshToken";

private final AdminAuthService adminAuthService;
private final CookieFactory cookieFactory;

Expand All @@ -49,7 +48,7 @@ public ResponseEntity<BaseResponse<?>> login(
@Override
@PatchMapping("/refresh")
public ResponseEntity<BaseResponse<?>> refresh(
@CookieValue(value = REFRESH_TOKEN_COOKIE) String refreshToken) {
@CookieValue(value = ADMIN_REFRESH_TOKEN_COOKIE) String refreshToken) {
AdminTokenPair tokenPair = adminAuthService.refresh(refreshToken);
HttpHeaders headers = cookieFactory.setRefreshToken(tokenPair.refreshToken());
return ResponseFactory.success(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.sopt.makers.api.controller.auth;

import static org.sopt.makers.api.common.security.CookieConstant.AUTH_REFRESH_TOKEN_COOKIE;
import static org.sopt.makers.api.controller.auth.AuthSuccessCode.CREATE_PHONE_VERIFICATION;
import static org.sopt.makers.api.controller.auth.AuthSuccessCode.LOGIN;
import static org.sopt.makers.api.controller.auth.AuthSuccessCode.REFRESH_TOKEN;
Expand Down Expand Up @@ -40,8 +41,6 @@
@RequiredArgsConstructor
public class AuthController implements AuthApi {

private static final String REFRESH_TOKEN_COOKIE = "refreshToken";

private final AuthFacade authFacade;
private final CookieFactory cookieFactory;

Expand Down Expand Up @@ -69,7 +68,8 @@ public ResponseEntity<BaseResponse<?>> verifyPhoneVerification(
public ResponseEntity<BaseResponse<?>> loginFromWeb(@RequestBody LoginRequest request) {
OAuthPlatform platform = OAuthPlatform.find(request.authPlatform());
AuthFacade.LoginResult result = authFacade.login(request.token(), platform);
HttpHeaders headers = cookieFactory.setRefreshToken(result.refreshToken());
HttpHeaders headers =
cookieFactory.setRefreshToken(result.refreshToken(), AUTH_REFRESH_TOKEN_COOKIE);
return ResponseFactory.success(LOGIN, headers, LoginForWebResponse.from(result));
}

Expand All @@ -93,12 +93,13 @@ public ResponseEntity<BaseResponse<?>> signUp(@RequestBody SignUpRequest request
@PostMapping("/refresh/web")
public ResponseEntity<BaseResponse<?>> refreshFromWeb(
@RequestHeader(HttpHeaders.AUTHORIZATION) String accessToken,
@CookieValue(value = REFRESH_TOKEN_COOKIE, required = false) String refreshToken) {
@CookieValue(value = AUTH_REFRESH_TOKEN_COOKIE, required = false) String refreshToken) {
if (refreshToken == null) {
throw new AuthException(REFRESH_TOKEN_NOT_FOUND);
}
TokenIssuerPort.TokenPair tokenPair = authFacade.refresh(accessToken, refreshToken);
HttpHeaders headers = cookieFactory.setRefreshToken(tokenPair.refreshToken());
HttpHeaders headers =
cookieFactory.setRefreshToken(tokenPair.refreshToken(), AUTH_REFRESH_TOKEN_COOKIE);
return ResponseFactory.success(REFRESH_TOKEN, headers, RefreshForWebResponse.from(tokenPair));
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sopt.makers.api.controller.auth;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.sopt.makers.api.controller.auth.dto.GetSocialAccountPlatformRequest;
import org.sopt.makers.api.controller.auth.dto.UpdateSocialAccountRequest;
import org.sopt.makers.core.response.BaseResponse;
import org.springframework.http.ResponseEntity;
Expand All @@ -11,7 +11,9 @@
public interface SocialAccountApi {

@Operation(summary = "소셜 플랫폼 조회")
ResponseEntity<BaseResponse<?>> getSocialPlatform(GetSocialAccountPlatformRequest request);
ResponseEntity<BaseResponse<?>> getSocialPlatform(
@Parameter(description = "이름", required = false) String name,
@Parameter(description = "전화번호", required = true) String phone);

@Operation(summary = "소셜 계정 변경")
ResponseEntity<BaseResponse<?>> updateSocialAccount(UpdateSocialAccountRequest request);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.sopt.makers.api.common.factory.ResponseFactory;
import org.sopt.makers.api.controller.auth.dto.GetSocialAccountPlatformRequest;
import org.sopt.makers.api.controller.auth.dto.SocialAccountPlatformResponse;
import org.sopt.makers.api.controller.auth.dto.UpdateSocialAccountRequest;
import org.sopt.makers.core.response.BaseResponse;
import org.sopt.makers.core.type.OAuthPlatform;
import org.sopt.makers.domain.auth.facade.AuthFacade;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@RestController
Expand All @@ -27,10 +27,11 @@ public class SocialAccountController implements SocialAccountApi {
private final AuthFacade authFacade;

@Override
@PostMapping("/platform")
@GetMapping("/platform")
public ResponseEntity<BaseResponse<?>> getSocialPlatform(
@Valid @RequestBody GetSocialAccountPlatformRequest request) {
OAuthPlatform platform = authFacade.getSocialPlatform(request.phone());
@RequestParam(value = "name", required = false) String name,
@RequestParam("phone") String phone) {
OAuthPlatform platform = authFacade.getSocialPlatform(phone);
return ResponseFactory.success(
GET_SOCIAL_ACCOUNT_PLATFORM, new SocialAccountPlatformResponse(platform.name()));
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package org.sopt.makers.api.common.config;

import static org.assertj.core.api.Assertions.assertThat;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.http.HttpHeaders;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.cors.DefaultCorsProcessor;

class CorsConfigTest {
@ParameterizedTest
@ValueSource(
strings = {
"https://sopt.org",
"https://www.sopt.org",
"https://www.dev.sopt.org",
"https://admins.sopt.org",
"https://dev.admins.sopt.org"
})
@DisplayName("공식 홈페이지와 관리자 페이지의 API 키 사전 요청을 허용한다")
void allowsPageOrigins(String origin) throws Exception {
MockHttpServletRequest request = preflight(origin);
MockHttpServletResponse response = new MockHttpServletResponse();

boolean allowed =
new DefaultCorsProcessor()
.processRequest(
new CorsConfig().corsConfigurationSource().getCorsConfiguration(request),
request,
response);

assertThat(allowed).isTrue();
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).isEqualTo(origin);
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS))
.containsIgnoringCase("api-key")
.containsIgnoringCase("X-Api-Key")
.containsIgnoringCase("X-Service-Name")
.containsIgnoringCase("Authorization");
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)).isEqualTo("true");
}

@Test
@DisplayName("공식 홈페이지의 솝트스토리 조회에 세션 ID 헤더를 허용한다")
void allowsSessionIdHeader() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/v2/soptstory");
request.addHeader(HttpHeaders.ORIGIN, "https://www.sopt.org");
request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS, "session-id");
MockHttpServletResponse response = new MockHttpServletResponse();

boolean allowed =
new DefaultCorsProcessor()
.processRequest(
new CorsConfig().corsConfigurationSource().getCorsConfiguration(request),
request,
response);

assertThat(allowed).isTrue();
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN))
.isEqualTo("https://www.sopt.org");
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS))
.containsIgnoringCase("session-id");
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS)).contains("GET");
}

@Test
@DisplayName("등록되지 않은 도메인의 사전 요청을 차단한다")
void rejectsUnknownOrigin() throws Exception {
MockHttpServletRequest request = preflight("https://unregistered.example.com");
MockHttpServletResponse response = new MockHttpServletResponse();

boolean allowed =
new DefaultCorsProcessor()
.processRequest(
new CorsConfig().corsConfigurationSource().getCorsConfiguration(request),
request,
response);

assertThat(allowed).isFalse();
assertThat(response.getStatus()).isEqualTo(403);
assertThat(response.getHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).isNull();
}

private MockHttpServletRequest preflight(String origin) {
MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/v2/admin");
request.addHeader(HttpHeaders.ORIGIN, origin);
request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST");
request.addHeader(
HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type, Authorization, api-key, X-Api-Key, X-Service-Name");
return request;
}
}
Loading
Loading