add: encrypted transmission
This commit is contained in:
@@ -201,14 +201,14 @@ func (s *Service) ask(ctx context.Context, target *discovery.Peer, targetIP stri
|
||||
// 发送请求
|
||||
askBody, _ := json.Marshal(task)
|
||||
|
||||
askUrl := fmt.Sprintf("http://%s:%d/transfer/ask", targetIP, target.Port)
|
||||
askUrl := fmt.Sprintf("https://%s:%d/transfer/ask", targetIP, target.Port)
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, askUrl, bytes.NewReader(askBody))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
if err != nil {
|
||||
return TransferAskResponse{}, err
|
||||
}
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
resp, err := s.httpClient.Do(req)
|
||||
if err != nil {
|
||||
return TransferAskResponse{}, err
|
||||
}
|
||||
@@ -234,7 +234,7 @@ func (s *Service) processTransfer(ctx context.Context, askResp TransferAskRespon
|
||||
if err := ctx.Err(); err != nil {
|
||||
return
|
||||
}
|
||||
uploadUrl, _ := url.Parse(fmt.Sprintf("http://%s:%d/transfer/upload/%s", targetIP, target.Port, task.ID))
|
||||
uploadUrl, _ := url.Parse(fmt.Sprintf("https://%s:%d/transfer/upload/%s", targetIP, target.Port, task.ID))
|
||||
query := uploadUrl.Query()
|
||||
query.Add("token", askResp.Token)
|
||||
uploadUrl.RawQuery = query.Encode()
|
||||
@@ -260,7 +260,7 @@ func (s *Service) processTransfer(ctx context.Context, askResp TransferAskRespon
|
||||
req.ContentLength = task.FileSize
|
||||
req.Header.Set("Content-Type", "application/octet-stream")
|
||||
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
resp, err := s.httpClient.Do(req)
|
||||
if err != nil {
|
||||
if errors.Is(err, context.Canceled) {
|
||||
task.Status = TransferStatusCanceled
|
||||
|
||||
@@ -2,10 +2,14 @@ package transfer
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"mesh-drop/internal/config"
|
||||
"mesh-drop/internal/discovery"
|
||||
"mesh-drop/internal/security"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -28,17 +32,29 @@ type Service struct {
|
||||
// cancelMap 存储取消操作的通道
|
||||
// Key: TransferID, Value: context.CancelFunc
|
||||
cancelMap sync.Map
|
||||
|
||||
httpClient *http.Client
|
||||
}
|
||||
|
||||
func NewService(config *config.Config, app *application.App, notifier *notifications.NotificationService, port int, discoveryService *discovery.Service) *Service {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
|
||||
// 配置自定义 HTTP 客户端以跳过自签名证书验证
|
||||
tr := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||
}
|
||||
httpClient := &http.Client{
|
||||
Transport: tr,
|
||||
Timeout: 0,
|
||||
}
|
||||
|
||||
return &Service{
|
||||
app: app,
|
||||
notifier: notifier,
|
||||
port: port,
|
||||
discoveryService: discoveryService,
|
||||
config: config,
|
||||
httpClient: httpClient,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,9 +75,19 @@ func (s *Service) Start() {
|
||||
}
|
||||
|
||||
go func() {
|
||||
configDir := config.GetConfigDir()
|
||||
certPath := filepath.Join(configDir, "server.crt")
|
||||
keyPath := filepath.Join(configDir, "server.key")
|
||||
|
||||
if err := security.EnsureCertificates(certPath, keyPath); err != nil {
|
||||
slog.Error("Failed to generate certificates", "error", err, "component", "transfer")
|
||||
return
|
||||
}
|
||||
|
||||
addr := fmt.Sprintf(":%d", s.port)
|
||||
slog.Info("Transfer service listening", "address", addr, "component", "transfer")
|
||||
if err := r.Run(addr); err != nil {
|
||||
slog.Info("Transfer service listening (HTTPS)", "address", addr, "component", "transfer")
|
||||
|
||||
if err := r.RunTLS(addr, certPath, keyPath); err != nil {
|
||||
slog.Error("Transfer service error", "error", err, "component", "transfer")
|
||||
}
|
||||
}()
|
||||
|
||||
Reference in New Issue
Block a user