pref: Optimize backup account code structure

Author: ssongliu

core/app/api/v2/backup.go

@@ -1,8 +1,6 @@
 package v2
 
 import (
-	"fmt"
-
 	"github.com/1Panel-dev/1Panel/core/app/api/v2/helper"
 	"github.com/1Panel-dev/1Panel/core/app/dto"
 	"github.com/gin-gonic/gin"
@@ -50,49 +48,6 @@ func (b *BaseApi) RefreshToken(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags Backup Account
-// @Summary List buckets
-// @Accept json
-// @Param request body dto.ForBuckets true "request"
-// @Success 200 {array} string
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /core/backups/buckets [post]
-func (b *BaseApi) ListBuckets(c *gin.Context) {
-	var req dto.ForBuckets
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	buckets, err := backupService.GetBuckets(req)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, buckets)
-}
-
-// @Tags Backup Account
-// @Summary Load backup account base info
-// @Accept json
-// @Success 200 {object} dto.BackupClientInfo
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /core/backups/client/:clientType [get]
-func (b *BaseApi) LoadBackupClientInfo(c *gin.Context) {
-	clientType, ok := c.Params.Get("clientType")
-	if !ok {
-		helper.BadRequest(c, fmt.Errorf("error %s in path", "clientType"))
-		return
-	}
-	data, err := backupService.LoadBackupClientInfo(clientType)
-	if err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.SuccessWithData(c, data)
-}
-
 // @Tags Backup Account
 // @Summary Delete backup account
 // @Accept json

core/app/dto/backup.go

@@ -37,12 +37,6 @@ type BackupInfo struct {
 	RememberAuth bool `json:"rememberAuth"`
 }
 
-type BackupClientInfo struct {
-	ClientID     string `json:"client_id"`
-	ClientSecret string `json:"client_secret"`
-	RedirectUri  string `json:"redirect_uri"`
-}
-
 type ForBuckets struct {
 	Type       string `json:"type" validate:"required"`
 	AccessKey  string `json:"accessKey"`

core/app/service/backup.go

@@ -1,13 +1,10 @@
 package service
 
 import (
-	"bufio"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"os"
-	"path"
 	"strings"
 	"time"
 
@@ -18,7 +15,6 @@ import (
 	"github.com/1Panel-dev/1Panel/core/constant"
 	"github.com/1Panel-dev/1Panel/core/global"
 	"github.com/1Panel-dev/1Panel/core/utils/cloud_storage"
-	"github.com/1Panel-dev/1Panel/core/utils/cloud_storage/client"
 	"github.com/1Panel-dev/1Panel/core/utils/encrypt"
 	"github.com/1Panel-dev/1Panel/core/utils/req_helper/proxy_local"
 	"github.com/1Panel-dev/1Panel/core/utils/xpack"
@@ -28,9 +24,7 @@ import (
 type BackupService struct{}
 
 type IBackupService interface {
-	LoadBackupClientInfo(clientType string) (dto.BackupClientInfo, error)
 	Create(backupDto dto.BackupOperate) error
-	GetBuckets(backupDto dto.ForBuckets) ([]interface{}, error)
 	Update(req dto.BackupOperate) error
 	Delete(name string) error
 	RefreshToken(req dto.OperateByName) error
@@ -40,33 +34,6 @@ func NewIBackupService() IBackupService {
 	return &BackupService{}
 }
 
-func (u *BackupService) LoadBackupClientInfo(clientType string) (dto.BackupClientInfo, error) {
-	var data dto.BackupClientInfo
-	clientIDKey := "OneDriveID"
-	clientIDSc := "OneDriveSc"
-	data.RedirectUri = constant.OneDriveRedirectURI
-	clientID, err := settingRepo.Get(repo.WithByKey(clientIDKey))
-	if err != nil {
-		return data, err
-	}
-	idItem, err := base64.StdEncoding.DecodeString(clientID.Value)
-	if err != nil {
-		return data, err
-	}
-	data.ClientID = string(idItem)
-	clientSecret, err := settingRepo.Get(repo.WithByKey(clientIDSc))
-	if err != nil {
-		return data, err
-	}
-	secretItem, err := base64.StdEncoding.DecodeString(clientSecret.Value)
-	if err != nil {
-		return data, err
-	}
-	data.ClientSecret = string(secretItem)
-
-	return data, err
-}
-
 func (u *BackupService) Create(req dto.BackupOperate) error {
 	if !req.IsPublic {
 		return buserr.New("ErrBackupPublic")
@@ -97,11 +64,6 @@ func (u *BackupService) Create(req dto.BackupOperate) error {
 			return err
 		}
 	}
-	if req.Type != "LOCAL" {
-		if _, err := u.checkBackupConn(&backup); err != nil {
-			return buserr.WithMap("ErrBackupCheck", map[string]interface{}{"err": err.Error()}, err)
-		}
-	}
 
 	backup.AccessKey, err = encrypt.StringEncrypt(backup.AccessKey)
 	if err != nil {
@@ -120,37 +82,6 @@ func (u *BackupService) Create(req dto.BackupOperate) error {
 	return nil
 }
 
-func (u *BackupService) GetBuckets(req dto.ForBuckets) ([]interface{}, error) {
-	itemAccessKey, err := base64.StdEncoding.DecodeString(req.AccessKey)
-	if err != nil {
-		return nil, err
-	}
-	req.AccessKey = string(itemAccessKey)
-	itemCredential, err := base64.StdEncoding.DecodeString(req.Credential)
-	if err != nil {
-		return nil, err
-	}
-	req.Credential = string(itemCredential)
-
-	varMap := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(req.Vars), &varMap); err != nil {
-		return nil, err
-	}
-	switch req.Type {
-	case constant.Sftp, constant.WebDAV:
-		varMap["username"] = req.AccessKey
-		varMap["password"] = req.Credential
-	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
-		varMap["accessKey"] = req.AccessKey
-		varMap["secretKey"] = req.Credential
-	}
-	client, err := cloud_storage.NewCloudStorageClient(req.Type, varMap)
-	if err != nil {
-		return nil, err
-	}
-	return client.ListBuckets()
-}
-
 func (u *BackupService) Delete(name string) error {
 	backup, _ := backupRepo.Get(repo.WithByName(name))
 	if backup.ID == 0 {
@@ -215,10 +146,6 @@ func (u *BackupService) Update(req dto.BackupOperate) error {
 			return err
 		}
 	}
-	isOk, err := u.checkBackupConn(&newBackup)
-	if err != nil || !isOk {
-		return buserr.WithMap("ErrBackupCheck", map[string]interface{}{"err": err.Error()}, err)
-	}
 
 	newBackup.AccessKey, err = encrypt.StringEncrypt(newBackup.AccessKey)
 	if err != nil {
@@ -258,9 +185,9 @@ func (u *BackupService) RefreshToken(req dto.OperateByName) error {
 	)
 	switch backup.Type {
 	case constant.OneDrive:
-		refreshToken, err = client.RefreshToken("refresh_token", "refreshToken", varMap)
+		refreshToken, err = cloud_storage.RefreshToken("refresh_token", "refreshToken", varMap)
 	case constant.ALIYUN:
-		refreshToken, err = client.RefreshALIToken(varMap)
+		refreshToken, err = cloud_storage.RefreshALIToken(varMap)
 	}
 	if err != nil {
 		varMap["refresh_status"] = constant.StatusFailed
@@ -282,32 +209,6 @@ func (u *BackupService) RefreshToken(req dto.OperateByName) error {
 	return nil
 }
 
-func (u *BackupService) NewClient(backup *model.BackupAccount) (cloud_storage.CloudStorageClient, error) {
-	varMap := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
-		return nil, err
-	}
-	varMap["bucket"] = backup.Bucket
-	switch backup.Type {
-	case constant.Sftp, constant.WebDAV:
-		varMap["username"] = backup.AccessKey
-		varMap["password"] = backup.Credential
-	case constant.OSS, constant.S3, constant.MinIo, constant.Cos, constant.Kodo:
-		varMap["accessKey"] = backup.AccessKey
-		varMap["secretKey"] = backup.Credential
-	case constant.UPYUN:
-		varMap["operator"] = backup.AccessKey
-		varMap["password"] = backup.Credential
-	}
-
-	backClient, err := cloud_storage.NewCloudStorageClient(backup.Type, varMap)
-	if err != nil {
-		return nil, err
-	}
-
-	return backClient, nil
-}
-
 func (u *BackupService) loadRefreshTokenByCode(backup *model.BackupAccount) error {
 	varMap := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
@@ -316,12 +217,12 @@ func (u *BackupService) loadRefreshTokenByCode(backup *model.BackupAccount) erro
 	refreshToken := ""
 	var err error
 	if backup.Type == constant.GoogleDrive {
-		refreshToken, err = client.RefreshGoogleToken("authorization_code", "refreshToken", varMap)
+		refreshToken, err = cloud_storage.RefreshGoogleToken("authorization_code", "refreshToken", varMap)
 		if err != nil {
 			return err
 		}
 	} else {
-		refreshToken, err = client.RefreshToken("authorization_code", "refreshToken", varMap)
+		refreshToken, err = cloud_storage.RefreshToken("authorization_code", "refreshToken", varMap)
 		if err != nil {
 			return err
 		}
@@ -337,37 +238,3 @@ func (u *BackupService) loadRefreshTokenByCode(backup *model.BackupAccount) erro
 	backup.Vars = string(itemVars)
 	return nil
 }
-
-func (u *BackupService) checkBackupConn(backup *model.BackupAccount) (bool, error) {
-	client, err := u.NewClient(backup)
-	if err != nil {
-		return false, err
-	}
-	fileItem := path.Join(global.CONF.Base.InstallDir, "1panel/tmp/test/1panel")
-	if _, err := os.Stat(path.Dir(fileItem)); err != nil && os.IsNotExist(err) {
-		if err = os.MkdirAll(path.Dir(fileItem), os.ModePerm); err != nil {
-			return false, err
-		}
-	}
-	file, err := os.OpenFile(fileItem, os.O_WRONLY|os.O_CREATE, constant.FilePerm)
-	if err != nil {
-		return false, err
-	}
-	defer file.Close()
-	write := bufio.NewWriter(file)
-	_, _ = write.WriteString("1Panel 备份账号测试文件。\n")
-	_, _ = write.WriteString("1Panel 備份賬號測試文件。\n")
-	_, _ = write.WriteString("1Panel Backs up account test files.\n")
-	_, _ = write.WriteString("1Panelアカウントのテストファイルをバックアップします。\n")
-	write.Flush()
-
-	targetPath := path.Join(backup.BackupPath, "test/1panel")
-	if backup.Type != constant.Sftp && backup.Type != constant.Local && targetPath != "/" {
-		targetPath = strings.TrimPrefix(targetPath, "/")
-	}
-	if _, err := client.Upload(fileItem, targetPath); err != nil {
-		return false, err
-	}
-	_, _ = client.Delete(path.Join(backup.BackupPath, "test/1panel"))
-	return true, nil
-}

core/constant/common.go

@@ -30,8 +30,6 @@ const (
 	UPYUN       = "UPYUN"
 	ALIYUN      = "ALIYUN"
 	GoogleDrive = "GoogleDrive"
-
-	OneDriveRedirectURI = "http://localhost/login/authorized"
 )
 
 const (

core/init/cron/job/backup.go

@@ -7,7 +7,7 @@ import (
 	"github.com/1Panel-dev/1Panel/core/app/model"
 	"github.com/1Panel-dev/1Panel/core/constant"
 	"github.com/1Panel-dev/1Panel/core/global"
-	"github.com/1Panel-dev/1Panel/core/utils/cloud_storage/client"
+	"github.com/1Panel-dev/1Panel/core/utils/cloud_storage"
 	"github.com/1Panel-dev/1Panel/core/utils/xpack"
 )
 
@@ -39,9 +39,9 @@ func (b *backup) Run() {
 		)
 		switch backupItem.Type {
 		case constant.OneDrive:
-			refreshToken, err = client.RefreshToken("refresh_token", "refreshToken", varMap)
+			refreshToken, err = cloud_storage.RefreshToken("refresh_token", "refreshToken", varMap)
 		case constant.ALIYUN:
-			refreshToken, err = client.RefreshALIToken(varMap)
+			refreshToken, err = cloud_storage.RefreshALIToken(varMap)
 		}
 		if err != nil {
 			varMap["refresh_status"] = constant.StatusFailed

core/router/ro_backup.go

@@ -14,9 +14,7 @@ func (s *BackupRouter) InitRouter(Router *gin.RouterGroup) {
 		Use(middleware.PasswordExpired())
 	baseApi := v2.ApiGroupApp.BaseApi
 	{
-		backupRouter.GET("/client/:clientType", baseApi.LoadBackupClientInfo)
 		backupRouter.POST("/refresh/token", baseApi.RefreshToken)
-		backupRouter.POST("/buckets", baseApi.ListBuckets)
 		backupRouter.POST("", baseApi.CreateBackup)
 		backupRouter.POST("/del", baseApi.DeleteBackup)
 		backupRouter.POST("/update", baseApi.UpdateBackup)