Skip to content

Refactor guest routes #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+26 −20
Open

Refactor guest routes #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f144198
refactor guest routes
nekitbr Apr 27, 2023
089e5dd
fix broken whitelistt route filtering
nekitbr May 6, 2023
70382df
Merge branch 'main' into main
nekitbr May 6, 2023
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
13 changes: 8 additions & 5 deletions src/main/java/com/alibou/security/config/JwtAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.beans.Transient;
import java.io.IOException;
import java.security.Security;
import java.util.Arrays;

import jakarta.transaction.TransactionScoped;
import jakarta.transaction.Transactional;
Expand Down Expand Up @@ -36,17 +37,19 @@ protected void doFilterInternal(
@NonNull HttpServletResponse response,
@NonNull FilterChain filterChain
) throws ServletException, IOException {
if (request.getServletPath().contains("/api/v1/auth")) {
filterChain.doFilter(request, response);
return;
}
final String authHeader = request.getHeader("Authorization");
final String jwt;
final String userEmail;
if (authHeader == null ||!authHeader.startsWith("Bearer ")) {

if(
Arrays.asList(SecurityConfiguration.whiteListedRoutes).contains(request.getServletPath()) ||
authHeader == null ||
!authHeader.startsWith("Bearer ")
) {
filterChain.doFilter(request, response);
return;
}

jwt = authHeader.substring(7);
userEmail = jwtService.extractUsername(jwt);
if (userEmail != null && SecurityContextHolder.getContext().getAuthentication() == null) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/alibou/security/config/SecurityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.alibou.security.config;

import jakarta.servlet.Filter;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -21,14 +20,15 @@ public class SecurityConfiguration {
private final JwtAuthenticationFilter jwtAuthFilter;
private final AuthenticationProvider authenticationProvider;
private final LogoutHandler logoutHandler;
public static final String[] whiteListedRoutes = new String[]{"/api/v1/auth/**"};

@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
.csrf()
.disable()
.authorizeHttpRequests()
.requestMatchers("/api/v1/auth/**")
.requestMatchers(whiteListedRoutes)
.permitAll()
.anyRequest()
.authenticated()
Expand Down