Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 23:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

portable mode: fix panic while validating TLS certificates

Browse Source 
Fixes #1480

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2023-12-12 18:18:19 +01:00
parent 61fe7c39a7
commit ff2eed8ee9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/common/tlsutils.go
View File

@@ -308,6 +308,8 @@ func NewCertManager(keyPairs []TLSKeyPair, configDir, logSender string) (*CertMa
} }
randSecs := rand.Intn(59) randSecs := rand.Intn(59)
manager.monitor() manager.monitor()
_, err = eventScheduler.AddFunc(fmt.Sprintf("@every 8h0m%ds", randSecs), manager.monitor) if eventScheduler != nil {
_, err = eventScheduler.AddFunc(fmt.Sprintf("@every 8h0m%ds", randSecs), manager.monitor)
}
return manager, err return manager, err
} }

4
internal/vfs/s3fs.go
View File

@@ -699,8 +699,8 @@ func (fs *S3Fs) Walk(root string, walkFn filepath.WalkFunc) error {
continue continue
} }
err := walkFn(util.GetStringFromPointer(fileObject.Key), err := walkFn(util.GetStringFromPointer(fileObject.Key),
NewFileInfo(name, isDir, util.GetIntFromPointer(fileObject.Size), util.GetTimeFromPointer(fileObject.LastModified), NewFileInfo(name, isDir, util.GetIntFromPointer(fileObject.Size),
false), nil) util.GetTimeFromPointer(fileObject.LastModified), false), nil)
if err != nil { if err != nil {
return err return err
} }