From b82ea1919e83d4617b9eb297f3c26ffc749a42b4 Mon Sep 17 00:00:00 2001 From: liumangmang Date: Wed, 4 Feb 2026 11:47:08 +0800 Subject: [PATCH] Enhance CORS configuration and WebSocket origin settings to include additional localhost ports. Improve error handling in SftpController and SftpView for better debugging and user feedback. --- .../com/sshmanager/config/SecurityConfig.java | 5 ++++- .../com/sshmanager/config/WebSocketConfig.java | 5 ++++- .../sshmanager/controller/SftpController.java | 16 +++++++++++++--- .../security/JwtAuthenticationFilter.java | 7 +++++++ frontend/src/views/SftpView.vue | 7 ++++--- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/com/sshmanager/config/SecurityConfig.java b/backend/src/main/java/com/sshmanager/config/SecurityConfig.java index 48234dd..b99978e 100644 --- a/backend/src/main/java/com/sshmanager/config/SecurityConfig.java +++ b/backend/src/main/java/com/sshmanager/config/SecurityConfig.java @@ -62,7 +62,10 @@ public class SecurityConfig { @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); - config.setAllowedOrigins(Arrays.asList("http://localhost:5173", "http://127.0.0.1:5173")); + config.setAllowedOrigins(Arrays.asList( + "http://localhost:5173", "http://127.0.0.1:5173", + "http://localhost:48080", "http://127.0.0.1:48080" + )); config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS")); config.setAllowedHeaders(Arrays.asList("*")); config.setAllowCredentials(true); diff --git a/backend/src/main/java/com/sshmanager/config/WebSocketConfig.java b/backend/src/main/java/com/sshmanager/config/WebSocketConfig.java index 96211ad..35e4740 100644 --- a/backend/src/main/java/com/sshmanager/config/WebSocketConfig.java +++ b/backend/src/main/java/com/sshmanager/config/WebSocketConfig.java @@ -23,6 +23,9 @@ public class WebSocketConfig implements WebSocketConfigurer { public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { registry.addHandler(terminalWebSocketHandler, "/ws/terminal") .addInterceptors(terminalHandshakeInterceptor) - .setAllowedOrigins("http://localhost:5173", "http://127.0.0.1:5173"); + .setAllowedOrigins( + "http://localhost:5173", "http://127.0.0.1:5173", + "http://localhost:48080", "http://127.0.0.1:48080" + ); } } diff --git a/backend/src/main/java/com/sshmanager/controller/SftpController.java b/backend/src/main/java/com/sshmanager/controller/SftpController.java index e9c5f88..d99bddf 100644 --- a/backend/src/main/java/com/sshmanager/controller/SftpController.java +++ b/backend/src/main/java/com/sshmanager/controller/SftpController.java @@ -6,6 +6,8 @@ import com.sshmanager.entity.User; import com.sshmanager.repository.UserRepository; import com.sshmanager.service.ConnectionService; import com.sshmanager.service.SftpService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -23,6 +25,8 @@ import java.util.stream.Collectors; @RequestMapping("/api/sftp") public class SftpController { + private static final Logger log = LoggerFactory.getLogger(SftpController.class); + private final ConnectionService connectionService; private final UserRepository userRepository; private final SftpService sftpService; @@ -61,7 +65,7 @@ public class SftpController { } @GetMapping("/list") - public ResponseEntity> list( + public ResponseEntity list( @RequestParam Long connectionId, @RequestParam(required = false, defaultValue = ".") String path, Authentication authentication) { @@ -74,7 +78,10 @@ public class SftpController { .collect(Collectors.toList()); return ResponseEntity.ok(dtos); } catch (Exception e) { - return ResponseEntity.status(500).build(); + log.warn("SFTP list failed: connectionId={}, path={}", connectionId, path, e); + Map err = new HashMap<>(); + err.put("error", e.getMessage() != null ? e.getMessage() : "List failed"); + return ResponseEntity.status(500).body(err); } } @@ -90,7 +97,10 @@ public class SftpController { result.put("path", pwd); return ResponseEntity.ok(result); } catch (Exception e) { - return ResponseEntity.status(500).build(); + log.warn("SFTP pwd failed: connectionId={}", connectionId, e); + Map err = new HashMap<>(); + err.put("error", e.getMessage() != null ? e.getMessage() : "pwd failed"); + return ResponseEntity.status(500).body(err); } } diff --git a/backend/src/main/java/com/sshmanager/security/JwtAuthenticationFilter.java b/backend/src/main/java/com/sshmanager/security/JwtAuthenticationFilter.java index 92d9e9c..0965614 100644 --- a/backend/src/main/java/com/sshmanager/security/JwtAuthenticationFilter.java +++ b/backend/src/main/java/com/sshmanager/security/JwtAuthenticationFilter.java @@ -52,6 +52,13 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) { return bearerToken.substring(7); } + // WebSocket handshake sends token as query param + if (request.getRequestURI() != null && request.getRequestURI().startsWith("/ws/")) { + String token = request.getParameter("token"); + if (StringUtils.hasText(token)) { + return token; + } + } return null; } } diff --git a/frontend/src/views/SftpView.vue b/frontend/src/views/SftpView.vue index 0b25c21..22ecb1f 100644 --- a/frontend/src/views/SftpView.vue +++ b/frontend/src/views/SftpView.vue @@ -58,7 +58,8 @@ function initPath() { currentPath.value = p || '.' pathParts.value = p === '/' ? [''] : p.split('/').filter(Boolean) loadPath() - }).catch(() => { + }).catch((err: { response?: { data?: { error?: string } } }) => { + error.value = err?.response?.data?.error ?? '获取当前路径失败，请检查连接与认证' currentPath.value = '.' pathParts.value = [] loadPath() @@ -76,8 +77,8 @@ function loadPath() { return a.name.localeCompare(b.name) }) }) - .catch(() => { - error.value = '获取文件列表失败' + .catch((err: { response?: { data?: { error?: string } } }) => { + error.value = err?.response?.data?.error ?? '获取文件列表失败' }) .finally(() => { loading.value = false