default

Author: boorownie

build.gradle

@@ -1,22 +1,22 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.1'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '3.3.0'
+    id 'io.spring.dependency-management' version '1.1.5'
     id 'java'
 }
 
-group = 'nextstep'
+group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
+sourceCompatibility = '17'
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation('org.springframework.boot:spring-boot-starter-test')
 }
 
-tasks.named('test') {
+test {
     useJUnitPlatform()
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'spring-security-authorization'
+rootProject.name = 'spring-security'

src/main/java/nextstep/app/SecurityConfig.java

@@ -5,6 +5,7 @@
 import nextstep.security.authentication.AuthenticationException;
 import nextstep.security.authentication.BasicAuthenticationFilter;
 import nextstep.security.authentication.UsernamePasswordAuthenticationFilter;
+import nextstep.security.authorization.CheckAuthenticationFilter;
 import nextstep.security.config.DefaultSecurityFilterChain;
 import nextstep.security.config.DelegatingFilterProxy;
 import nextstep.security.config.FilterChainProxy;
@@ -16,6 +17,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import java.util.List;
+import java.util.Set;
 
 @Configuration
 public class SecurityConfig {
@@ -42,7 +44,8 @@ public SecurityFilterChain securityFilterChain() {
                 List.of(
                         new SecurityContextHolderFilter(),
                         new UsernamePasswordAuthenticationFilter(userDetailsService()),
-                        new BasicAuthenticationFilter(userDetailsService())
+                        new BasicAuthenticationFilter(userDetailsService()),
+                        new CheckAuthenticationFilter()
                 )
         );
     }
@@ -63,6 +66,11 @@ public String getUsername() {
                 public String getPassword() {
                     return member.getPassword();
                 }
+
+                @Override
+                public Set<String> getAuthorities() {
+                    return member.getRoles();
+                }
             };
         };
     }

src/main/java/nextstep/app/domain/Member.java

@@ -36,4 +36,8 @@ public String getImageUrl() {
     public Set<String> getRoles() {
         return roles;
     }
+
+    public boolean matchPassword(String password) {
+        return this.password.equals(password);
+    }
 }

src/main/java/nextstep/app/infrastructure/InmemoryMemberRepository.java

@@ -9,15 +9,8 @@
 
 @Repository
 public class InmemoryMemberRepository implements MemberRepository {
-    public static final Member ADMIN_MEMBER = new Member("[email protected]", "password", "a", "", Set.of("ADMIN"));
-    public static final Member USER_MEMBER = new Member("[email protected]", "password", "b", "", Collections.emptySet());
     private static final Map<String, Member> members = new HashMap<>();
 
-    static {
-        members.put(ADMIN_MEMBER.getEmail(), ADMIN_MEMBER);
-        members.put(USER_MEMBER.getEmail(), USER_MEMBER);
-    }
-
     @Override
     public Optional<Member> findByEmail(String email) {
         return Optional.ofNullable(members.get(email));

src/main/java/nextstep/app/ui/MemberController.java

@@ -2,10 +2,7 @@
 
 import nextstep.app.domain.Member;
 import nextstep.app.domain.MemberRepository;
-import nextstep.security.authentication.AuthenticationException;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -25,9 +22,4 @@ public ResponseEntity<List<Member>> list() {
         List<Member> members = memberRepository.findAll();
         return ResponseEntity.ok(members);
     }
-
-    @ExceptionHandler(AuthenticationException.class)
-    public ResponseEntity<Void> handleAuthenticationException() {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
-    }
 }

src/main/java/nextstep/security/authentication/Authentication.java

@@ -1,7 +1,11 @@
 package nextstep.security.authentication;
 
+import java.util.Set;
+
 public interface Authentication {
 
+    Set<String> getAuthorities();
+
     Object getCredentials();
 
     Object getPrincipal();

src/main/java/nextstep/security/authentication/AuthenticationException.java

@@ -1,6 +1,10 @@
 package nextstep.security.authentication;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
+@ResponseStatus(code = HttpStatus.UNAUTHORIZED)
 public class AuthenticationException extends RuntimeException {
+
     public AuthenticationException() {
         super("인증에 실패하였습니다.");
     }

src/main/java/nextstep/security/authentication/BasicAuthenticationFilter.java

@@ -1,15 +1,15 @@
 package nextstep.security.authentication;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import nextstep.security.context.SecurityContext;
 import nextstep.security.context.SecurityContextHolder;
 import nextstep.security.userdetails.UserDetailsService;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.List;