Files
tiennm99 47afb85093 fix: close remaining secret leaks, timeout gaps and config blind spots
- Generated service names come only from a URL host, a key=value DSN's
  host=, or a MySQL tcp() address, so a password in a key=value DSN can no
  longer end up in the name printed on every log line.
- connect_timeout is added only to postgres:// and postgresql:// URLs
  (parsed, so it never lands after a fragment) or as a key=value token, never
  glued onto a key=value value containing "://".
- Driver parse errors that quote password fragments (mongo escape errors,
  lib/pq's missing "=" error) are replaced with generic hints.
- MongoDB keeps its client only after a successful connect, so a failed
  connect is not disconnected twice.
- Couchbase gets ready_timeout plus 1 minute to connect, so raising
  ready_timeout takes effect.
- Shutdown waits at most 7 seconds, inside Docker's 10-second grace period.
- Each adapter declares its config keys; unknown keys anywhere in the file,
  including under config, log a warning without blocking start.
2026-10-09 12:36:21 +07:00

118 lines
2.8 KiB
Go

package adapter
import (
"context"
"database/sql"
"net/url"
"strings"
_ "github.com/lib/pq"
)
const defaultPostgresConnectTimeout = "30"
func init() {
ConfigKeys["postgresql"] = []string{"url"}
ConfigKeys["postgres"] = ConfigKeys["postgresql"]
Registry["postgresql"] = func(cfg Config) (Adapter, error) {
url, err := cfg.Required("url")
if err != nil {
return nil, err
}
return &postgresAdapter{
url: withDefaultConnectTimeout(url),
key: cfg.Optional("counter_key", "counter"),
}, nil
}
Registry["postgres"] = Registry["postgresql"]
}
type postgresAdapter struct {
db *sql.DB
url string
key string
}
func (a *postgresAdapter) Connect(ctx context.Context) error {
db, err := sql.Open("postgres", a.url)
if err != nil {
return err
}
a.db = db
if err := a.db.PingContext(ctx); err != nil {
a.db.Close()
return err
}
if err := a.ensureInitialized(ctx); err != nil {
a.db.Close()
return err
}
return nil
}
func (a *postgresAdapter) ensureInitialized(ctx context.Context) error {
if _, err := a.db.ExecContext(ctx, `
CREATE TABLE IF NOT EXISTS keepalive (
key TEXT PRIMARY KEY,
value BIGINT NOT NULL DEFAULT 0
)`); err != nil {
return err
}
_, err := a.db.ExecContext(ctx,
`INSERT INTO keepalive (key, value) VALUES ($1, 0) ON CONFLICT (key) DO NOTHING`,
a.key,
)
return err
}
func (a *postgresAdapter) Increment(ctx context.Context) (int64, error) {
tx, err := a.db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted})
if err != nil {
return 0, err
}
var value int64
if err := tx.QueryRowContext(ctx,
`UPDATE keepalive SET value = value + 1 WHERE key = $1 RETURNING value`,
a.key,
).Scan(&value); err != nil {
tx.Rollback()
return 0, err
}
return value, tx.Commit()
}
func (a *postgresAdapter) Close(_ context.Context) error {
if a.db == nil {
return nil
}
return a.db.Close()
}
// withDefaultConnectTimeout adds connect_timeout when the DSN has none:
// lib/pq honours the context only while dialing, so a server that accepts the
// connection but never answers the startup handshake would hang forever.
// Like lib/pq, it treats only postgres:// and postgresql:// strings as URLs
// and everything else as a key=value DSN.
func withDefaultConnectTimeout(dsn string) string {
if strings.HasPrefix(dsn, "postgres://") || strings.HasPrefix(dsn, "postgresql://") {
u, err := url.Parse(dsn)
if err != nil {
// Connect reports the parse error.
return dsn
}
q := u.Query()
if q.Has("connect_timeout") {
return dsn
}
q.Set("connect_timeout", defaultPostgresConnectTimeout)
u.RawQuery = q.Encode()
return u.String()
}
for _, field := range strings.Fields(dsn) {
if strings.HasPrefix(field, "connect_timeout=") {
return dsn
}
}
return dsn + " connect_timeout=" + defaultPostgresConnectTimeout
}