[USER] 이메일 인증 개선, 쿠키(HttpOnly) 기반 JWT 인증 및 GitHub OAuth 로그인 추가

build.gradle

@@ -56,6 +56,8 @@ dependencies {
 	implementation 'software.amazon.awssdk:rekognition'
 	// ✅ SMTP
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	// ✅ Oauth2
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
 	// SpringAI API
 	implementation 'io.grpc:grpc-xds:1.62.2'

src/main/java/io/github/petty/config/SecurityConfig.java

@@ -3,6 +3,8 @@
 import io.github.petty.users.jwt.JWTFilter;
 import io.github.petty.users.jwt.JWTUtil;
 import io.github.petty.users.jwt.LoginFilter;
+import io.github.petty.users.oauth2.CustomOAuth2UserService;
+import io.github.petty.users.oauth2.OAuth2SuccessHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -18,16 +20,22 @@
 @EnableWebSecurity
 public class SecurityConfig {
 
-    //AuthenticationManager가 인자로 받을 AuthenticationConfiguraion 객체 생성자 주입
     private final AuthenticationConfiguration authenticationConfiguration;
     private final JWTUtil jwtUtil;
+    private final CustomOAuth2UserService customOAuth2UserService;
+    private final OAuth2SuccessHandler oAuth2SuccessHandler;
 
-    public SecurityConfig(AuthenticationConfiguration authenticationConfiguration, JWTUtil jwtUtil) {
+    public SecurityConfig(
+            AuthenticationConfiguration authenticationConfiguration,
+            JWTUtil jwtUtil,
+            CustomOAuth2UserService customOAuth2UserService,
+            OAuth2SuccessHandler oAuth2SuccessHandler) {
         this.authenticationConfiguration = authenticationConfiguration;
         this.jwtUtil = jwtUtil;
+        this.customOAuth2UserService = customOAuth2UserService;
+        this.oAuth2SuccessHandler = oAuth2SuccessHandler;
     }
 
-    //AuthenticationManager Bean 등록
     @Bean
     public AuthenticationManager authenticationManager(AuthenticationConfiguration configuration) throws Exception {
         return configuration.getAuthenticationManager();
@@ -41,18 +49,33 @@ public BCryptPasswordEncoder bCryptPasswordEncoder() {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
-                .csrf(csrf -> csrf.disable()) // CSRF 비활성화
-                .formLogin(form -> form.disable()) // 로그인 비활성화
-                .httpBasic(basic -> basic.disable()) // HTTP Basic 인증 비활성화
+                .csrf(csrf -> csrf.disable())
+                .formLogin(form -> form.disable())
+                .httpBasic(basic -> basic.disable())
                 .authorizeHttpRequests((auth) -> auth
                         .requestMatchers("/admin").hasRole("ADMIN")
-                        .requestMatchers("/user").authenticated() // 로그인이 필요한 페이지
+                        .requestMatchers("/user").authenticated()
+                        .requestMatchers("/login/**", "/oauth2/**").permitAll()
                         .anyRequest().permitAll())
+                .oauth2Login(oauth2 -> oauth2
+                        .loginPage("/login")
+                        .userInfoEndpoint(userInfo -> userInfo
+                                .userService(customOAuth2UserService)
+                        )
+                        .successHandler(oAuth2SuccessHandler)
+                )
+                .logout(logout -> logout
+                        .logoutUrl("/logout") // 클라이언트 측 로그아웃 요청 URL과 일치
+                        .logoutSuccessUrl("/") // 로그아웃 성공 후 리다이렉트 URL
+                        .deleteCookies("jwt") // 로그아웃 시 jwt 쿠키 삭제
+                        .invalidateHttpSession(true)
+                        .clearAuthentication(true)
+                )
                 .addFilterBefore(new JWTFilter(jwtUtil), LoginFilter.class)
                 .addFilterAt(new LoginFilter(authenticationManager(authenticationConfiguration), jwtUtil), UsernamePasswordAuthenticationFilter.class)
                 .sessionManagement((session) -> session
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS));
 
         return http.build();
     }
-}
+}

src/main/java/io/github/petty/config/SupabaseDataSourceConfig.java

@@ -2,6 +2,7 @@
 
 import jakarta.persistence.EntityManagerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
@@ -62,13 +63,13 @@ public DataSource supabaseDataSource() {
     public LocalContainerEntityManagerFactoryBean supabaseEntityManagerFactory(
             // datasource 2개 이상일 경우 명시
             @Qualifier("supabaseDataSource") DataSource dataSource,
-            EntityManagerFactoryBuilder builder
-    ) {
+            EntityManagerFactoryBuilder builder,
+            @Value("${spring.jpa.hibernate.ddl-auto}") String ddlAuto) { // ddl-auto 주입
         Map<String, Object> jpaProperties = new HashMap<>();
         jpaProperties.put("hibernate.physical_naming_strategy", "org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy");
 
         // ddl.auto
-        jpaProperties.put("hibernate.hbm2ddl.auto", "update");
+        jpaProperties.put("hibernate.hbm2ddl.auto", ddlAuto);
 
         return builder.dataSource(dataSource)
                 .packages(

src/main/java/io/github/petty/users/controller/UsersController.java

@@ -1,23 +1,37 @@
 package io.github.petty.users.controller;
 
+import io.github.petty.users.dto.CustomUserDetails;
 import io.github.petty.users.dto.JoinDTO;
+import io.github.petty.users.dto.UserProfileEditDTO;
+import io.github.petty.users.entity.Users;
 import io.github.petty.users.service.JoinService;
+import io.github.petty.users.service.UserService;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.security.core.Authentication;
 
+import java.util.UUID;
+
 @Controller
 public class UsersController {
 
     private final JoinService joinService;
+    private final UserService userService;
+
 
-    public UsersController(JoinService joinService) {
+    public UsersController(JoinService joinService, UserService userService) {
         this.joinService = joinService;
+        this.userService = userService;
     }
 
     @GetMapping("/join")
@@ -27,9 +41,9 @@ public String joinForm(Model model) {
     }
 
     @PostMapping("/join")
-        public String joinProcess(JoinDTO joinDTO, RedirectAttributes redirectAttributes) {
+        public String joinProcess(JoinDTO JoinDTO, RedirectAttributes redirectAttributes) {
 
-            Boolean joinResult = joinService.joinProcess(joinDTO);
+            Boolean joinResult = joinService.joinProcess(JoinDTO);
             if (!joinResult) {
                 redirectAttributes.addFlashAttribute("error", "이미 존재하는 계정입니다!");
                 return "redirect:/";
@@ -47,6 +61,49 @@ public String loginForm() {
         }
         return "login";
     }
+
+    @GetMapping("/profile/edit")
+    public String editProfileForm(Model model) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication == null || !authentication.isAuthenticated()
+                || authentication instanceof AnonymousAuthenticationToken) {
+            return "redirect:/login";
+        }
+
+        Object principal = authentication.getPrincipal();
+        UUID currentUserId = userService.getCurrentUserId(principal);
+        UserProfileEditDTO userProfile = userService.getUserById(currentUserId);
+
+        model.addAttribute("userProfile", userProfile);
+
+        return "profile_edit";
+    }
+
+    @PostMapping("/profile/update")
+    public String updateProfile(@ModelAttribute UserProfileEditDTO userProfileEditDTO,
+                                RedirectAttributes redirectAttributes) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication == null || !authentication.isAuthenticated()
+                || authentication instanceof AnonymousAuthenticationToken) {
+            return "redirect:/login";
+        }
+
+        Object principal = authentication.getPrincipal();
+        UUID currentUserId = userService.getCurrentUserId(principal);
+
+        try {
+            // 사용자 정보 수정
+            userService.updateUserProfile(currentUserId, userProfileEditDTO);
+            redirectAttributes.addFlashAttribute("successMessage", "프로필이 성공적으로 수정되었습니다.");
+        } catch (Exception e) {
+            redirectAttributes.addFlashAttribute("errorMessage", "프로필 수정 중 오류가 발생했습니다: " + e.getMessage());
+        }
+
+        // 수정 완료 후 메인 페이지로
+        return "redirect:/";
+    }
 }
 
 

src/main/java/io/github/petty/users/dto/UserProfileEditDTO.java

@@ -0,0 +1,15 @@
+package io.github.petty.users.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserProfileEditDTO {
+    private String displayName;  // 사용자 이름
+    private String phone;        // 전화번호
+}

src/main/java/io/github/petty/users/entity/EmailVerification.java

@@ -5,6 +5,7 @@
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 
+import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 @Entity
@@ -15,9 +16,11 @@ public class EmailVerification {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(nullable = false)
+    @Column(nullable = false, length = 255)
     private String email;
+
     @Column(nullable = false)
+    @Size(min = 6, max = 6)
     private String code;
 
     @CreationTimestamp

src/main/java/io/github/petty/users/entity/Users.java

@@ -1,13 +1,8 @@
 package io.github.petty.users.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
 
 import java.time.LocalDateTime;
@@ -20,12 +15,32 @@ public class Users {
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
+
+    @Column(nullable = false, unique = true, length = 255)
     private String username; // email
+
+    @Column(nullable = false, length = 60)  // BCrypt로 해시된 비밀번호는 보통 60자의 길이를 가짐
+    @ToString.Exclude  // toString()에서 비밀번호가 출력되지 않도록 제외
+    @JsonIgnore  // 응답에서 비밀번호가 직렬화되지 않도록 제외
     private String password;
+
+    @Column(nullable = false, length = 50)
     private String displayName;
+
+    @Column(length = 20)
     private String phone;
+
+    @Column(nullable = false, length = 20)
     private String role;
 
+
+    // Oauth2 관련
+    @Column(nullable = false, length = 20)
+    private String provider; // oauth2 provider
+
+    @Column(length = 100)
+    private String providerId; // oauth2 provider id
+
     @CreationTimestamp
     private LocalDateTime createdAt;
 }

src/main/java/io/github/petty/users/jwt/JWTFilter.java

@@ -4,8 +4,11 @@
 import io.github.petty.users.entity.Users;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -16,35 +19,48 @@
 public class JWTFilter extends OncePerRequestFilter {
 
     private final JWTUtil jwtUtil;
+    private static final Logger logger = LoggerFactory.getLogger(JWTFilter.class);
+
 
     public JWTFilter(JWTUtil jwtUtil) {
         this.jwtUtil = jwtUtil;
     }
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+        String token = null;
+
+        // 1. 쿠키에서 토큰 확인
+        if (request.getCookies() != null) {
+            for (Cookie cookie : request.getCookies()) {
+                if ("jwt".equals(cookie.getName())) {
+                    token = cookie.getValue();
+                    logger.debug("Token found in Cookie");
+                    break;
+                }
+            }
+        }
 
-        //request에서 Authorization 헤더를 찾음
-        String authorization= request.getHeader("Authorization");
-
-        //Authorization 헤더 검증
-        if (authorization == null || !authorization.startsWith("Bearer ")) {
+        // 2. 쿠키에 토큰이 없으면 Authorization 헤더에서 확인
+        if (token == null) {
+            String authorization = request.getHeader("Authorization");
+            if (authorization != null && authorization.startsWith("Bearer ")) {
+                token = authorization.split(" ")[1];
+                logger.debug("Token found in Authorization header");
+            }
+        }
 
-            System.out.println("token null");
+        // 토큰이 없는 경우 필터 체인 계속 진행
+        if (token == null) {
+            logger.debug("Token not found in either Cookie or Authorization header");
             filterChain.doFilter(request, response);
-
-            //조건이 해당되면 메소드 종료 (필수)
             return;
         }
 
-        System.out.println("authorization now");
-        //Bearer 부분 제거 후 순수 토큰만 획득
-        String token = authorization.split(" ")[1];
-
-        //토큰 소멸 시간 검증
+        // 토큰 소멸 시간 검증
         if (jwtUtil.isExpired(token)) {
-
-            System.out.println("token expired");
+            logger.debug("Token expired");
+            SecurityContextHolder.clearContext(); // 인증정보 삭제
             // 토큰이 만료되었을 때 401 Unauthorized 응답을 반환
             response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); // 401 상태 코드
             response.getWriter().write("{\"error\": \"Token has expired\"}"); // 에러 메시지