MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-24 04:10:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

pkg/certs: On windows watch for directory changes to load certs (#6128)

Browse Source 
This PR fixes an issue when configuring Minio TLS on windows
This commit is contained in:
Harshavardhana 2018-07-05 16:33:37 -07:00 committed by kannappanr
parent c62813c887
commit 0ef0d7e685
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/certs/certs.go
View File

@ -18,6 +18,7 @@ package certs
import ( import (
"crypto/tls" "crypto/tls"
"path/filepath"
"sync" "sync"
"github.com/rjeczalik/notify" "github.com/rjeczalik/notify"
@ -74,11 +75,14 @@ func (c *Certs) watch() (err error) {
} }
}() }()
if err = notify.Watch(c.certFile, c.e, eventWrite...); err != nil { // Windows doesn't allow for watching file changes but instead allows
// for directory changes only, while we can still watch for changes
// on files on other platforms. Watch parent directory on all platforms
// for simplicity.
if err = notify.Watch(filepath.Dir(c.certFile), c.e, eventWrite...); err != nil {
return err return err
} }
if err = notify.Watch(filepath.Dir(c.keyFile), c.e, eventWrite...); err != nil {
if err = notify.Watch(c.keyFile, c.e, eventWrite...); err != nil {
return err return err
} }
c.Lock() c.Lock()
@ -93,7 +97,11 @@ func (c *Certs) watch() (err error) {
func (c *Certs) run() { func (c *Certs) run() {
for event := range c.e { for event := range c.e {
base := filepath.Base(event.Path())
if isWriteEvent(event.Event()) { if isWriteEvent(event.Event()) {
certChanged := base == filepath.Base(c.certFile)
keyChanged := base == filepath.Base(c.keyFile)
if certChanged || keyChanged {
cert, err := c.loadCert(c.certFile, c.keyFile) cert, err := c.loadCert(c.certFile, c.keyFile)
if err != nil { if err != nil {
// ignore the error continue to use // ignore the error continue to use
@ -106,6 +114,7 @@ func (c *Certs) run() {
} }
} }
} }
}
// GetCertificateFunc provides a GetCertificate type for custom client implementations. // GetCertificateFunc provides a GetCertificate type for custom client implementations.
type GetCertificateFunc func(hello *tls.ClientHelloInfo) (*tls.Certificate, error) type GetCertificateFunc func(hello *tls.ClientHelloInfo) (*tls.Certificate, error)