fix: secure and improve Transport URL support

dunglas · Jan 18, 2021 · 496b5d4 · 496b5d4
1 parent 309e28f
commit 496b5d4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/bolt_transport.go b/bolt_transport.go
@@ -52,7 +52,7 @@ func NewBoltTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport,
 	if sizeParameter != "" {
 		size, err = strconv.ParseUint(sizeParameter, 10, 64)
 		if err != nil {
-			return nil, &ErrTransport{u.String(), fmt.Sprintf(`invalid "size" parameter %q`, sizeParameter), err}
+			return nil, &ErrTransport{u.Redacted(), fmt.Sprintf(`invalid "size" parameter %q`, sizeParameter), err}
 		}
 	}
 
@@ -61,7 +61,7 @@ func NewBoltTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport,
 	if cleanupFrequencyParameter != "" {
 		cleanupFrequency, err = strconv.ParseFloat(cleanupFrequencyParameter, 64)
 		if err != nil {
-			return nil, &ErrTransport{u.String(), fmt.Sprintf(`invalid "cleanup_frequency" parameter %q`, cleanupFrequencyParameter), err}
+			return nil, &ErrTransport{u.Redacted(), fmt.Sprintf(`invalid "cleanup_frequency" parameter %q`, cleanupFrequencyParameter), err}
 		}
 	}
 
@@ -70,12 +70,12 @@ func NewBoltTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport,
 		path = u.Host // relative path (bolt://path.db)
 	}
 	if path == "" {
-		return nil, &ErrTransport{u.String(), "missing path", err}
+		return nil, &ErrTransport{u.Redacted(), "missing path", err}
 	}
 
 	db, err := bolt.Open(path, 0o600, &bolt.Options{Timeout: 1 * time.Second})
 	if err != nil {
-		return nil, &ErrTransport{dsn: u.String(), err: err}
+		return nil, &ErrTransport{dsn: u.Redacted(), err: err}
 	}
 
 	return &BoltTransport{

diff --git a/caddy/caddy.go b/caddy/caddy.go
@@ -144,6 +144,10 @@ func (m *Mercure) Provision(ctx caddy.Context) error { //nolint:funlen
 			return nil, fmt.Errorf("invalid transport url: %w", err)
 		}
 
+		if m.WriteTimeout != 0 {
+			u.Query().Set("write_timeout", time.Duration(m.WriteTimeout).String())
+		}
+
 		transport, err := mercure.NewTransport(u, m.logger, tss)
 		if err != nil {
 			return nil, err //nolint:wrapcheck

diff --git a/caddy/go.mod b/caddy/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/dgraph-io/badger v1.6.2 // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
 	github.com/dlclark/regexp2 v1.4.0 // indirect
-	github.com/dunglas/mercure v0.11.0-rc.2
+	github.com/dunglas/mercure v0.11.0-rc.3
 	github.com/golang/snappy v0.0.2 // indirect
 	github.com/google/uuid v1.1.4 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect

diff --git a/transport.go b/transport.go
@@ -30,7 +30,7 @@ func NewTransport(u *url.URL, l Logger, tss *TopicSelectorStore) (Transport, err
 	transportFactoriesMu.RUnlock()
 
 	if !ok {
-		return nil, &ErrTransport{dsn: u.String(), msg: "no such transport available"}
+		return nil, &ErrTransport{dsn: u.Redacted(), msg: "no such transport available"}
 	}
 
 	return f(u, l, nil)