route/v1/samba.go

@@ -69,11 +69,22 @@ func GetSambaSharesList(ctx echo.Context) error {
 	return ctx.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: shareList})
 }
 
+func ListSambaUsers(ctx echo.Context) error {
+	out, err := command.OnlyExec("source " + config.AppInfo.ShellPath + "/helper.sh ;ListSambaUsers ")
+
+	if err != nil {
+		return ctx.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR)})
+	}
+
+	users := strings.Split(out, "\n")
+
+	return ctx.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: users})
+}
+
 func AddSambaUser(ctx echo.Context) error {
-	source := "source " + config.AppInfo.ShellPath
 	users := []model.SMBUsers{}
 	ctx.Bind(&users)
-	out, err := command.OnlyExec(source + "/helper.sh ;ListSambaUsers ")
+	out, err := command.OnlyExec("source " + config.AppInfo.ShellPath + "/helper.sh ;ListSambaUsers ")
 
 	if err != nil {
 		return ctx.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR)})
@@ -81,7 +92,7 @@ func AddSambaUser(ctx echo.Context) error {
 
 	for _, v := range users {
 		if !strings.Contains(out, v.Name) {
-			command.OnlyExec(source + "/helper.sh ;AddSmabaUser " + v.Name + " " + v.Password)
+			command.OnlyExec("source " + config.AppInfo.ShellPath + "/helper.sh ;AddSmabaUser " + v.Name + " " + v.Password)
 		}
 	}
 

service/shares.go

@@ -69,31 +69,6 @@ func (s *sharesStruct) DeleteShare(id string) {
 	s.UpdateConfigFile()
 }
 
-func getAnonymous(share model2.SharesDBModel) string {
-	if share.Anonymous {
-		return `Yes`
-	}
-	return `No`
-}
-
-func forceRoot(share model2.SharesDBModel) string {
-	if share.Anonymous {
-		return `force user = root`
-	}
-	return `#force user = root`
-}
-
-func getValidUsers(share model2.SharesDBModel) string {
-	if !share.Anonymous && len(share.Valid_users) > 0 {
-		users := `valid users =`
-		for _, user := range share.Valid_users {
-			users = " " + user
-		}
-		return users + "\n"
-	}
-	return ""
-}
-
 func (s *sharesStruct) UpdateConfigFile() {
 	shares := []model2.SharesDBModel{}
 	s.db.Select("anonymous,path,valid_users").Find(&shares)
@@ -104,15 +79,40 @@ func (s *sharesStruct) UpdateConfigFile() {
 		configStr += `
 [` + dirName + `]
 comment = CasaOS share ` + dirName + `
-public = ` + getAnonymous(share) + `
+public = ` + func() string {
+			if share.Anonymous {
+				return "Yes"
+			}
+			return "No"
+		}() + `
 path = ` + share.Path + `
 browseable = Yes
 read only = No
-guest ok = ` + getAnonymous(share) + `
+guest ok = ` + func() string {
+			if share.Anonymous {
+				return "Yes"
+			}
+			return "No"
+		}() + `
 create mask = 0777
 directory mask = 0777
-` + forceRoot(share) + `
+` + func() string {
-` + getValidUsers(share)
+			if share.Anonymous {
+				return `force user = root
+`
+			}
+			return `#force user = root
+`
+		}() + func() string {
+			if !share.Anonymous && len(share.Valid_users) > 0 {
+				users := `valid users =`
+				for _, user := range share.Valid_users {
+					users += " " + user
+				}
+				return users + "\n"
+			}
+			return ""
+		}()
 	}
 	// write config file
 	file.WriteToPath([]byte(configStr), "/etc/samba", "smb.casa.conf")