Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-06 08:22:24 +01:00
Code Issues Projects Releases Wiki Activity

cleanup (samba): cleanup code in samba plugin

Browse source
This commit is contained in:
Mickael Kerjean 2022-02-23 22:12:24 +11:00
parent 6028a4363b
commit 2c926df4f6
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/model/files.go
View file

@ -51,6 +51,9 @@ func NewBackend(ctx *App, conn map[string]string) (IBackend, error) {
}
func GetHome(b IBackend, base string) (string, error) {
if strings.TrimSpace(base) == "" {
base = "/"
}
home := "/"
if obj, ok := b.(interface{ Home() (string, error) }); ok {
tmp, err := obj.Home()

24
server/plugin/plg_backend_samba/index.go
View file

@ -41,15 +41,18 @@ func (smb Samba) Init(params map[string]string, app *App) (IBackend, error) {
if c != nil {
return c.(*Samba), nil
}
if params["port"] == "" {
params["port"] = "445"
}
if params["username"] == "" {
params["username"] = "Guest"
}
conn, err := net.DialTimeout(
"tcp",
fmt.Sprintf("%s:%s", params["host"], params["port"]),
fmt.Sprintf(
"%s:%s",
params["host"],
func() string {
if params["port"] == "" {
return "445"
}
return params["port"]
}(),
),
10*time.Second,
)
if err != nil {
@ -59,7 +62,12 @@ func (smb Samba) Init(params map[string]string, app *App) (IBackend, error) {
s := &Samba{nil, make(map[string]*smb2.Share, 0)}
s.session, err = (&smb2.Dialer{
Initiator: &smb2.NTLMInitiator{
User: params["username"],
User: func() string {
if params["username"] == "" {
return "Guest"
}
return params["username"]
}(),
Password: params["password"],
Domain: params["domain"],
},