LiuMangMang/ssh-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Please provide the code changes or file diffs you would like me to summarize.

Browse Source
This commit is contained in:
liumangmang
2026-05-07 14:12:54 +08:00
parent 3f0ebe24e0
commit 2d9011b606
17 changed files with 375 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/sshmanager/config/SecurityConfig.java
+74 -76
View File
@@ -1,73 +1,71 @@
package com.sshmanager.config; package com.sshmanager.config;
import com.sshmanager.security.JwtAuthenticationFilter; import com.sshmanager.security.JwtAuthenticationFilter;
import com.sshmanager.security.PasswordExpirationFilter; import com.sshmanager.security.PasswordExpirationFilter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; 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.EnableWebSecurity;
import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.Set; @Configuration
@EnableWebSecurity
@Configuration public class SecurityConfig {
@EnableWebSecurity
public class SecurityConfig { private final JwtAuthenticationFilter jwtAuthenticationFilter;
private final JwtAuthenticationFilter jwtAuthenticationFilter; @Autowired(required = false)
private SecurityExceptionHandler securityExceptionHandler;
@Autowired(required = false)
private SecurityExceptionHandler securityExceptionHandler; public SecurityConfig(JwtAuthenticationFilter jwtAuthenticationFilter,
PasswordExpirationFilter passwordExpirationFilter) {
public SecurityConfig(JwtAuthenticationFilter jwtAuthenticationFilter, this.jwtAuthenticationFilter = jwtAuthenticationFilter;
PasswordExpirationFilter passwordExpirationFilter) { this.passwordExpirationFilter = passwordExpirationFilter;
this.jwtAuthenticationFilter = jwtAuthenticationFilter; }
this.passwordExpirationFilter = passwordExpirationFilter;
} private final PasswordExpirationFilter passwordExpirationFilter;
private final PasswordExpirationFilter passwordExpirationFilter; @Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
@Bean http
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .cors().and()
http .csrf().disable()
.cors().and() .sessionManagement()
.csrf().disable() .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.sessionManagement() .and()
.sessionCreationPolicy(SessionCreationPolicy.STATELESS) .authorizeRequests()
.and() .antMatchers("/api/auth/**").permitAll()
.authorizeRequests() .antMatchers("/ws/**").authenticated()
.antMatchers("/api/auth/**").permitAll() .antMatchers("/api/**").authenticated()
.antMatchers("/ws/**").authenticated() .anyRequest().permitAll()
.antMatchers("/api/**").authenticated() .and()
.anyRequest().permitAll() .exceptionHandling(e -> {
.and() if (securityExceptionHandler != null) {
.exceptionHandling(e -> { e.authenticationEntryPoint(securityExceptionHandler);
if (securityExceptionHandler != null) { }
e.authenticationEntryPoint(securityExceptionHandler); })
} .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
}) .addFilterBefore(passwordExpirationFilter, UsernamePasswordAuthenticationFilter.class);
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(passwordExpirationFilter, UsernamePasswordAuthenticationFilter.class); return http.build();
}
return http.build();
} @Bean
public PasswordEncoder passwordEncoder() {
@Bean return new BCryptPasswordEncoder();
public PasswordEncoder passwordEncoder() { }
return new BCryptPasswordEncoder();
} @Bean
@Bean
public CorsConfigurationSource corsConfigurationSource() { public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration config = new CorsConfiguration(); CorsConfiguration config = new CorsConfiguration();
// Docker/remote deployments may be accessed via IP/hostname. // Docker/remote deployments may be accessed via IP/hostname.
@@ -76,9 +74,9 @@ public class SecurityConfig {
config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS")); config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
config.setAllowedHeaders(Arrays.asList("*")); config.setAllowedHeaders(Arrays.asList("*"));
config.setAllowCredentials(true); config.setAllowCredentials(true);
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config); source.registerCorsConfiguration("/**", config);
return source; return source;
} }
} }
backend/src/main/java/com/sshmanager/config/SpaForwardConfig.java
+3 -2
View File
@@ -2,6 +2,7 @@ package com.sshmanager.config;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.lang.NonNull;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.resource.PathResourceResolver; import org.springframework.web.servlet.resource.PathResourceResolver;
@@ -15,13 +16,13 @@ import java.io.IOException;
public class SpaForwardConfig implements WebMvcConfigurer { public class SpaForwardConfig implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(@NonNull ResourceHandlerRegistry registry) {
registry.addResourceHandler("/**") registry.addResourceHandler("/**")
.addResourceLocations("classpath:/static/") .addResourceLocations("classpath:/static/")
.resourceChain(true) .resourceChain(true)
.addResolver(new PathResourceResolver() { .addResolver(new PathResourceResolver() {
@Override @Override
protected Resource getResource(String path, Resource location) throws IOException { protected Resource getResource(@NonNull String path, @NonNull Resource location) throws IOException {
Resource resource = location.createRelative(path); Resource resource = location.createRelative(path);
if (resource.exists() && resource.isReadable()) { if (resource.exists() && resource.isReadable()) {
return resource; return resource;
backend/src/main/java/com/sshmanager/config/TerminalHandshakeInterceptor.java
+6 -4
View File
@@ -9,6 +9,8 @@ import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.server.HandshakeInterceptor; import org.springframework.web.socket.server.HandshakeInterceptor;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import java.util.Map; import java.util.Map;
@Component @Component
@@ -21,8 +23,8 @@ public class TerminalHandshakeInterceptor implements HandshakeInterceptor {
} }
@Override @Override
public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, public boolean beforeHandshake(@NonNull ServerHttpRequest request, @NonNull ServerHttpResponse response,
WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception { @NonNull WebSocketHandler wsHandler, @NonNull Map<String, Object> attributes) throws Exception {
if (!(request instanceof ServletServerHttpRequest)) { if (!(request instanceof ServletServerHttpRequest)) {
return false; return false;
} }
@@ -50,7 +52,7 @@ public class TerminalHandshakeInterceptor implements HandshakeInterceptor {
} }
@Override @Override
public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, public void afterHandshake(@NonNull ServerHttpRequest request, @NonNull ServerHttpResponse response,
WebSocketHandler wsHandler, Exception exception) { @NonNull WebSocketHandler wsHandler, @Nullable Exception exception) {
} }
} }
backend/src/main/java/com/sshmanager/config/WebSocketConfig.java
+9 -7
View File
@@ -1,13 +1,14 @@
package com.sshmanager.config; package com.sshmanager.config;
import com.sshmanager.controller.TerminalWebSocketHandler; import com.sshmanager.controller.TerminalWebSocketHandler;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer; import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
import org.springframework.lang.NonNull;
@Configuration
@EnableWebSocket @Configuration
@EnableWebSocket
public class WebSocketConfig implements WebSocketConfigurer { public class WebSocketConfig implements WebSocketConfigurer {
private final TerminalWebSocketHandler terminalWebSocketHandler; private final TerminalWebSocketHandler terminalWebSocketHandler;
@@ -18,9 +19,10 @@ public class WebSocketConfig implements WebSocketConfigurer {
this.terminalWebSocketHandler = terminalWebSocketHandler; this.terminalWebSocketHandler = terminalWebSocketHandler;
this.terminalHandshakeInterceptor = terminalHandshakeInterceptor; this.terminalHandshakeInterceptor = terminalHandshakeInterceptor;
} }
@Override @Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { @SuppressWarnings("null")
public void registerWebSocketHandlers(@NonNull WebSocketHandlerRegistry registry) {
registry.addHandler(terminalWebSocketHandler, "/ws/terminal") registry.addHandler(terminalWebSocketHandler, "/ws/terminal")
.addInterceptors(terminalHandshakeInterceptor) .addInterceptors(terminalHandshakeInterceptor)
// Docker/remote deployments often use non-localhost origins. // Docker/remote deployments often use non-localhost origins.
backend/src/main/java/com/sshmanager/controller/SftpController.java
+8 -20
View File
@@ -14,7 +14,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
@@ -33,7 +32,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
@RestController @RestController
@RequestMapping("/api/sftp") @RequestMapping("/api/sftp")
@@ -282,7 +280,7 @@ public class SftpController {
return ResponseEntity.ok() return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"") .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
.contentType(MediaType.APPLICATION_OCTET_STREAM) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE)
.body(stream); .body(stream);
} catch (Exception e) { } catch (Exception e) {
return ResponseEntity.status(500).build(); return ResponseEntity.status(500).build();
@@ -331,12 +329,11 @@ public class SftpController {
file.transferTo(tempFile); file.transferTo(tempFile);
final java.io.File savedFile = tempFile; final java.io.File savedFile = tempFile;
UploadTaskStatus status = new UploadTaskStatus(taskId, userId, connectionId, UploadTaskStatus status = new UploadTaskStatus(taskId, userId, filename, file.getSize());
path, filename, file.getSize());
status.setController(this); status.setController(this);
uploadTasks.put(taskKey, status); uploadTasks.put(taskKey, status);
Future<?> future = transferTaskExecutor.submit(() -> { transferTaskExecutor.submit(() -> {
status.setStatus("running"); status.setStatus("running");
try { try {
withSessionLock(key, () -> { withSessionLock(key, () -> {
@@ -387,8 +384,6 @@ public class SftpController {
} }
} }
}); });
status.setFuture(future);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("taskId", taskId); result.put("taskId", taskId);
result.put("message", "Upload started"); result.put("message", "Upload started");
@@ -654,6 +649,7 @@ public class SftpController {
} }
@GetMapping("/transfer-remote/tasks/{taskId}/progress") @GetMapping("/transfer-remote/tasks/{taskId}/progress")
@SuppressWarnings("null")
public SseEmitter streamTransferProgress( public SseEmitter streamTransferProgress(
@PathVariable String taskId, @PathVariable String taskId,
Authentication authentication) { Authentication authentication) {
@@ -692,6 +688,7 @@ public class SftpController {
} }
@GetMapping("/upload/tasks/{taskId}/progress") @GetMapping("/upload/tasks/{taskId}/progress")
@SuppressWarnings("null")
public SseEmitter streamUploadProgress( public SseEmitter streamUploadProgress(
@PathVariable String taskId, @PathVariable String taskId,
Authentication authentication) { Authentication authentication) {
@@ -739,6 +736,7 @@ public class SftpController {
} }
} }
@SuppressWarnings("null")
private void broadcastProgress(String taskKey, Map<String, Object> data) { private void broadcastProgress(String taskKey, Map<String, Object> data) {
CopyOnWriteArrayList<SseEmitter> emitters = taskEmitters.get(taskKey); CopyOnWriteArrayList<SseEmitter> emitters = taskEmitters.get(taskKey);
if (emitters == null || emitters.isEmpty()) { if (emitters == null || emitters.isEmpty()) {
@@ -976,10 +974,7 @@ public class SftpController {
public static class UploadTaskStatus { public static class UploadTaskStatus {
private final String taskId; private final String taskId;
private final Long userId; private final Long userId;
private final Long connectionId;
private final String path;
private final String filename; private final String filename;
private final long fileSize;
private final long createdAt; private final long createdAt;
private volatile String status; private volatile String status;
private volatile String error; private volatile String error;
@@ -987,17 +982,12 @@ public class SftpController {
private volatile long finishedAt; private volatile long finishedAt;
private final AtomicLong totalBytes; private final AtomicLong totalBytes;
private final AtomicLong transferredBytes; private final AtomicLong transferredBytes;
private volatile Future<?> future;
private volatile SftpController controller; private volatile SftpController controller;
public UploadTaskStatus(String taskId, Long userId, Long connectionId, public UploadTaskStatus(String taskId, Long userId, String filename, long fileSize) {
String path, String filename, long fileSize) {
this.taskId = taskId; this.taskId = taskId;
this.userId = userId; this.userId = userId;
this.connectionId = connectionId;
this.path = path;
this.filename = filename; this.filename = filename;
this.fileSize = fileSize;
this.createdAt = System.currentTimeMillis(); this.createdAt = System.currentTimeMillis();
this.status = "queued"; this.status = "queued";
this.totalBytes = new AtomicLong(fileSize); this.totalBytes = new AtomicLong(fileSize);
@@ -1012,9 +1002,7 @@ public class SftpController {
this.controller = controller; this.controller = controller;
} }
public void setFuture(Future<?> future) {
this.future = future;
}
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
backend/src/main/java/com/sshmanager/controller/TerminalWebSocketHandler.java
+115 -113
View File
@@ -1,107 +1,109 @@
package com.sshmanager.controller; package com.sshmanager.controller;
import com.sshmanager.entity.Connection; import com.sshmanager.entity.Connection;
import com.sshmanager.entity.User; import com.sshmanager.entity.User;
import com.sshmanager.repository.ConnectionRepository; import com.sshmanager.repository.ConnectionRepository;
import com.sshmanager.repository.UserRepository; import com.sshmanager.repository.UserRepository;
import com.sshmanager.service.ConnectionService; import com.sshmanager.service.ConnectionService;
import com.sshmanager.service.SshService; import com.sshmanager.service.SshService;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.handler.TextWebSocketHandler; import org.springframework.web.socket.handler.TextWebSocketHandler;
import org.springframework.lang.NonNull;
import java.io.IOException;
import java.io.InputStream; import java.io.IOException;
import java.util.Map; import java.io.InputStream;
import java.util.concurrent.ConcurrentHashMap; import java.util.Map;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
@Component
public class TerminalWebSocketHandler extends TextWebSocketHandler { @Component
public class TerminalWebSocketHandler extends TextWebSocketHandler {
private final ConnectionRepository connectionRepository;
private final UserRepository userRepository; private final ConnectionRepository connectionRepository;
private final ConnectionService connectionService; private final UserRepository userRepository;
private final SshService sshService; private final ConnectionService connectionService;
private final ExecutorService executor; private final SshService sshService;
private final ExecutorService executor;
private final AtomicInteger sessionCount = new AtomicInteger(0);
private final Map<String, SshService.SshSession> sessions = new ConcurrentHashMap<>(); private final AtomicInteger sessionCount = new AtomicInteger(0);
private final Map<String, Long> lastActivity = new ConcurrentHashMap<>(); private final Map<String, SshService.SshSession> sessions = new ConcurrentHashMap<>();
private final Map<String, Long> lastActivity = new ConcurrentHashMap<>();
public TerminalWebSocketHandler(ConnectionRepository connectionRepository,
UserRepository userRepository, public TerminalWebSocketHandler(ConnectionRepository connectionRepository,
ConnectionService connectionService, UserRepository userRepository,
SshService sshService, ConnectionService connectionService,
@Qualifier("terminalWebSocketExecutor") ExecutorService executor) { SshService sshService,
this.connectionRepository = connectionRepository; @Qualifier("terminalWebSocketExecutor") ExecutorService executor) {
this.userRepository = userRepository; this.connectionRepository = connectionRepository;
this.connectionService = connectionService; this.userRepository = userRepository;
this.sshService = sshService; this.connectionService = connectionService;
this.executor = executor; this.sshService = sshService;
this.executor = executor;
} }
@Override
public void afterConnectionEstablished(WebSocketSession webSocketSession) throws Exception {
Long connectionId = (Long) webSocketSession.getAttributes().get("connectionId");
String username = (String) webSocketSession.getAttributes().get("username");
if (connectionId == null || username == null) {
webSocketSession.close(CloseStatus.BAD_DATA);
return;
}
User user = userRepository.findByUsername(username).orElse(null);
if (user == null) {
webSocketSession.close(CloseStatus.BAD_DATA);
return;
}
Connection conn = connectionRepository.findById(connectionId).orElse(null);
if (conn == null || !conn.getUserId().equals(user.getId())) {
webSocketSession.close(CloseStatus.BAD_DATA);
return;
}
String password = connectionService.getDecryptedPassword(conn);
String privateKey = connectionService.getDecryptedPrivateKey(conn);
String passphrase = connectionService.getDecryptedPassphrase(conn);
try {
SshService.SshSession sshSession = sshService.createShellSession(conn, password, privateKey, passphrase);
sessions.put(webSocketSession.getId(), sshSession);
lastActivity.put(webSocketSession.getId(), System.currentTimeMillis());
sessionCount.incrementAndGet();
executor.submit(() -> {
try {
InputStream in = sshSession.getOutputStream();
byte[] buf = new byte[4096];
int n;
while (webSocketSession.isOpen() && sshSession.isConnected() && (n = in.read(buf)) >= 0) {
String text = new String(buf, 0, n, "UTF-8");
webSocketSession.sendMessage(new TextMessage(text));
}
} catch (Exception e) {
if (webSocketSession.isOpen()) {
try {
webSocketSession.sendMessage(new TextMessage("\r\n[Connection closed]\r\n"));
} catch (IOException ignored) {
}
}
}
});
} catch (Exception e) {
webSocketSession.sendMessage(new TextMessage("\r\n[SSH Error: " + e.getMessage() + "]\r\n"));
}
}
@Override @Override
protected void handleTextMessage(WebSocketSession webSocketSession, TextMessage message) throws Exception { @SuppressWarnings("null")
public void afterConnectionEstablished(@NonNull WebSocketSession webSocketSession) throws Exception {
Long connectionId = (Long) webSocketSession.getAttributes().get("connectionId");
String username = (String) webSocketSession.getAttributes().get("username");
if (connectionId == null || username == null) {
webSocketSession.close(CloseStatus.BAD_DATA);
return;
}
User user = userRepository.findByUsername(username).orElse(null);
if (user == null) {
webSocketSession.close(CloseStatus.BAD_DATA);
return;
}
Connection conn = connectionRepository.findById(connectionId).orElse(null);
if (conn == null || !conn.getUserId().equals(user.getId())) {
webSocketSession.close(CloseStatus.BAD_DATA);
return;
}
String password = connectionService.getDecryptedPassword(conn);
String privateKey = connectionService.getDecryptedPrivateKey(conn);
String passphrase = connectionService.getDecryptedPassphrase(conn);
try {
SshService.SshSession sshSession = sshService.createShellSession(conn, password, privateKey, passphrase);
sessions.put(webSocketSession.getId(), sshSession);
lastActivity.put(webSocketSession.getId(), System.currentTimeMillis());
sessionCount.incrementAndGet();
executor.submit(() -> {
try {
InputStream in = sshSession.getOutputStream();
byte[] buf = new byte[4096];
int n;
while (webSocketSession.isOpen() && sshSession.isConnected() && (n = in.read(buf)) >= 0) {
String text = new String(buf, 0, n, "UTF-8");
webSocketSession.sendMessage(new TextMessage(text));
}
} catch (Exception e) {
if (webSocketSession.isOpen()) {
try {
webSocketSession.sendMessage(new TextMessage("\r\n[Connection closed]\r\n"));
} catch (IOException ignored) {
}
}
}
});
} catch (Exception e) {
webSocketSession.sendMessage(new TextMessage("\r\n[SSH Error: " + e.getMessage() + "]\r\n"));
}
}
@Override
protected void handleTextMessage(@NonNull WebSocketSession webSocketSession, @NonNull TextMessage message) throws Exception {
SshService.SshSession sshSession = sessions.get(webSocketSession.getId()); SshService.SshSession sshSession = sessions.get(webSocketSession.getId());
if (sshSession != null && sshSession.isConnected()) { if (sshSession != null && sshSession.isConnected()) {
lastActivity.put(webSocketSession.getId(), System.currentTimeMillis()); lastActivity.put(webSocketSession.getId(), System.currentTimeMillis());
@@ -120,14 +122,14 @@ public class TerminalWebSocketHandler extends TextWebSocketHandler {
sshSession.getInputStream().flush(); sshSession.getInputStream().flush();
} }
} }
@Override @Override
public void afterConnectionClosed(WebSocketSession webSocketSession, CloseStatus status) throws Exception { public void afterConnectionClosed(@NonNull WebSocketSession webSocketSession, @NonNull CloseStatus status) throws Exception {
SshService.SshSession sshSession = sessions.remove(webSocketSession.getId()); SshService.SshSession sshSession = sessions.remove(webSocketSession.getId());
lastActivity.remove(webSocketSession.getId()); lastActivity.remove(webSocketSession.getId());
if (sshSession != null) { if (sshSession != null) {
sshSession.disconnect(); sshSession.disconnect();
sessionCount.decrementAndGet(); sessionCount.decrementAndGet();
} }
} }
} }
backend/src/main/java/com/sshmanager/entity/User.java
+38 -39
View File
@@ -1,39 +1,38 @@
package com.sshmanager.entity; package com.sshmanager.entity;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import javax.persistence.*; import javax.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit;
@Data
@Data @NoArgsConstructor
@NoArgsConstructor @AllArgsConstructor
@AllArgsConstructor @Entity
@Entity @Table(name = "users")
@Table(name = "users") public class User {
public class User {
@Id
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
@GeneratedValue(strategy = GenerationType.IDENTITY) private Long id;
private Long id;
@Column(nullable = false, unique = true, length = 50)
@Column(nullable = false, unique = true, length = 50) private String username;
private String username;
@Column(nullable = false, length = 255)
@Column(nullable = false, length = 255) private String passwordHash;
private String passwordHash;
@Column(length = 100)
@Column(length = 100) private String displayName;
private String displayName;
@Column(nullable = false)
@Column(nullable = false) private Instant createdAt = Instant.now();
private Instant createdAt = Instant.now();
@Column(nullable = false)
@Column(nullable = false) private Instant updatedAt = Instant.now();
private Instant updatedAt = Instant.now();
@Column(nullable = false)
@Column(nullable = false) private Instant passwordChangedAt;
private Instant passwordChangedAt; }
}
backend/src/main/java/com/sshmanager/security/JwtAuthenticationFilter.java
+66 -65
View File
@@ -1,65 +1,66 @@
package com.sshmanager.security; package com.sshmanager.security;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.lang.NonNull;
import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest;
import java.io.IOException; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@Component
public class JwtAuthenticationFilter extends OncePerRequestFilter { @Component
public class JwtAuthenticationFilter extends OncePerRequestFilter {
private final JwtTokenProvider tokenProvider;
private final UserDetailsService userDetailsService; private final JwtTokenProvider tokenProvider;
private final UserDetailsService userDetailsService;
public JwtAuthenticationFilter(JwtTokenProvider tokenProvider, UserDetailsService userDetailsService) {
this.tokenProvider = tokenProvider; public JwtAuthenticationFilter(JwtTokenProvider tokenProvider, UserDetailsService userDetailsService) {
this.userDetailsService = userDetailsService; this.tokenProvider = tokenProvider;
} this.userDetailsService = userDetailsService;
}
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, @Override
FilterChain filterChain) throws ServletException, IOException { protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response,
try { @NonNull FilterChain filterChain) throws ServletException, IOException {
String jwt = getJwtFromRequest(request); try {
if (StringUtils.hasText(jwt) && tokenProvider.validateToken(jwt)) { String jwt = getJwtFromRequest(request);
String username = tokenProvider.getUsernameFromToken(jwt); if (StringUtils.hasText(jwt) && tokenProvider.validateToken(jwt)) {
UserDetails userDetails = userDetailsService.loadUserByUsername(username); String username = tokenProvider.getUsernameFromToken(jwt);
UserDetails userDetails = userDetailsService.loadUserByUsername(username);
UsernamePasswordAuthenticationToken authentication =
new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); UsernamePasswordAuthenticationToken authentication =
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
SecurityContextHolder.getContext().setAuthentication(authentication);
} SecurityContextHolder.getContext().setAuthentication(authentication);
} catch (Exception ex) { }
// Log but don't fail - let controller handle 401 } catch (Exception ex) {
} // Log but don't fail - let controller handle 401
filterChain.doFilter(request, response); }
} filterChain.doFilter(request, response);
}
private String getJwtFromRequest(HttpServletRequest request) {
String bearerToken = request.getHeader("Authorization"); private String getJwtFromRequest(HttpServletRequest request) {
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) { String bearerToken = request.getHeader("Authorization");
return bearerToken.substring(7); if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
} return bearerToken.substring(7);
// WebSocket handshake and SSE endpoints send token as query param }
String uri = request.getRequestURI(); // WebSocket handshake and SSE endpoints send token as query param
if (uri != null && (uri.startsWith("/ws/") || uri.contains("/progress"))) { String uri = request.getRequestURI();
String token = request.getParameter("token"); if (uri != null && (uri.startsWith("/ws/") || uri.contains("/progress"))) {
if (StringUtils.hasText(token)) { String token = request.getParameter("token");
return token; if (StringUtils.hasText(token)) {
} return token;
} }
return null; }
} return null;
} }
}
backend/src/main/java/com/sshmanager/security/PasswordExpirationFilter.java
+2 -1
View File
@@ -7,6 +7,7 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.lang.NonNull;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@@ -29,7 +30,7 @@ public class PasswordExpirationFilter extends OncePerRequestFilter {
} }
@Override @Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull FilterChain filterChain)
throws ServletException, IOException { throws ServletException, IOException {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication != null && authentication.isAuthenticated()) { if (authentication != null && authentication.isAuthenticated()) {
backend/src/main/java/com/sshmanager/service/BackupService.java
+1
View File
@@ -59,6 +59,7 @@ public class BackupService {
} }
@Transactional @Transactional
@SuppressWarnings("null")
public BackupImportResponseDto importBackup(Long userId, BackupPackageDto backupPackage) { public BackupImportResponseDto importBackup(Long userId, BackupPackageDto backupPackage) {
if (backupPackage == null) { if (backupPackage == null) {
throw new IllegalArgumentException("Backup package is required"); throw new IllegalArgumentException("Backup package is required");
backend/src/main/java/com/sshmanager/service/ConnectionService.java
+43 -42
View File
@@ -1,5 +1,5 @@
package com.sshmanager.service; package com.sshmanager.service;
import com.sshmanager.dto.ConnectionCreateRequest; import com.sshmanager.dto.ConnectionCreateRequest;
import com.sshmanager.dto.ConnectionDto; import com.sshmanager.dto.ConnectionDto;
import com.sshmanager.entity.Connection; import com.sshmanager.entity.Connection;
@@ -9,14 +9,15 @@ import com.sshmanager.exception.NotFoundException;
import com.sshmanager.repository.ConnectionRepository; import com.sshmanager.repository.ConnectionRepository;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.Instant; import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
public class ConnectionService { @SuppressWarnings("null")
public class ConnectionService {
private final ConnectionRepository connectionRepository; private final ConnectionRepository connectionRepository;
private final EncryptionService encryptionService; private final EncryptionService encryptionService;
private final SshService sshService; private final SshService sshService;
@@ -31,13 +32,13 @@ public class ConnectionService {
this.sshService = sshService; this.sshService = sshService;
this.sshBootstrapService = sshBootstrapService; this.sshBootstrapService = sshBootstrapService;
} }
public List<ConnectionDto> listByUserId(Long userId) { public List<ConnectionDto> listByUserId(Long userId) {
return connectionRepository.findByUserIdOrderByUpdatedAtDesc(userId).stream() return connectionRepository.findByUserIdOrderByUpdatedAtDesc(userId).stream()
.map(ConnectionDto::fromEntity) .map(ConnectionDto::fromEntity)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public ConnectionDto getById(Long id, Long userId) { public ConnectionDto getById(Long id, Long userId) {
Connection conn = connectionRepository.findById(id).orElseThrow( Connection conn = connectionRepository.findById(id).orElseThrow(
() -> new NotFoundException("Connection not found: " + id)); () -> new NotFoundException("Connection not found: " + id));
@@ -101,7 +102,7 @@ public class ConnectionService {
conn = connectionRepository.save(conn); conn = connectionRepository.save(conn);
return ConnectionDto.fromEntity(conn); return ConnectionDto.fromEntity(conn);
} }
@Transactional @Transactional
public void delete(Long id, Long userId) { public void delete(Long id, Long userId) {
Connection conn = connectionRepository.findById(id).orElse(null); Connection conn = connectionRepository.findById(id).orElse(null);
@@ -122,30 +123,30 @@ public class ConnectionService {
} }
return conn; return conn;
} }
public String getDecryptedPassword(Connection conn) { public String getDecryptedPassword(Connection conn) {
return conn.getEncryptedPassword() != null ? return conn.getEncryptedPassword() != null ?
encryptionService.decrypt(conn.getEncryptedPassword()) : null; encryptionService.decrypt(conn.getEncryptedPassword()) : null;
} }
public String getDecryptedPrivateKey(Connection conn) { public String getDecryptedPrivateKey(Connection conn) {
return conn.getEncryptedPrivateKey() != null ? return conn.getEncryptedPrivateKey() != null ?
encryptionService.decrypt(conn.getEncryptedPrivateKey()) : null; encryptionService.decrypt(conn.getEncryptedPrivateKey()) : null;
} }
public String getDecryptedPassphrase(Connection conn) { public String getDecryptedPassphrase(Connection conn) {
return conn.getPassphrase() != null ? return conn.getPassphrase() != null ?
encryptionService.decrypt(conn.getPassphrase()) : null; encryptionService.decrypt(conn.getPassphrase()) : null;
} }
public Connection testConnection(Connection conn, String password, String privateKey, String passphrase) { public Connection testConnection(Connection conn, String password, String privateKey, String passphrase) {
SshService.SshSession session = null; SshService.SshSession session = null;
try { try {
session = sshService.createShellSession(conn, password, privateKey, passphrase); session = sshService.createShellSession(conn, password, privateKey, passphrase);
return conn; return conn;
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("Connection test failed: " + e.getMessage(), e); throw new RuntimeException("Connection test failed: " + e.getMessage(), e);
} finally { } finally {
if (session != null) { if (session != null) {
session.disconnect(); session.disconnect();
} }
backend/src/test/java/com/sshmanager/controller/ConnectionControllerTest.java
+1 -5
View File
@@ -28,17 +28,13 @@ import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@SuppressWarnings("null")
class ConnectionControllerTest { class ConnectionControllerTest {
@Mock @Mock
backend/src/test/java/com/sshmanager/controller/SftpControllerTest.java
+1
View File
@@ -45,6 +45,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@SuppressWarnings("null")
class SftpControllerTest { class SftpControllerTest {
@Mock @Mock
backend/src/test/java/com/sshmanager/service/BackupServiceTest.java
+1
View File
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@SuppressWarnings("null")
class BackupServiceTest { class BackupServiceTest {
@Mock @Mock
backend/src/test/java/com/sshmanager/service/ConnectionServiceTest.java
+1
View File
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.lenient;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@SuppressWarnings("null")
class ConnectionServiceTest { class ConnectionServiceTest {
@Mock @Mock
backend/src/test/java/com/sshmanager/service/SessionTreeLayoutServiceTest.java
+1
View File
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@SuppressWarnings("null")
class SessionTreeLayoutServiceTest { class SessionTreeLayoutServiceTest {
@Mock @Mock
frontend/src/components/TransferCenterModal.tsx
+5 -5
View File
@@ -110,12 +110,12 @@ export default function TransferCenterModal({
const unsubscribe = subscribeUploadProgress(taskId, (task) => { const unsubscribe = subscribeUploadProgress(taskId, (task) => {
updateTaskGroup(groupId, (current) => { updateTaskGroup(groupId, (current) => {
const nextItems = current.items.map((item) => const nextItems = current.items.map((item) =>
item.taskId === task.taskId item.taskId === task.taskId
? { ? {
...item, ...item,
progress: task.progress, progress: task.progress,
status: task.status, status: task.status,
message: task.error || (task.status === 'success' ? '上传完成' : task.status === 'error' ? '上传失败' : task.status === 'cancelled' ? '已取消' : '正在传输...'), message: task.error || (task.status === 'success' ? '上传完成' : task.status === 'error' ? '上传失败' : '正在传输...'),
} }
: item, : item,
) )
@@ -231,9 +231,9 @@ export default function TransferCenterModal({
<div className="rounded-xl border border-slate-700 bg-black px-4 py-3 text-sm text-slate-400">按浏览器任务并行执行</div> <div className="rounded-xl border border-slate-700 bg-black px-4 py-3 text-sm text-slate-400">按浏览器任务并行执行</div>
</div> </div>
</div> </div>
<div className="flex-1 space-y-2"> <div className="flex min-h-0 flex-1 flex-col space-y-2">
<span className="text-sm text-slate-300">3. 目标服务器</span> <span className="shrink-0 text-sm text-slate-300">3. 目标服务器</span>
<div className="rounded-2xl border border-slate-700 bg-black p-2"> <div className="min-h-0 flex-1 overflow-y-auto rounded-2xl border border-slate-700 bg-black p-2">
{connections.map((server) => { {connections.map((server) => {
const st = connectionStatuses[server.id] const st = connectionStatuses[server.id]
const isOnline = st === 'online' const isOnline = st === 'online'