mirror of
https://github.com/mickael-kerjean/filestash
synced 2025-12-06 08:22:24 +01:00
cleanup (samba): cleanup code in samba plugin
This commit is contained in:
parent
6028a4363b
commit
2c926df4f6
2 changed files with 19 additions and 8 deletions
|
|
@ -51,6 +51,9 @@ func NewBackend(ctx *App, conn map[string]string) (IBackend, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetHome(b IBackend, base string) (string, error) {
|
func GetHome(b IBackend, base string) (string, error) {
|
||||||
|
if strings.TrimSpace(base) == "" {
|
||||||
|
base = "/"
|
||||||
|
}
|
||||||
home := "/"
|
home := "/"
|
||||||
if obj, ok := b.(interface{ Home() (string, error) }); ok {
|
if obj, ok := b.(interface{ Home() (string, error) }); ok {
|
||||||
tmp, err := obj.Home()
|
tmp, err := obj.Home()
|
||||||
|
|
|
||||||
|
|
@ -41,15 +41,18 @@ func (smb Samba) Init(params map[string]string, app *App) (IBackend, error) {
|
||||||
if c != nil {
|
if c != nil {
|
||||||
return c.(*Samba), nil
|
return c.(*Samba), nil
|
||||||
}
|
}
|
||||||
if params["port"] == "" {
|
|
||||||
params["port"] = "445"
|
|
||||||
}
|
|
||||||
if params["username"] == "" {
|
|
||||||
params["username"] = "Guest"
|
|
||||||
}
|
|
||||||
conn, err := net.DialTimeout(
|
conn, err := net.DialTimeout(
|
||||||
"tcp",
|
"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,
|
10*time.Second,
|
||||||
)
|
)
|
||||||
if err != nil {
|
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 := &Samba{nil, make(map[string]*smb2.Share, 0)}
|
||||||
s.session, err = (&smb2.Dialer{
|
s.session, err = (&smb2.Dialer{
|
||||||
Initiator: &smb2.NTLMInitiator{
|
Initiator: &smb2.NTLMInitiator{
|
||||||
User: params["username"],
|
User: func() string {
|
||||||
|
if params["username"] == "" {
|
||||||
|
return "Guest"
|
||||||
|
}
|
||||||
|
return params["username"]
|
||||||
|
}(),
|
||||||
Password: params["password"],
|
Password: params["password"],
|
||||||
Domain: params["domain"],
|
Domain: params["domain"],
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue