From 072a97af90ace0a375210468490bc13ee87bb6db Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 6 Jul 2022 19:13:13 +0800
Subject: [PATCH] :art: Improve cloud dir name check

---
 kernel/model/repository.go | 10 ++++++++--
 kernel/model/sync.go       |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index a823398ff..8fb27323b 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -628,8 +628,14 @@ func contextPushMsg(context map[string]interface{}, msg string) {
 }
 
 func buildCloudInfo() (ret *dejavu.CloudInfo, err error) {
-	if nil == Conf.User || "" == Conf.Sync.CloudName {
-		err = errors.New("invalid cloud info")
+	if !IsValidCloudDirName(Conf.Sync.CloudName) {
+		util.LogWarnf("invalid cloud repo name, rename it to [main]")
+		Conf.Sync.CloudName = "main"
+		Conf.Save()
+	}
+
+	if nil == Conf.User {
+		err = errors.New("user auth failed")
 		return
 	}
 
diff --git a/kernel/model/sync.go b/kernel/model/sync.go
index 67881e5da..c324d9027 100644
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@@ -1265,7 +1265,7 @@ func formatErrorMsg(err error) string {
 }
 
 func IsValidCloudDirName(cloudDirName string) bool {
-	if 16 < utf8.RuneCountInString(cloudDirName) {
+	if 16 < utf8.RuneCountInString(cloudDirName) || 1 > utf8.RuneCountInString(cloudDirName) {
 		return false
 	}