diff --git a/tunnel-server/pom.xml b/tunnel-server/pom.xml
index 8308e83a316..4802a805d02 100644
--- a/tunnel-server/pom.xml
+++ b/tunnel-server/pom.xml
@@ -12,9 +12,12 @@
https://github.com/alibaba/arthas
- 1.8
- 1.8
- 1.8
+ 17
+ 17
+ 17
+ 3.5.11
+ 2.0.17
+ 1.5.32
UTF-8
UTF-8
@@ -36,6 +39,21 @@
pom
import
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
diff --git a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/WebSecurityConfig.java b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/WebSecurityConfig.java
index efa3cf14557..376992b2c84 100644
--- a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/WebSecurityConfig.java
+++ b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/WebSecurityConfig.java
@@ -2,9 +2,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
import com.alibaba.arthas.tunnel.server.app.configuration.ArthasProperties;
@@ -14,17 +16,20 @@
*
*/
@Configuration
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfig {
@Autowired
ArthasProperties arthasProperties;
- @Override
- protected void configure(HttpSecurity httpSecurity) throws Exception {
- httpSecurity.authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).authenticated().anyRequest()
- .permitAll().and().formLogin();
+
+ @Bean
+ SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws Exception {
+ httpSecurity.authorizeHttpRequests((authorize) -> authorize
+ .requestMatchers(EndpointRequest.toAnyEndpoint()).authenticated()
+ .anyRequest().permitAll()).formLogin(Customizer.withDefaults());
// allow iframe
if (arthasProperties.isEnableIframeSupport()) {
- httpSecurity.headers().frameOptions().disable();
+ httpSecurity.headers((headers) -> headers.frameOptions((frameOptions) -> frameOptions.disable()));
}
+ return httpSecurity.build();
}
-}
\ No newline at end of file
+}
diff --git a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/DetailAPIController.java b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/DetailAPIController.java
index 31fd608cc2c..9872f7e40de 100644
--- a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/DetailAPIController.java
+++ b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/DetailAPIController.java
@@ -7,7 +7,7 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/ProxyController.java b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/ProxyController.java
index 3c7630aa613..a93daead56a 100644
--- a/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/ProxyController.java
+++ b/tunnel-server/src/main/java/com/alibaba/arthas/tunnel/server/app/web/ProxyController.java
@@ -7,7 +7,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;