Skip to content
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

Upgrade to Spring Boot 3.4.1 #39

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Upgrade to Spring Boot 3.4.1 #39

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
847d803
upgrade to spring boot 3.3
mirkoperillo Jul 31, 2024
306d461
upgrade to spring boot 3.3
mirkoperillo Jul 31, 2024
23fe5fd
fix formatting
mirkoperillo Aug 24, 2024
38bcf72
fix formatting
mirkoperillo Aug 24, 2024
afde2ac
fix formatting
mirkoperillo Aug 24, 2024
387e355
fix formatting
mirkoperillo Aug 24, 2024
ae4b0bb
upgrade to spring boot 3.4.1
mirkoperillo Jan 9, 2025
042e3d0
fix formatting
mirkoperillo Jan 9, 2025
f86d314
fix formatting
mirkoperillo Jan 9, 2025
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
37 changes: 19 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.7</version>
<version>3.3.2</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

Expand All @@ -30,12 +30,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<exclusion>
<!-- bloated dependency -->
<artifactId>tomcat-embed-el</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
</exclusions>
<artifactId>tomcat-embed-el</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -47,25 +47,27 @@
<exclusions>
<exclusion>
<!-- bloated dependency -->
<artifactId>txw2</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<groupId>org.glassfish.jaxb</groupId>
</exclusion>
</exclusions>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.mobile</groupId>
<artifactId>spring-mobile-device</artifactId>
<version>1.1.5.RELEASE</version>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>0.12.6</version>
</dependency>

<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.6.0</version>
<artifactId>jjwt-impl</artifactId>
<version>0.12.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.12.6</version>
<scope>runtime</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -141,5 +143,4 @@
</plugins>
</build>


</project>
18 changes: 0 additions & 18 deletions src/main/java/com/bfwg/common/DeviceProvider.java
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/main/java/com/bfwg/config/WebConfig.java
View file
Open in desktop

This file was deleted.

65 changes: 33 additions & 32 deletions src/main/java/com/bfwg/config/WebSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.bfwg.config;

import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
Expand All @@ -27,7 +29,7 @@

@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
@EnableMethodSecurity(prePostEnabled = true)
public class WebSecurityConfig {

@Autowired
Expand Down Expand Up @@ -56,46 +58,45 @@ public AuthenticationManager authenticationManager(AuthenticationConfiguration a

@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {

http
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
.exceptionHandling().authenticationEntryPoint(restAuthenticationEntryPoint).and()
.authorizeRequests()
.antMatchers(
HttpMethod.GET,
"/",
"/auth/**",
"/webjars/**",
"/*.html",
"/favicon.ico",
"/**/*.html",
"/**/*.css",
"/**/*.js")
.permitAll()
.antMatchers("/auth/**").permitAll()
.anyRequest().authenticated().and()
.addFilterBefore(new TokenAuthenticationFilter(tokenHelper, jwtUserDetailsService),
BasicAuthenticationFilter.class);
BasicAuthenticationFilter.class)
.authorizeHttpRequests(authorize -> authorize
.requestMatchers(
antMatcher(HttpMethod.GET, "/"),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to whitelist swagger endpoints as well in case we add support for that?

Copy link
Contributor Author

@mirkoperillo mirkoperillo Aug 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to add any swagger configuration only when swagger will eventually be added, so the starter project stays as clean as possible.

antMatcher(HttpMethod.GET, "/auth/**"),
antMatcher(HttpMethod.GET, "/webjars/**"),
antMatcher(HttpMethod.GET, "/*.html"),
antMatcher(HttpMethod.GET, "/favicon.ico"),
antMatcher(HttpMethod.GET, "/**/*.html"),
antMatcher(HttpMethod.GET, "/**/*.css"),
antMatcher(HttpMethod.GET, "/**/*.js"))
.permitAll()
.requestMatchers("/auth/**").permitAll()
.anyRequest().authenticated())
.sessionManagement(sec -> sec.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.exceptionHandling(
exceptionHandler -> exceptionHandler.authenticationEntryPoint(restAuthenticationEntryPoint))
.csrf(csrf -> csrf.disable());

http.csrf().disable();
return http.build();
}

@Bean
public WebSecurityCustomizer webSecurityCustomizer() {
// TokenAuthenticationFilter will ignore the below paths
return (web) -> {
web.ignoring().antMatchers(
HttpMethod.POST,
"/auth/login");
web.ignoring().antMatchers(
HttpMethod.GET,
"/",
"/webjars/**",
"/*.html",
"/favicon.ico",
"/**/*.html",
"/**/*.css",
"/**/*.js");
web.ignoring()
.requestMatchers(HttpMethod.POST, "/auth/login")
.requestMatchers(
antMatcher(HttpMethod.GET, "/"),
antMatcher(HttpMethod.GET, "/webjars/**"),
antMatcher(HttpMethod.GET, "/*.html"),
antMatcher(HttpMethod.GET, "/favicon.ico"),
antMatcher(HttpMethod.GET, "/**/*.html"),
antMatcher(HttpMethod.GET, "/**path/*.css"),
antMatcher(HttpMethod.GET, "/**path/*.js"));
};
}
}
76 changes: 42 additions & 34 deletions src/main/java/com/bfwg/model/Authority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,56 @@
package com.bfwg.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.security.core.GrantedAuthority;

import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonIgnore;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;

/**
* Created by fan.jin on 2016-11-03.
*/

@Entity
@Table(name="AUTHORITY")
@Table(name = "AUTHORITY")
public class Authority implements GrantedAuthority {

@Id
@Column(name="id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
Long id;

@Enumerated( EnumType.STRING)
@Column(name="name")
UserRoleName name;

@Override
public String getAuthority() {
return name.name();
}

public void setName(UserRoleName name) {
this.name = name;
}

@JsonIgnore
public UserRoleName getName() {
return name;
}

@JsonIgnore
public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
Long id;

@Enumerated(EnumType.STRING)
@Column(name = "name")
UserRoleName name;

@Override
public String getAuthority() {
return name.name();
}

public void setName(UserRoleName name) {
this.name = name;
}

@JsonIgnore
public UserRoleName getName() {
return name;
}

@JsonIgnore
public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

}
24 changes: 12 additions & 12 deletions src/main/java/com/bfwg/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
import java.util.Collection;
import java.util.List;

import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Table;

import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

import com.fasterxml.jackson.annotation.JsonIgnore;

import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.JoinTable;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.Table;

/**
* Created by fan.jin on 2016-10-15.
*/
Expand Down
Loading
Loading