Merge pull request #322 from kSideProject/dev

[Infra] dev 브랜치를 main 브랜치로 병합
kSideProject · Dec 10, 2024 · 1f382ac · 1f382ac
2 parents 4758f12 + f830543
commit 1f382ac
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 312 deletions.
diff --git a/core/src/main/kotlin/kpring/core/global/config/WebFluxStaticResourceConfig.kt b/core/src/main/kotlin/kpring/core/global/config/WebFluxStaticResourceConfig.kt
@@ -21,6 +21,6 @@ class WebFluxStaticResourceConfig : WebFluxConfigurer {
   override fun addCorsMappings(registry: CorsRegistry) {
     registry.addMapping("/**")
       .allowedOriginPatterns("*")
-      .allowedMethods("GET", "POST", "DELETE", "PUT", "FETCH")
+      .allowedMethods("GET", "POST", "DELETE", "PUT", "PATCH")
   }
 }
diff --git a/core/src/main/kotlin/kpring/core/global/config/WebMvcStaticResourceConfig.kt b/core/src/main/kotlin/kpring/core/global/config/WebMvcStaticResourceConfig.kt
@@ -17,6 +17,6 @@ class WebMvcStaticResourceConfig : WebMvcConfigurer {
   override fun addCorsMappings(registry: CorsRegistry) {
     registry.addMapping("/**")
       .allowedOriginPatterns("*")
-      .allowedMethods("GET", "POST", "DELETE", "PUT", "FETCH")
+      .allowedMethods("GET", "POST", "DELETE", "PUT", "PATCH")
   }
 }
diff --git a/front/src/components/Layout/FriendsRightSideBar.tsx b/front/src/components/Layout/FriendsRightSideBar.tsx
diff --git a/front/src/components/Layout/MemberListItem.tsx b/front/src/components/Layout/MemberListItem.tsx
diff --git a/front/src/components/Layout/MessageRightSideBar.tsx b/front/src/components/Layout/MessageRightSideBar.tsx
diff --git a/front/src/components/Layout/ServerInfoSidebar.tsx b/front/src/components/Layout/ServerInfoSidebar.tsx
diff --git a/user/src/main/kotlin/kpring/user/config/SecurityConfig.kt b/user/src/main/kotlin/kpring/user/config/SecurityConfig.kt
@@ -2,13 +2,38 @@ package kpring.user.config
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.security.config.annotation.web.builders.HttpSecurity
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
 import org.springframework.security.crypto.password.PasswordEncoder
+import org.springframework.security.web.SecurityFilterChain
+import org.springframework.web.cors.CorsConfiguration
 
 @Configuration
+@EnableWebSecurity
 class SecurityConfig {
   @Bean
   fun encode(): PasswordEncoder {
     return BCryptPasswordEncoder()
   }
+
+  @Bean
+  fun filterChain(http: HttpSecurity): SecurityFilterChain {
+    http
+      .cors { cors ->
+        cors.configurationSource {
+          val cors = CorsConfiguration()
+          cors.allowedOrigins = listOf("http://localhost:3000")
+          cors.allowedMethods = listOf("GET", "POST", "PUT", "DELETE", "PATCH")
+          cors.allowedHeaders = listOf("*")
+          cors.allowCredentials = true
+          cors
+        }
+      }
+      .csrf { it.disable() }
+      .formLogin { it.disable() }
+      .httpBasic { }
+
+    return http.build()
+  }
 }