Skip to content

Commit e4ddb32

Browse files
Copilothengyunabc
andcommitted
fix(tunnel-server): upgrade to spring boot 3.5.11 dependency line
Co-authored-by: hengyunabc <1683936+hengyunabc@users.noreply.github.com>
1 parent 820f501 commit e4ddb32

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

tunnel-server/pom.xml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
<url>https://github.com/alibaba/arthas</url>
1313

1414
<properties>
15-
<maven.compiler.target>1.8</maven.compiler.target>
16-
<maven.compiler.source>1.8</maven.compiler.source>
17-
<java.version>1.8</java.version>
18-
<spring-security.version>5.8.16</spring-security.version>
19-
<tomcat-embed-core.version>9.0.109</tomcat-embed-core.version>
15+
<maven.compiler.target>17</maven.compiler.target>
16+
<maven.compiler.source>17</maven.compiler.source>
17+
<java.version>17</java.version>
18+
<spring-boot.version>3.5.11</spring-boot.version>
19+
<slf4j.version>2.0.17</slf4j.version>
20+
<logback.version>1.5.32</logback.version>
2021
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2122
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2223
</properties>
@@ -39,29 +40,19 @@
3940
<scope>import</scope>
4041
</dependency>
4142
<dependency>
42-
<groupId>org.apache.tomcat.embed</groupId>
43-
<artifactId>tomcat-embed-core</artifactId>
44-
<version>${tomcat-embed-core.version}</version>
43+
<groupId>org.slf4j</groupId>
44+
<artifactId>slf4j-api</artifactId>
45+
<version>${slf4j.version}</version>
4546
</dependency>
4647
<dependency>
47-
<groupId>org.springframework.security</groupId>
48-
<artifactId>spring-security-config</artifactId>
49-
<version>${spring-security.version}</version>
48+
<groupId>ch.qos.logback</groupId>
49+
<artifactId>logback-classic</artifactId>
50+
<version>${logback.version}</version>
5051
</dependency>
5152
<dependency>
52-
<groupId>org.springframework.security</groupId>
53-
<artifactId>spring-security-web</artifactId>
54-
<version>${spring-security.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.springframework.security</groupId>
58-
<artifactId>spring-security-core</artifactId>
59-
<version>${spring-security.version}</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.springframework.security</groupId>
63-
<artifactId>spring-security-crypto</artifactId>
64-
<version>${spring-security.version}</version>
53+
<groupId>ch.qos.logback</groupId>
54+
<artifactId>logback-core</artifactId>
55+
<version>${logback.version}</version>
6556
</dependency>
6657
</dependencies>
6758
</dependencyManagement>

tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/WebSecurityConfig.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
5+
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.security.config.Customizer;
68
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
7-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
9+
import org.springframework.security.web.SecurityFilterChain;
810

911
import com.alibaba.arthas.tunnel.server.app.configuration.ArthasProperties;
1012

@@ -14,17 +16,20 @@
1416
*
1517
*/
1618
@Configuration
17-
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
19+
public class WebSecurityConfig {
1820

1921
@Autowired
2022
ArthasProperties arthasProperties;
21-
@Override
22-
protected void configure(HttpSecurity httpSecurity) throws Exception {
23-
httpSecurity.authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).authenticated().anyRequest()
24-
.permitAll().and().formLogin();
23+
24+
@Bean
25+
SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws Exception {
26+
httpSecurity.authorizeHttpRequests((authorize) -> authorize
27+
.requestMatchers(EndpointRequest.toAnyEndpoint()).authenticated()
28+
.anyRequest().permitAll()).formLogin(Customizer.withDefaults());
2529
// allow iframe
2630
if (arthasProperties.isEnableIframeSupport()) {
27-
httpSecurity.headers().frameOptions().disable();
31+
httpSecurity.headers((headers) -> headers.frameOptions((frameOptions) -> frameOptions.disable()));
2832
}
33+
return httpSecurity.build();
2934
}
30-
}
35+
}

tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/DetailAPIController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.Map;
88
import java.util.Set;
99

10-
import javax.servlet.http.HttpServletRequest;
10+
import jakarta.servlet.http.HttpServletRequest;
1111

1212
import org.slf4j.Logger;
1313
import org.slf4j.LoggerFactory;

tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/ProxyController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.concurrent.TimeUnit;
88
import java.util.concurrent.TimeoutException;
99

10-
import javax.servlet.http.HttpServletRequest;
10+
import jakarta.servlet.http.HttpServletRequest;
1111

1212
import org.apache.commons.lang3.RandomStringUtils;
1313
import org.slf4j.Logger;

0 commit comments

Comments
 (0)