optimize load user

qiniu · Aug 30, 2023 · f1927f5 · f1927f5
1 parent fd16ee2
commit f1927f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/iqshell/common/account/actions.go b/iqshell/common/account/actions.go
@@ -7,11 +7,12 @@ import (
 	"strings"
 
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+
 	"github.com/qiniu/qshell/v2/iqshell/common/config"
 	"github.com/qiniu/qshell/v2/iqshell/common/data"
 	"github.com/qiniu/qshell/v2/iqshell/common/log"
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 // 保存账户信息到账户文件中
@@ -98,7 +99,7 @@ func SaveToDB(acc Account, accountOver bool) (err *data.CodeError) {
 func getAccount(pt string) (account Account, err *data.CodeError) {
 	accountFh, openErr := os.Open(pt)
 	if openErr != nil {
-		err = data.NewEmptyError().AppendDescF("Open account file error, %s, please use `account` to set Id and SecretKey first", openErr)
+		err = data.NewEmptyError().AppendDescF("Get account error, %s, please use `account` to set Id and SecretKey first", openErr)
 		return
 	}
 	defer accountFh.Close()
@@ -116,7 +117,7 @@ func getAccount(pt string) (account Account, err *data.CodeError) {
 
 	acc, dErr := decrypt(string(accountBytes))
 	if dErr != nil {
-		err = data.NewEmptyError().AppendDescF("Decrypt account bytes: %v", dErr)
+		err = data.NewEmptyError().AppendDescF("Decrypt account bytes: %s, you can delete account file(%s) and use `account` command to reset the account", dErr, pt)
 		return
 	}
 	account = acc

diff --git a/iqshell/common/account/crypt.go b/iqshell/common/account/crypt.go
@@ -2,9 +2,10 @@ package account
 
 import (
 	"encoding/base64"
-	"github.com/qiniu/qshell/v2/iqshell/common/data"
 	"strings"
 
+	"github.com/qiniu/qshell/v2/iqshell/common/data"
+
 	"github.com/qiniu/qshell/v2/iqshell/common/utils"
 )
 
@@ -15,6 +16,11 @@ func splits(joinStr string) []string {
 // 对保存在account.json中的文件字符串进行揭秘操作, 返回Account
 func decrypt(joinStr string) (acc Account, err *data.CodeError) {
 	ss := splits(joinStr)
+	if len(ss) != 3 {
+		err = data.NewEmptyError().AppendDescF("account json style format error")
+		return
+	}
+
 	name, accessKey, encryptedKey := ss[0], ss[1], ss[2]
 	if name == "" || accessKey == "" || encryptedKey == "" {
 		err = data.NewEmptyError().AppendDescF("name, accessKey and encryptedKey should not be empty")

diff --git a/iqshell/common/workspace/load.go b/iqshell/common/workspace/load.go
@@ -1,10 +1,12 @@
 package workspace
 
 import (
+	"path/filepath"
+
 	"github.com/qiniu/go-sdk/v7/auth"
 	"github.com/qiniu/go-sdk/v7/storage"
+
 	"github.com/qiniu/qshell/v2/iqshell/common/data"
-	"path/filepath"
 
 	"github.com/qiniu/qshell/v2/iqshell/common/account"
 	"github.com/qiniu/qshell/v2/iqshell/common/config"
@@ -151,6 +153,7 @@ func loadUserInfo() {
 		}
 	} else {
 		userDir = filepath.Join(workspaceDir, usersDirName, defaultUserDirName)
+		log.WarningF("load user error:%s", err)
 	}
 
 	log.DebugF("user dir:%s", userDir)