v1.9.3

Author: doki-byte

README.md

@@ -8,11 +8,17 @@
 
 ## 更新说明
 
-###  v1.9.2
+###  v1.9.3
 
 感谢师傅们提供的修改建议，目前已更新一下功能：
 
-1. 新增redis命令执行功能;
+1. 优化redis界面，修复连接过多导致的页面无限下拉的bug; 
+2. 新增显示更新详情功能;
+3. 参考fine修改小程序反编译界面; 
+4. tools新建工具的时间添加打开工具文件位置的功能; 
+5. 新增二级菜单的显示/隐藏,位置移动; 
+6. 修改ftp下载方式为浏览器下载，避免EasyTools卡死; 
+7. 优化JwtCreck功能;
 
 ## 工具介绍
 
@@ -94,7 +100,7 @@ cd /D EasyToolsFiles\tools\gui_webshell\Godzilla && loader.vbs [可选参数]
 
 ![image-20250826211856564](images/image-20250826211856564.png)
 
-![image-20250826211907568](images/image-20250826211907568.png)
+![image-20250826211907568.png](images/image-20250826211907568.png)
 
 ### 简连助手
 
@@ -228,4 +234,5 @@ https://github.com/gchq/CyberChef
 https://github.com/ZororoZ/fscanOutput
 https://github.com/o8oo8o/WebSSH
 https://github.com/broken5/unveilr
+https://github.com/fasnow/fine
 ~~~

app/connect/ftp/ftp.go

@@ -1,18 +1,47 @@
 package ftp
 
 import (
+	"crypto/md5"
 	"fmt"
 	"io"
 	"net/http"
 	"path/filepath"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/jlaffaye/ftp"
 )
 
+var (
+	downloadTokens = make(map[string]FTPConfig)
+	tokenMutex     sync.RWMutex
+)
+
+type FTPConfig struct {
+	Host     string
+	Port     int
+	Username string
+	Password string
+	Path     string
+	Created  time.Time
+}
+
+// 清理过期的令牌
+func cleanupTokens() {
+	tokenMutex.Lock()
+	defer tokenMutex.Unlock()
+
+	now := time.Now()
+	for token, config := range downloadTokens {
+		if now.Sub(config.Created) > 10*time.Minute { // 10分钟过期
+			delete(downloadTokens, token)
+		}
+	}
+}
+
 func connectFTP(host string, port int, username, password string) (*ftp.ServerConn, error) {
 	address := fmt.Sprintf("%s:%d", host, port)
 	conn, err := ftp.Dial(address, ftp.DialWithTimeout(5*time.Second))
@@ -157,6 +186,120 @@ func StartWebFTP() {
 		}
 	})
 
+	// 生成下载令牌
+	r.POST("/api/ftp/generate-download-url", func(c *gin.Context) {
+		var req struct {
+			Host     string `json:"host"`
+			Port     int    `json:"port"`
+			Username string `json:"username"`
+			Password string `json:"password"`
+			Path     string `json:"path"`
+		}
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		// 验证FTP连接
+		conn, err := connectFTP(req.Host, req.Port, req.Username, req.Password)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		defer conn.Quit()
+
+		// 验证文件存在
+		_, err = conn.FileSize(req.Path)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "文件不存在: " + err.Error()})
+			return
+		}
+
+		// 生成唯一令牌
+		token := fmt.Sprintf("%x", md5.Sum([]byte(fmt.Sprintf("%s%d%s%s%s%d",
+			req.Host, req.Port, req.Username, req.Password, req.Path, time.Now().UnixNano()))))
+
+		// 存储令牌信息
+		tokenMutex.Lock()
+		downloadTokens[token] = FTPConfig{
+			Host:     req.Host,
+			Port:     req.Port,
+			Username: req.Username,
+			Password: req.Password,
+			Path:     req.Path,
+			Created:  time.Now(),
+		}
+		tokenMutex.Unlock()
+
+		// 定期清理令牌
+		go cleanupTokens()
+
+		downloadURL := fmt.Sprintf("http://127.0.0.1:52869/api/ftp/direct-download?token=%s", token)
+
+		c.JSON(http.StatusOK, gin.H{"downloadUrl": downloadURL})
+	})
+
+	// 直接下载接口
+	r.GET("/api/ftp/direct-download", func(c *gin.Context) {
+		token := c.Query("token")
+		if token == "" {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "缺少下载令牌"})
+			return
+		}
+
+		// 获取令牌对应的配置
+		tokenMutex.RLock()
+		config, exists := downloadTokens[token]
+		tokenMutex.RUnlock()
+
+		if !exists {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "下载令牌无效或已过期"})
+			return
+		}
+
+		// 连接FTP
+		conn, err := connectFTP(config.Host, config.Port, config.Username, config.Password)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		defer conn.Quit()
+
+		// 获取文件信息
+		size, err := conn.FileSize(config.Path)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "获取文件大小失败: " + err.Error()})
+			return
+		}
+
+		// 开始下载
+		resp, err := conn.Retr(config.Path)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		defer resp.Close()
+
+		// 设置响应头
+		filename := filepath.Base(config.Path)
+		c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
+		c.Header("Content-Type", "application/octet-stream")
+		c.Header("Content-Length", fmt.Sprintf("%d", size))
+		c.Status(http.StatusOK)
+
+		// 流式传输
+		buf := make([]byte, 32*1024)
+		_, err = io.CopyBuffer(c.Writer, io.LimitReader(resp, size), buf)
+		if err != nil && err != io.EOF {
+			fmt.Println("下载中断:", err)
+		}
+
+		// 下载完成后删除令牌（可选）
+		tokenMutex.Lock()
+		delete(downloadTokens, token)
+		tokenMutex.Unlock()
+	})
+
 	// 删除文件或目录
 	r.POST("/api/ftp/delete", func(c *gin.Context) {
 		var req struct {

app/connect/ssh/gin/version.go

@@ -5,4 +5,4 @@
 package gin
 
 // Version is the current gin framework's version.
-const Version = "v1.9.1"
+const Version = "v1.9.3"

app/controller/base.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"EasyTools/app/util"
 	"context"
-
 	"gorm.io/gorm"
 )
 

app/controller/checkUpdata.go

@@ -17,6 +17,7 @@ type Update struct {
 type GitHubRelease struct {
 	TagName string `json:"tag_name"`
 	HTMLURL string `json:"html_url"`
+	Body    string `json:"body"` // 添加更新内容字段
 }
 
 type CheckResult struct {
@@ -32,7 +33,7 @@ func CheckVersion() *Update {
 func (u *Update) GetLatestRelease() (*CheckResult, error) {
 	owner := "doki-byte"
 	repo := "EasyTools"
-	currentVersion := "v1.9.2" // 请确保与前端保持一致
+	currentVersion := "v1.9.3" // 请确保与前端保持一致
 
 	latest, err := CheckLatestRelease(owner, repo)
 	if err != nil {
@@ -73,18 +74,23 @@ func CheckLatestRelease(owner, repo string) (*GitHubRelease, error) {
 	}
 
 	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36")
+	req.Header.Set("Accept", "application/vnd.github.v3+json")
 
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("请求失败: %s", err)
 	}
 	defer resp.Body.Close()
 
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("GitHub API 返回错误状态码: %d", resp.StatusCode)
+	}
+
 	var release GitHubRelease
 	if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
 		return nil, fmt.Errorf("解析响应失败: %s", err)
 	}
 
-	fmt.Println("最新版本信息:", release)
+	fmt.Printf("最新版本信息: %s - %s\n", release.TagName, release.HTMLURL)
 	return &release, nil
 }

app/controller/jwtcrack.go

@@ -13,6 +13,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -208,8 +209,6 @@ func (j *JwtCrackController) BruteForceJWT(tokenStr string, alg string, filepath
 		}
 	}
 
-	var lastErr error
-
 	for _, key := range keyList {
 		token, err := jwt.Parse(tokenStr, func(token *jwt.Token) (interface{}, error) {
 			if token.Method.Alg() != alg {
@@ -218,7 +217,7 @@ func (j *JwtCrackController) BruteForceJWT(tokenStr string, alg string, filepath
 			return []byte(key), nil
 		})
 		if err != nil {
-			lastErr = err
+			_ = err
 			continue
 		}
 
@@ -243,7 +242,7 @@ func (j *JwtCrackController) BruteForceJWT(tokenStr string, alg string, filepath
 
 	// 所有密钥都尝试失败
 	return JwtResult{
-		Error: "所有密钥尝试失败: " + lastErr.Error()}
+		Error: "所有密钥尝试失败"}
 }
 
 // 从文件读取密钥列表
@@ -454,3 +453,41 @@ func loadEd25519PublicKeyFromPEM(path string) (ed25519.PublicKey, error) {
 
 	return edKey, nil
 }
+
+// 获取默认字典路径
+func (j *JwtCrackController) GetDefaultDictPath() string {
+	appPath := j.getAppPath()
+	defaultDictPath := filepath.Join(appPath, "tools", "dict", "jwtdict.txt")
+
+	// 检查文件是否存在
+	if _, err := os.Stat(defaultDictPath); os.IsNotExist(err) {
+		// 如果文件不存在，创建目录和默认字典文件
+		configDir := filepath.Dir(defaultDictPath)
+		if err := os.MkdirAll(configDir, 0755); err != nil {
+			return ""
+		}
+
+		// 创建默认字典文件，包含一些常见密钥
+		defaultDictContent := `secret
+key
+password
+123456
+admin
+token
+jwt
+abcdefghijklmnopqrstuvwxyz
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
+0123456789
+supersecret
+verysecret
+muchsecret
+wowsecret
+suchsecret`
+
+		if err := os.WriteFile(defaultDictPath, []byte(defaultDictContent), 0644); err != nil {
+			return ""
+		}
+	}
+
+	return defaultDictPath
+}

app/controller/run.go

@@ -4,7 +4,7 @@ import (
 	"EasyTools/app/connect/redis"
 	hotkey2 "EasyTools/app/hotkey"
 	"EasyTools/app/model"
-	proxy "EasyTools/app/proxy/client"
+	"EasyTools/app/proxy/client"
 	"EasyTools/app/restmate"
 	"context"
 	"embed"
@@ -44,13 +44,17 @@ func WailsRun(assets embed.FS, port int, appIcon, systemTrayIcon []byte) {
 	// 启动 Wails 服务
 	err := wails.Run(&options.App{
 		Title:  "EasyTools：一款实用的渗透测试工具箱 ",
-		Width:  1200,
-		Height: 800,
+		Width:  1220,
+		Height: 850,
 		AssetServer: &assetserver.Options{
 			Assets: assets,
 		},
 		Frameless:        false,
 		BackgroundColour: &options.RGBA{R: 255, G: 255, B: 255, A: 1},
+		OnBeforeClose: func(ctx context.Context) (prevent bool) {
+			runtime.EventsEmit(ctx, "app-exit")
+			return true
+		},
 		OnStartup: func(ctx context.Context) {
 			// 设置 context 对象
 			system.setCtx(ctx)
@@ -74,11 +78,11 @@ func WailsRun(assets embed.FS, port int, appIcon, systemTrayIcon []byte) {
 			server.start(port)
 			if runtime2.GOOS == "windows" {
 				// 优先初始化数据库表结构
-				server.schema(&model.User{}, &model.Sites{}, &model.Tools{}, &model.Password_data{}, &model.Google_query{}, &model.Antivirus_list{})
+				server.schema(&model.User{}, &model.Sites{}, &model.Tools{}, &model.Password_data{}, &model.Google_query{}, &model.Antivirus_list{}, &model.WechatConfig{}, &model.MiniAppInfo{}, &model.VersionTask{})
 				// 异步执行文件释放（防止阻塞主流程）
 				go server.initFile().initMianSha()
 			} else {
-				server.schema(&model.User{}, &model.Sites{}, &model.Tools{}, &model.Password_data{}, &model.Google_query{}, &model.Antivirus_list{})
+				server.schema(&model.User{}, &model.Sites{}, &model.Tools{}, &model.Password_data{}, &model.Google_query{}, &model.Antivirus_list{}, &model.WechatConfig{}, &model.MiniAppInfo{}, &model.VersionTask{})
 				go server.initFile()
 			}
 			// 启动监控协程
@@ -97,7 +101,7 @@ func WailsRun(assets embed.FS, port int, appIcon, systemTrayIcon []byte) {
 						memTotal := system.GetMemUsageTotal() // 实现获取总内存使用的方法
 
 						// 格式化标题
-						newTitle := fmt.Sprintf("EasyTools：一款实用的渗透测试工具箱  v1.9.2            CPU: %.2f%% | 自身: %.2f MB | 内存: %.2f%%",
+						newTitle := fmt.Sprintf("EasyTools：一款实用的渗透测试工具箱  v1.9.3            CPU: %.2f%% | 自身: %.2f MB | 内存: %.2f%%",
 							cpuUsage, memSelf, memTotal)
 
 						// 更新窗口标题
@@ -112,6 +116,7 @@ func WailsRun(assets embed.FS, port int, appIcon, systemTrayIcon []byte) {
 			WebviewIsTransparent:              false,
 			WindowIsTranslucent:               false,
 			DisableFramelessWindowDecorations: true,
+			Theme:                             windows.Light,
 		},
 		Mac: &mac.Options{
 			TitleBar: mac.TitleBarDefault(),