Mirrors/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-03-09 00:00:02 +01:00
Code Issues Releases Wiki Activity

Fix lint and parse config logic

Browse source
This commit is contained in:
aneesh-n 2024-09-02 14:44:07 -06:00
parent 3e7a369a4e
commit 56afe8d9b1
No known key found for this signature in database
GPG key ID: 6F5A52831C046F44
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
internal/backend/smb/config.go
View file

@ -13,7 +13,7 @@ import (
)
const (
DefaultSMBPort int = 445 // DefaultSMBt returns the default port for SMB
DefaultSMBPort int = 445 // DefaultSMBPort returns the default port for SMB
DefaultDomain string = "WORKGROUP" // DefaultDomain returns the default domain for SMB
DefaultConnections uint = 5 // DefaultConnections returns the number of concurrent connections for SMB.
DefaultIdleTimeout time.Duration = 60 * time.Second // DefaultIdleTimeout returns the default max time before closing idle connections for SMB.
@ -56,46 +56,48 @@ func init() {
// supported configuration format is smb://[user@]host[:port]/sharename/directory.
// User and port are optional. Default port is 445.
func ParseConfig(s string) (*Config, error) {
hasSmbColonPrefix := strings.HasPrefix(s, "smb:")
if !hasSmbColonPrefix && !strings.HasPrefix(s, "smb://") {
var repo string
switch {
case strings.HasPrefix(s, "smb://"):
repo = s
case strings.HasPrefix(s, "smb:"):
repo = "smb://" + s[4:]
default:
return nil, errors.New("smb: invalid format")
}
if hasSmbColonPrefix {
s = "smb://" + s[4:]
}
// parse the "smb://user@host/sharename/directory." url format
u, err := url.Parse(s)
url, err := url.Parse(repo)
if err != nil {
return nil, errors.WithStack(err)
}
cfg := NewConfig()
if u.User != nil {
cfg.User = u.User.Username()
if url.User != nil {
cfg.User = url.User.Username()
//Intentionally not allowing passwords to be set in url as
//it can cause issues when passwords have special characters
//like '@' and it is not recommended to pass passwords in the url.
}
cfg.Host = u.Hostname()
cfg.Host = url.Hostname()
if cfg.Host == "" {
return nil, errors.New("smb: invalid format, host name not found")
}
if u.Port() != "" {
cfg.Port, err = strconv.Atoi(u.Port())
if url.Port() != "" {
cfg.Port, err = strconv.Atoi(url.Port())
if err != nil {
return nil, errors.Wrap(err, "invalid port number")
}
}
if u.Path == "" {
if url.Path == "" {
return nil, errors.New("smb: invalid format, sharename/directory not found")
}
cfg.ShareName, cfg.Path, _ = strings.Cut(u.Path[1:], "/")
cfg.ShareName, cfg.Path, _ = strings.Cut(url.Path[1:], "/")
cfg.Path = path.Clean(cfg.Path)
return &cfg, nil

4
internal/backend/util/file_helper.go
View file

@ -81,8 +81,8 @@ func SaveWithOptions(fileName string, tmpFilename string, rd backend.RewindReade
if IsNotExist(err) {
debug.Log("error %v: creating dir", err)
// error is caused by a missing directory, try to create it
if err := options.MkDir(dir); err != nil {
debug.Log("error creating dir %v: %v", dir, err)
if mkDirErr := options.MkDir(dir); mkDirErr != nil {
debug.Log("error creating dir %v: %v", dir, mkDirErr)
} else {
// try again
f, err = options.OpenTempFile(dir, tmpFilename)