코드 병합

src/main/java/com/oronaminc/join/member/security/SecurityConfig.java

@@ -61,7 +61,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowCredentials(true);
-        configuration.setAllowedOriginPatterns(List.of("*"));
+        configuration.setAllowedOriginPatterns(List.of("http://localhost:5173"));
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS"));
         configuration.setAllowedHeaders(List.of("*"));
 

src/main/java/com/oronaminc/join/websocket/api/QuestionWebsocketController.java

@@ -6,12 +6,14 @@
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.messaging.handler.annotation.SendTo;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 
 import com.oronaminc.join.global.exception.ErrorCode;
 import com.oronaminc.join.global.exception.ErrorException;
 import com.oronaminc.join.global.ratelimit.RateLimitService;
 import com.oronaminc.join.global.ratelimit.RateLimitType;
+import com.oronaminc.join.member.security.MemberDetails;
 import com.oronaminc.join.question.domain.Question;
 import com.oronaminc.join.question.dto.QuestionCreateResponse;
 import com.oronaminc.join.question.dto.QuestionDeleteResponse;
@@ -41,8 +43,10 @@ public QuestionCreateResponse createQuestion(
         Principal principal
     ) {
         log.debug("수신한 메시지 = {}", request.content());
+        log.debug("principal = {}", principal);
 
-        Long memberId = Long.valueOf(principal.getName());
+        MemberDetails memberDetails = (MemberDetails)((Authentication)principal).getPrincipal();
+        Long memberId = Long.valueOf(memberDetails.getId());
 
         log.debug("회원 아이디 = {}", memberId);
 
@@ -66,6 +70,7 @@ public QuestionUpdateResponse updateQuestion(
         @Payload @Valid QuestionRequest request,
         Principal principal
     ) {
+
         Long memberId = Long.valueOf(principal.getName());
 
         Question updated = questionService.update(memberId, roomId, questionId, request);

src/main/java/com/oronaminc/join/websocket/config/StompAuthChannelInterceptor.java

@@ -0,0 +1,29 @@
+package com.oronaminc.join.websocket.config;
+
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.stomp.StompCommand;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StompAuthChannelInterceptor implements ChannelInterceptor {
+    @Override
+    public Message<?> preSend(Message<?> message, MessageChannel channel) {
+        StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+
+        if (StompCommand.CONNECT.equals(accessor.getCommand())) {
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+            if (authentication != null && authentication.isAuthenticated()) {
+                accessor.setUser(authentication);
+            }
+        }
+
+        return message;
+    }
+}

src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java

@@ -3,12 +3,14 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
 import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
+import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
 
 import com.oronaminc.join.websocket.handshake.CustomHandshakeHandler;
 import com.oronaminc.join.websocket.session.CustomWebSocketHandlerDecorator;
@@ -26,6 +28,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
     private final StompErrorHandler stompErrorHandler;
     private final WebsocketSessionManager sessionManager;
     private final ApplicationEventPublisher publisher;
+    private final StompAuthChannelInterceptor stompAuthChannelInterceptor;
 
     @Bean
     public WebSocketHandlerDecoratorFactory webSocketHandlerDecoratorFactory(
@@ -47,9 +50,9 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/ws")
                 .setAllowedOriginPatterns("*")
                 // websocket 연결 전 쿠키 체크
-                // .addInterceptors(new HttpSessionHandshakeInterceptor())
+                .addInterceptors(new HttpSessionHandshakeInterceptor())
                 // websocket 연결 후 principal 생성
-                // .setHandshakeHandler(handshakeHandler)
+                .setHandshakeHandler(handshakeHandler)
                 .withSockJS();
 
         registry.addEndpoint("/ws")
@@ -65,4 +68,9 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
     public void configureWebSocketTransport(WebSocketTransportRegistration registry) {
         registry.setDecoratorFactories(webSocketHandlerDecoratorFactory(sessionManager, publisher));
     }
+
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+        registration.interceptors(stompAuthChannelInterceptor);
+    }
 }

src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantEventHandler.java

@@ -2,14 +2,11 @@
 
 import static com.oronaminc.join.global.exception.ErrorCode.*;
 
-import com.oronaminc.join.global.exception.ErrorCode;
 import java.security.Principal;
 import java.util.Set;
 
 import org.springframework.context.event.EventListener;
-import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.stereotype.Component;
-import org.springframework.web.socket.messaging.SessionSubscribeEvent;
 
 import com.oronaminc.join.global.exception.ErrorException;
 import com.oronaminc.join.room.event.RoomExitEvent;
@@ -24,27 +21,27 @@ public class CurrentParticipantEventHandler {
     private static final String ROOM_PREFIX = "/topic/rooms/";
     private static final String JOIN_SUFFIX = "/join";
 
-    @EventListener
-    public void handleSubscribe(SessionSubscribeEvent event) {
-        StompHeaderAccessor accessor = StompHeaderAccessor.wrap(event.getMessage());
-        String destination = accessor.getDestination();
-        Principal principal = accessor.getUser();
-
-        if (destination == null) {
-            throw new ErrorException(STOMP_INVALID_DESTINATION);
-        }
-
-        if (!destination.startsWith(ROOM_PREFIX)) {
-            return;
-        }
-
-        Long memberId = parseMemberId(principal);
-        Long roomId = parseRoomId(destination);
-
-        if (!isRoomJoinPath(destination)) {
-            validateParticipantRoomJoin(roomId, memberId);
-        }
-    }
+    // @EventListener
+    // public void handleSubscribe(SessionSubscribeEvent event) {
+    //     StompHeaderAccessor accessor = StompHeaderAccessor.wrap(event.getMessage());
+    //     String destination = accessor.getDestination();
+    //     Principal principal = accessor.getUser();
+    //
+    //     if (destination == null) {
+    //         throw new ErrorException(STOMP_INVALID_DESTINATION);
+    //     }
+    //
+    //     if (!destination.startsWith(ROOM_PREFIX)) {
+    //         return;
+    //     }
+    //
+    //     Long memberId = parseMemberId(principal);
+    //     Long roomId = parseRoomId(destination);
+    //
+    //     if (!isRoomJoinPath(destination)) {
+    //         validateParticipantRoomJoin(roomId, memberId);
+    //     }
+    // }
 
     @EventListener
     public void handleUnsubscribe(RoomExitEvent event) {