check md5 before update

Makefile

-VERSION=2.0
+VERSION=2.1
 PROJECT=ztf
 QINIU_DIR=/Users/aaron/work/zentao/qiniu/
 QINIU_DIST_DIR=${QINIU_DIR}${PROJECT}/${VERSION}/

res/messages_en.json

@@ -490,6 +490,10 @@
     {
       "id": "fail_unzip",
       "translation": "Fail to unzip file %s."
+    },
+    {
+      "id": "fail_md5_check",
+      "translation": "Check file %s MD5 failed."
     }
   ]
 }

res/messages_zh.json

@@ -497,6 +497,10 @@
     {
       "id": "fail_unzip",
       "translation": "解压文件%s失败。"
+    },
+    {
+      "id": "fail_md5_check",
+      "translation": "验证文件%s的MD5失败。"
     }
   ]
 }

src/server/service/upgrade.go

 package service
 
 import (
+	"errors"
 	"fmt"
 	serverUtils "github.com/easysoft/zentaoatf/src/server/utils/common"
 	serverConst "github.com/easysoft/zentaoatf/src/server/utils/const"
@@ -10,6 +11,7 @@ import (
 	fileUtils "github.com/easysoft/zentaoatf/src/utils/file"
 	i118Utils "github.com/easysoft/zentaoatf/src/utils/i118"
 	logUtils "github.com/easysoft/zentaoatf/src/utils/log"
+	shellUtils "github.com/easysoft/zentaoatf/src/utils/shell"
 	"github.com/easysoft/zentaoatf/src/utils/vari"
 	"github.com/fatih/color"
 	"github.com/inconshreveable/go-update"
@@ -31,7 +33,7 @@ func NewUpgradeService() *UpgradeService {
 
 func (s *UpgradeService) CheckUpgrade() {
 	pth := vari.AgentLogDir + "version.txt"
-	serverUtils.Download(serverConst.AgentUpgradeURL, pth)
+	serverUtils.Download(serverConst.AgentVersionURL, pth)
 
 	content := strings.TrimSpace(fileUtils.ReadFile(pth))
 	version, _ := strconv.ParseFloat(content, 64)
@@ -39,15 +41,14 @@ func (s *UpgradeService) CheckUpgrade() {
 		logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("find_new_ver", content), color.FgCyan)
 
 		versionStr := fmt.Sprintf("%.1f", version)
-		err := s.DownloadVersion(versionStr)
-		if err == nil {
+		pass, err := s.DownloadFile(versionStr)
+		if pass && err == nil {
 			s.RestartVersion(versionStr)
 		}
 	}
 }
 
-func (s *UpgradeService) DownloadVersion(version string) (err error) {
-
+func (s *UpgradeService) DownloadFile(version string) (pass bool, err error) {
 	os := commonUtils.GetOs()
 	if commonUtils.IsWin() {
 		os = fmt.Sprintf("%s%d", os, strconv.IntSize)
@@ -55,17 +56,35 @@ func (s *UpgradeService) DownloadVersion(version string) (err error) {
 	url := fmt.Sprintf(serverConst.AgentDownloadURL, version, os)
 
 	dir := vari.AgentLogDir + version
+
 	pth := dir + ".zip"
 	err = serverUtils.Download(url, pth)
+	if err != nil {
+		return
+	}
 
-	if err == nil {
-		fileUtils.RmDir(dir)
-		fileUtils.MkDirIfNeeded(dir)
-		err = archiver.Unarchive(pth, dir)
+	md5Url := url + ".md5"
+	md5Pth := pth + ".md5"
+	err = serverUtils.Download(md5Url, md5Pth)
+	if err != nil {
+		return
+	}
 
-		if err != nil {
-			logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("fail_unzip", pth), color.FgCyan)
-		}
+	pass = s.checkMd5(pth, md5Pth)
+	if !pass {
+		msg := i118Utils.I118Prt.Sprintf("fail_md5_check", pth)
+		logUtils.PrintToWithColor(msg, color.FgCyan)
+		err = errors.New(msg)
+		return
+	}
+
+	fileUtils.RmDir(dir)
+	fileUtils.MkDirIfNeeded(dir)
+	err = archiver.Unarchive(pth, dir)
+
+	if err != nil {
+		logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("fail_unzip", pth), color.FgCyan)
+		return
 	}
 
 	return
@@ -98,3 +117,10 @@ func (s *UpgradeService) RestartVersion(version string) (err error) {
 
 	return
 }
+
+func (s *UpgradeService) checkMd5(filePth, md5Pth string) (pass bool) {
+	expectVal := fileUtils.ReadFile(md5Pth)
+	actualVal, _ := shellUtils.ExeSysCmd("md5sum " + filePth + " | awk '{print $1}'")
+
+	return strings.TrimSpace(actualVal) == strings.TrimSpace(expectVal)
+}

src/server/utils/const/const.go

@@ -10,6 +10,6 @@ const (
 	AgentLogDir  = "log-agent"
 
 	QiNiuURL         = "https://dl.cnezsoft.com/" + constant.AppName + "/"
-	AgentUpgradeURL  = QiNiuURL + "version.txt"
+	AgentVersionURL  = QiNiuURL + "version.txt"
 	AgentDownloadURL = QiNiuURL + "%s/%s/" + constant.AppName + ".zip"
 )