feat: delete the test upload file of the backup account (#7758)

Author: ssongliu

agent/app/dto/cronjob.go

@@ -113,17 +113,20 @@ type CronjobInfo struct {
 	ContainerName string `json:"containerName"`
 	User          string `json:"user"`
 
-	AppID           string   `json:"appID"`
-	Website         string   `json:"website"`
-	ExclusionRules  string   `json:"exclusionRules"`
-	DBType          string   `json:"dbType"`
-	DBName          string   `json:"dbName"`
-	URL             string   `json:"url"`
-	IsDir           bool     `json:"isDir"`
-	SourceDir       string   `json:"sourceDir"`
-	SourceAccounts  []string `json:"sourceAccounts"`
-	DownloadAccount string   `json:"downloadAccount"`
-	RetainCopies    int      `json:"retainCopies"`
+	AppID          string `json:"appID"`
+	Website        string `json:"website"`
+	ExclusionRules string `json:"exclusionRules"`
+	DBType         string `json:"dbType"`
+	DBName         string `json:"dbName"`
+	URL            string `json:"url"`
+	IsDir          bool   `json:"isDir"`
+	SourceDir      string `json:"sourceDir"`
+	RetainCopies   int    `json:"retainCopies"`
+
+	SourceAccounts    []string `json:"sourceAccounts"`
+	DownloadAccount   string   `json:"downloadAccount"`
+	SourceAccountIDs  string   `json:"sourceAccountIDs"`
+	DownloadAccountID uint     `json:"downloadAccountID"`
 
 	LastRecordStatus string `json:"lastRecordStatus"`
 	LastRecordTime   string `json:"lastRecordTime"`

agent/app/service/backup.go

@@ -314,7 +314,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByID) error {
 }
 
 func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, error) {
-	client, err := newClient(backup)
+	client, err := newClient(backup, false)
 	if err != nil {
 		return false, err
 	}
@@ -340,7 +340,12 @@ func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, erro
 	if backup.Type != constant.Sftp && backup.Type != constant.Local && targetPath != "/" {
 		targetPath = strings.TrimPrefix(targetPath, "/")
 	}
-	return client.Upload(fileItem, targetPath)
+
+	if _, err := client.Upload(fileItem, targetPath); err != nil {
+		return false, err
+	}
+	_, _ = client.Delete(path.Join(backup.BackupPath, "test"))
+	return true, nil
 }
 
 func (u *BackupService) Sync(req dto.SyncFromMaster) error {
@@ -408,7 +413,7 @@ func (u *BackupService) CheckUsed(id uint) error {
 
 func NewBackupClientWithID(id uint) (*model.BackupAccount, cloud_storage.CloudStorageClient, error) {
 	account, _ := backupRepo.Get(repo.WithByID(id))
-	backClient, err := newClient(&account)
+	backClient, err := newClient(&account, true)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -433,7 +438,7 @@ func NewBackupClientMap(ids []string) (map[string]backupClientHelper, error) {
 	accounts, _ = backupRepo.List(repo.WithByIDs(idItems))
 	clientMap := make(map[string]backupClientHelper)
 	for _, item := range accounts {
-		backClient, err := newClient(&item)
+		backClient, err := newClient(&item, true)
 		if err != nil {
 			return nil, err
 		}
@@ -448,7 +453,7 @@ func NewBackupClientMap(ids []string) (map[string]backupClientHelper, error) {
 	return clientMap, nil
 }
 
-func newClient(account *model.BackupAccount) (cloud_storage.CloudStorageClient, error) {
+func newClient(account *model.BackupAccount, isEncrypt bool) (cloud_storage.CloudStorageClient, error) {
 	varMap := make(map[string]interface{})
 	if len(account.Vars) != 0 {
 		if err := json.Unmarshal([]byte(account.Vars), &varMap); err != nil {
@@ -457,8 +462,10 @@ func newClient(account *model.BackupAccount) (cloud_storage.CloudStorageClient,
 	}
 	varMap["bucket"] = account.Bucket
 	varMap["backupPath"] = account.BackupPath
-	account.AccessKey, _ = encrypt.StringDecrypt(account.AccessKey)
-	account.Credential, _ = encrypt.StringDecrypt(account.Credential)
+	if isEncrypt {
+		account.AccessKey, _ = encrypt.StringDecrypt(account.AccessKey)
+		account.Credential, _ = encrypt.StringDecrypt(account.Credential)
+	}
 	switch account.Type {
 	case constant.Sftp, constant.WebDAV:
 		varMap["username"] = account.AccessKey

core/app/service/backup.go

@@ -357,7 +357,11 @@ func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, erro
 	if backup.Type != constant.Sftp && backup.Type != constant.Local && targetPath != "/" {
 		targetPath = strings.TrimPrefix(targetPath, "/")
 	}
-	return client.Upload(fileItem, targetPath)
+	if _, err := client.Upload(fileItem, targetPath); err != nil {
+		return false, err
+	}
+	_, _ = client.Delete(path.Join(backup.BackupPath, "test"))
+	return true, nil
 }
 
 func syncAccountToAgent(backup model.BackupAccount, operation string) {

core/app/task/task.go

@@ -207,37 +207,37 @@ func (t *Task) DeleteLogFile() {
 
 func (t *Task) LogWithStatus(msg string, err error) {
 	if err != nil {
-		t.Logger.Printf(i18n.GetWithNameAndErr("FailedStatus", msg, err))
+		t.Logger.Print(i18n.GetWithNameAndErr("FailedStatus", msg, err))
 	} else {
-		t.Logger.Printf(i18n.GetWithName("SuccessStatus", msg))
+		t.Logger.Print(i18n.GetWithName("SuccessStatus", msg))
 	}
 }
 
 func (t *Task) Log(msg string) {
-	t.Logger.Printf(msg)
+	t.Logger.Print(msg)
 }
 
 func (t *Task) Logf(format string, v ...any) {
 	t.Logger.Printf(format, v...)
 }
 
 func (t *Task) LogFailed(msg string) {
-	t.Logger.Printf(msg + i18n.GetMsgByKey("Failed"))
+	t.Logger.Print(msg + i18n.GetMsgByKey("Failed"))
 }
 
 func (t *Task) LogFailedWithErr(msg string, err error) {
-	t.Logger.Printf(fmt.Sprintf("%s %s : %s", msg, i18n.GetMsgByKey("Failed"), err.Error()))
+	t.Logger.Printf("%s %s : %s", msg, i18n.GetMsgByKey("Failed"), err.Error())
 }
 
 func (t *Task) LogSuccess(msg string) {
-	t.Logger.Printf(msg + i18n.GetMsgByKey("Success"))
+	t.Logger.Print(msg + i18n.GetMsgByKey("Success"))
 }
 func (t *Task) LogSuccessF(format string, v ...any) {
-	t.Logger.Printf(fmt.Sprintf(format, v...) + i18n.GetMsgByKey("Success"))
+	t.Logger.Print(fmt.Sprintf(format, v...) + i18n.GetMsgByKey("Success"))
 }
 
 func (t *Task) LogStart(msg string) {
-	t.Logger.Printf(fmt.Sprintf("%s%s", i18n.GetMsgByKey("Start"), msg))
+	t.Logger.Printf("%s%s", i18n.GetMsgByKey("Start"), msg)
 }
 
 func (t *Task) LogWithOps(operate, msg string) {

core/i18n/i18n.go

@@ -2,6 +2,7 @@ package i18n
 
 import (
 	"embed"
+	"fmt"
 	"strings"
 
 	"github.com/1Panel-dev/1Panel/core/global"
@@ -64,9 +65,10 @@ func GetErrMsg(key string, maps map[string]interface{}) string {
 }
 
 func GetMsgByKey(key string) string {
-	content, _ := global.I18n.Localize(&i18n.LocalizeConfig{
+	content, err := global.I18n.Localize(&i18n.LocalizeConfig{
 		MessageID: key,
 	})
+	fmt.Println(err)
 	return content
 }
 
@@ -132,6 +134,7 @@ func Init() {
 	_, _ = bundle.LoadMessageFileFS(fs, "lang/ru.yaml")
 	_, _ = bundle.LoadMessageFileFS(fs, "lang/ms.yaml")
 	_, _ = bundle.LoadMessageFileFS(fs, "lang/ko.yaml")
+	global.I18n = i18n.NewLocalizer(bundle, "en")
 }
 
 func UseI18nForCmd(lang string) {

core/i18n/lang/en.yaml

@@ -28,7 +28,6 @@ ErrBackupCheck: "Backup account connection test failed {{ .err}}"
 ErrBackupLocal: "Local backup account does not support this operation!"
 ErrBackupPublic: "Non-public backup account detected, please check and retry!"
 ErrOSSConn: "Cannot retrieve latest version, please check if the server can connect to external network."
-ErrEntrance: "Security entrance error, please check and retry!"
 
 #license
 ErrLicense: "License format error, please check and retry!"

core/i18n/lang/ja.yaml

@@ -28,7 +28,6 @@ ErrBackupCheck: "バックアップアカウントの接続テストに失敗し
 ErrBackupLocal: "ローカルサーバーのバックアップアカウントはこの操作をサポートしていません!"
 ErrBackupPublic: "バックアップアカウントが公開ではないことが検出されました、確認して再試行してください!"
 ErrOSSConn: "最新バージョンを取得できませんでした、サーバーが外部ネットワークに接続できるか確認してください。"
-ErrEntrance: "セキュアエントランス情報エラー、確認して再試行してください!"
 
 #license
 ErrLicense: "ライセンスフォーマットエラー、確認して再試行してください!"

core/i18n/lang/ko.yaml

@@ -28,7 +28,6 @@ ErrBackupCheck: "백업 계정 연결 테스트 실패 {{ .err}}"
 ErrBackupLocal: "로컬 서버 백업 계정은 현재 작업을 지원하지 않습니다!"
 ErrBackupPublic: "이 백업 계정이 공용이 아님을 감지했습니다. 다시 확인하고 시도해 주세요!"
 ErrOSSConn: "최신 버전을 가져올 수 없습니다. 서버가 외부 네트워크에 연결되어 있는지 확인하세요."
-ErrEntrance: "보안 입구 정보가 잘못되었습니다. 다시 확인하고 시도해 주세요!"
 
 #license
 ErrLicense: "라이선스 형식이 잘못되었습니다. 다시 확인하고 시도해 주세요!"

core/i18n/lang/ms.yml

@@ -28,7 +28,6 @@ ErrBackupCheck: "Cubaan sambungan akaun sandaran gagal {{ .err}}"
 ErrBackupLocal: "Akaun sandaran pelayan tempatan tidak menyokong operasi ini!"
 ErrBackupPublic: "Akaun sandaran ini didapati bukan awam, sila semak dan cuba lagi!"
 ErrOSSConn: "Tidak dapat mendapatkan versi terkini, sila pastikan pelayan boleh disambung ke rangkaian luar."
-ErrEntrance: "Maklumat pintu masuk selamat salah, sila semak dan cuba lagi!"
 
 #license
 ErrLicense: "Format lesen salah, sila semak dan cuba lagi!"

core/i18n/lang/pt-BR.yaml

@@ -28,7 +28,6 @@ ErrBackupCheck: "Falha na conexão de teste da conta de backup {{ .err}}"
 ErrBackupLocal: "A conta de backup do servidor local não suporta essa operação!"
 ErrBackupPublic: "Detectamos que a conta de backup não é pública, verifique e tente novamente!"
 ErrOSSConn: "Não foi possível obter a versão mais recente, verifique se o servidor pode se conectar à rede externa."
-ErrEntrance: "Erro nas informações de entrada de segurança, verifique e tente novamente!"
 
 #license
 ErrLicense: "Erro no formato da licença, verifique e tente novamente!"