Merge 7e98f0f56339a3083ab341d06c972a282340f752 into 16e97ec66ff1bb6afb57ed9d723339aff0ae397e

build/sysroot/usr/share/casaos/shell/helper.sh

@@ -341,6 +341,19 @@ EditSmabaUserPassword(){
   $sudo_cmd smbpasswd $1
 }
 
+EditSmabaUserPassword(){
+  $sudo_cmd smbpasswd $1
+}
+
+
+EditSambaUserPasswordSTDIN(){
+  $sudo_cmd smbpasswd -s $2 $1
+}
+
+ListSambaUsers(){
+  $sudo_cmd pdbedit -L
+}
+
 AddSmabaUser(){
   $sudo_cmd useradd $1
   $sudo_cmd smbpasswd -a $1 <<EOF

go.mod

@@ -43,7 +43,7 @@ require (
 	golang.org/x/oauth2 v0.7.0
 	golang.org/x/sync v0.3.0
 	golang.org/x/sys v0.20.0
-	gorm.io/gorm v1.25.0
+	gorm.io/gorm v1.25.12
 	gotest.tools v2.2.0+incompatible
 )
 

go.sum

@@ -389,6 +389,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/gorm v1.25.0 h1:+KtYtb2roDz14EQe4bla8CbQlmb9dN3VejSai3lprfU=
 gorm.io/gorm v1.25.0/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 modernc.org/libc v1.22.4 h1:wymSbZb0AlrjdAVX3cjreCHTPCpPARbQXNz6BHPzdwQ=

model/share.go

@@ -11,7 +11,8 @@
 package model
 
 type Shares struct {
-	ID        uint   `json:"id"`
+	ID          uint     `json:"id"`
-	Anonymous bool   `json:"anonymous"`
+	Anonymous   bool     `json:"anonymous"`
-	Path      string `json:"path"`
+	Path        string   `json:"path"`
+	Valid_users []string `json:"valid_users"`
 }

model/smb_users.go

@@ -0,0 +1,16 @@
+/*
+* @Author: Drew Fitzgerald/Sheep26 drew@sheepland.xyz
+* @Date: 2024-12-03
+* @LastEditors: Drew Fitzgerald/Sheep26
+* @LastEditTime: 2024-12-03
+* @FilePath: /CasaOS/service/model/o_smb_users.go
+* @Website: https://www.casaos.io
+* Copyright (c) 2024 by icewhale, All Rights Reserved.
+*/
+
+package model
+
+type SMBUsers struct {
+	Name        string   "json:name"
+	Password    string    "json:password"
+}

route/v1.go

@@ -176,6 +176,12 @@ func InitV1Router() http.Handler {
 				v1SharesGroup.DELETE("/:id", v1.DeleteSambaShares)
 				v1SharesGroup.GET("/status", v1.GetSambaStatus)
 			}
+			v1SharesGroup = v1SambaGroup.Group("/shares")
+			v1SharesGroup.Use()
+			{
+				v1SharesGroup.GET("/list", v1.ListSambaUsers)
+				v1SharesGroup.POST("/add", v1.AddSambaUser)
+			}
 		}
 		v1NotifyGroup := v1Group.Group("/notify")
 		v1NotifyGroup.Use()

route/v1/samba.go

@@ -1,12 +1,12 @@
 /*
  * @Author: LinkLeong link@icewhale.com
  * @Date: 2022-07-26 11:08:48
- * @LastEditors: LinkLeong
+ * @LastEditors: Drew Fitzgerald/Sheep26
- * @LastEditTime: 2022-08-17 18:25:42
+ * @LastEditTime: 2024-12-03
  * @FilePath: /CasaOS/route/v1/samba.go
  * @Description:
  * @Website: https://www.casaos.io
- * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ * Copyright (c) 2024 by icewhale, All Rights Reserved.
  */
 package v1
 
@@ -18,12 +18,14 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/IceWhaleTech/CasaOS-Common/utils/command"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/systemctl"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
 	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	"github.com/IceWhaleTech/CasaOS/pkg/samba"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
@@ -58,14 +60,45 @@ func GetSambaSharesList(ctx echo.Context) error {
 	shareList := []model.Shares{}
 	for _, v := range shares {
 		shareList = append(shareList, model.Shares{
-			Anonymous: v.Anonymous,
+			Anonymous:   v.Anonymous,
-			Path:      v.Path,
+			Path:        v.Path,
-			ID:        v.ID,
+			Valid_users: v.Valid_users,
+			ID:          v.ID,
 		})
 	}
 	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 {
+	users := []model.SMBUsers{}
+	ctx.Bind(&users)
+	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)})
+	}
+
+	for _, v := range users {
+		if !strings.Contains(out, v.Name) {
+			command.OnlyExec("source " + config.AppInfo.ShellPath + "/helper.sh ;AddSmabaUser " + v.Name + " " + v.Password)
+		}
+	}
+
+	return ctx.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: users})
+}
+
 func PostSambaSharesCreate(ctx echo.Context) error {
 	shares := []model.Shares{}
 	ctx.Bind(&shares)
@@ -85,8 +118,9 @@ func PostSambaSharesCreate(ctx echo.Context) error {
 	}
 	for _, v := range shares {
 		shareDBModel := model2.SharesDBModel{}
-		shareDBModel.Anonymous = true
+		shareDBModel.Anonymous = v.Anonymous
 		shareDBModel.Path = v.Path
+		shareDBModel.Valid_users = v.Valid_users
 		shareDBModel.Name = filepath.Base(v.Path)
 		os.Chmod(v.Path, 0o777)
 		service.MyService.Shares().CreateShare(shareDBModel)

service/model/o_shares.go

@@ -11,12 +11,13 @@
 package model
 
 type SharesDBModel struct {
-	ID        uint   `gorm:"column:id;primary_key" json:"id"`
+	ID          uint     `gorm:"column:id;primary_key" json:"id"`
-	Anonymous bool   `json:"anonymous"`
+	Anonymous   bool     `json:"anonymous"`
-	Path      string `json:"path"`
+	Valid_users []string `json:"valid_users"`
-	Name      string `json:"name"`
+	Path        string   `json:"path"`
-	Updated   int64  `gorm:"autoUpdateTime"`
+	Name        string   `json:"name"`
-	Created   int64  `gorm:"autoCreateTime"`
+	Updated     int64    `gorm:"autoUpdateTime"`
+	Created     int64    `gorm:"autoCreateTime"`
 }
 
 func (p *SharesDBModel) TableName() string {

service/shares.go

@@ -71,7 +71,7 @@ func (s *sharesStruct) DeleteShare(id string) {
 
 func (s *sharesStruct) UpdateConfigFile() {
 	shares := []model2.SharesDBModel{}
-	s.db.Select("anonymous,path").Find(&shares)
+	s.db.Select("anonymous,path,valid_users").Find(&shares)
 	// generated config file
 	configStr := ""
 	for _, share := range shares {
@@ -79,16 +79,40 @@ func (s *sharesStruct) UpdateConfigFile() {
 		configStr += `
 [` + dirName + `]
 comment = CasaOS share ` + dirName + `
-public = Yes
+public = ` + func() string {
+			if share.Anonymous {
+				return "Yes"
+			}
+			return "No"
+		}() + `
 path = ` + share.Path + `
 browseable = Yes
 read only = No
-guest ok = Yes
+guest ok = ` + func() string {
+			if share.Anonymous {
+				return "Yes"
+			}
+			return "No"
+		}() + `
 create mask = 0777
 directory mask = 0777
-force user = root
+` + func() string {
-
+			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")