From e18102dfc93835ed7bac8afd0c9a133a924652d5 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:43:38 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20=E5=8A=A0=E5=AF=86=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20(#5325)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/cronjob_helper.go | 16 +++++--------- backend/app/service/snapshot.go | 7 ++---- backend/app/service/snapshot_create.go | 7 ++---- backend/utils/files/tar_gz.go | 14 ++++-------- frontend/src/views/setting/snapshot/index.vue | 22 ++++++++++++++++--- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/backend/app/service/cronjob_helper.go b/backend/app/service/cronjob_helper.go index 1d0459073..b6947e604 100644 --- a/backend/app/service/cronjob_helper.go +++ b/backend/app/service/cronjob_helper.go @@ -159,15 +159,13 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string, secret string) } commands := "" - if secret != "" { + + if len(secret) != 0 { extraCmd := "| openssl enc -aes-256-cbc -salt -k " + secret + " -out" commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s %s", " -"+excludeRules, path, extraCmd, targetDir+"/"+name) - } else { - commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s", targetDir+"/"+name, excludeRules, path) - } - if len(secret) != 0 { global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******")) } else { + commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s", targetDir+"/"+name, excludeRules, path) global.LOG.Debug(commands) } stdout, err := cmd.ExecWithTimeOut(commands, 24*time.Hour) @@ -187,17 +185,15 @@ func handleUnTar(sourceFile, targetDir string, secret string) error { } } commands := "" - if secret != "" { + if len(secret) != 0 { extraCmd := "openssl enc -d -aes-256-cbc -k " + secret + " -in " + sourceFile + " | " commands = fmt.Sprintf("%s tar -zxvf - -C %s", extraCmd, targetDir+" > /dev/null 2>&1") - } else { - commands = fmt.Sprintf("tar zxvfC %s %s", sourceFile, targetDir) - } - if len(secret) != 0 { global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******")) } else { + commands = fmt.Sprintf("tar zxvfC %s %s", sourceFile, targetDir) global.LOG.Debug(commands) } + stdout, err := cmd.ExecWithTimeOut(commands, 24*time.Hour) if err != nil { global.LOG.Errorf("do handle untar failed, stdout: %s, err: %v", stdout, err) diff --git a/backend/app/service/snapshot.go b/backend/app/service/snapshot.go index afdb8978b..18357a9eb 100644 --- a/backend/app/service/snapshot.go +++ b/backend/app/service/snapshot.go @@ -392,15 +392,12 @@ func (u *SnapshotService) handleUnTar(sourceDir, targetDir string, secret string } } commands := "" - if secret != "" { + if len(secret) != 0 { extraCmd := "openssl enc -d -aes-256-cbc -k " + secret + " -in " + sourceDir + " | " commands = fmt.Sprintf("%s tar -zxvf - -C %s", extraCmd, targetDir+" > /dev/null 2>&1") - } else { - commands = fmt.Sprintf("tar zxvfC %s %s", sourceDir, targetDir) - } - if len(secret) != 0 { global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******")) } else { + commands = fmt.Sprintf("tar zxvfC %s %s", sourceDir, targetDir) global.LOG.Debug(commands) } stdout, err := cmd.ExecWithTimeOut(commands, 30*time.Minute) diff --git a/backend/app/service/snapshot_create.go b/backend/app/service/snapshot_create.go index 42ec4aaa7..56d8f2a16 100644 --- a/backend/app/service/snapshot_create.go +++ b/backend/app/service/snapshot_create.go @@ -255,15 +255,12 @@ func handleSnapTar(sourceDir, targetDir, name, exclusionRules string, secret str path = sourceDir } commands := "" - if secret != "" { + if len(secret) != 0 { extraCmd := "| openssl enc -aes-256-cbc -salt -k " + secret + " -out" commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s %s %s", " -"+exStr, path, extraCmd, targetDir+"/"+name) - } else { - commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s -C %s .", targetDir+"/"+name, exStr, sourceDir) - } - if len(secret) != 0 { global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******")) } else { + commands = fmt.Sprintf("tar --warning=no-file-changed --ignore-failed-read -zcf %s %s -C %s .", targetDir+"/"+name, exStr, sourceDir) global.LOG.Debug(commands) } stdout, err := cmd.ExecWithTimeOut(commands, 30*time.Minute) diff --git a/backend/utils/files/tar_gz.go b/backend/utils/files/tar_gz.go index 4658144f1..bf11a3976 100644 --- a/backend/utils/files/tar_gz.go +++ b/backend/utils/files/tar_gz.go @@ -19,15 +19,12 @@ func NewTarGzArchiver() ShellArchiver { func (t TarGzArchiver) Extract(filePath, dstDir string, secret string) error { var err error commands := "" - if secret != "" { + if len(secret) != 0 { extraCmd := "openssl enc -d -aes-256-cbc -k " + secret + " -in " + filePath + " | " commands = fmt.Sprintf("%s tar -zxvf - -C %s", extraCmd, dstDir+" > /dev/null 2>&1") - } else { - commands = fmt.Sprintf("tar -zxvf %s %s", filePath+" -C ", dstDir+" > /dev/null 2>&1") - } - if len(secret) != 0 { global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******")) } else { + commands = fmt.Sprintf("tar -zxvf %s %s", filePath+" -C ", dstDir+" > /dev/null 2>&1") global.LOG.Debug(commands) } if err = cmd.ExecCmd(commands); err != nil { @@ -49,15 +46,12 @@ func (t TarGzArchiver) Compress(sourcePaths []string, dstFile string, secret str } path += fmt.Sprintf("- -C %s %s", aheadDir, itemDir) commands := "" - if secret != "" { + if len(secret) != 0 { extraCmd := "| openssl enc -aes-256-cbc -salt -k " + secret + " -out" commands = fmt.Sprintf("tar -zcf %s %s %s", path, extraCmd, dstFile) - } else { - commands = fmt.Sprintf("tar -zcf %s -C %s %s", dstFile, aheadDir, itemDir) - } - if len(secret) != 0 { global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******")) } else { + commands = fmt.Sprintf("tar -zcf %s -C %s %s", dstFile, aheadDir, itemDir) global.LOG.Debug(commands) } if err = cmd.ExecCmd(commands); err != nil { diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue index 09e77d56b..78f0cf86f 100644 --- a/frontend/src/views/setting/snapshot/index.vue +++ b/frontend/src/views/setting/snapshot/index.vue @@ -167,7 +167,7 @@ - +