Unverified Commit f0fe7014 authored by stormwarestudios's avatar stormwarestudios Committed by GitHub
Browse files

Fix for database credentials visible in logs. (#467)

parent 3d6b38d3

main.go

+13 −1
Original line number Diff line number Diff line
@@ -104,7 +104,19 @@ func main() { 
	startupLogger.Info("Nakama starting")

	startupLogger.Info("Node", zap.String("name", config.GetName()), zap.String("version", semver), zap.String("runtime", runtime.Version()), zap.Int("cpu", runtime.NumCPU()), zap.Int("proc", runtime.GOMAXPROCS(0)))

	startupLogger.Info("Data directory", zap.String("path", config.GetDataDir()))

	startupLogger.Info("Database connections", zap.Strings("dsns", config.GetDatabase().Addresses))



	addresses := config.GetDatabase().Addresses

	addressCount := len(addresses)

	redactedAddresses := make([]string, addressCount)

	for i := range addresses {

		rawURL := fmt.Sprintf("postgresql://%s", addresses[i])

		parsedURL, err := url.Parse(rawURL)

		if err != nil {

			logger.Fatal("Bad connection URL", zap.Error(err))

		}

		redactedAddresses[i] = parsedURL.Redacted()

	}

	startupLogger.Info("Database connections", zap.Strings("dsns", redactedAddresses))



	db, dbVersion := dbConnect(startupLogger, config)

	startupLogger.Info("Database information", zap.String("version", dbVersion))

migrate/migrate.go

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ func Parse(args []string, tmpLogger *zap.Logger) { 
		dbname = parsedURL.Path[1:]

	}



	logger.Info("Database connection", zap.String("dsn", ms.dbAddress))

	logger.Info("Database connection", zap.String("dsn", parsedURL.Redacted()))



	parsedURL.Path = ""

	db, err := sql.Open("pgx", parsedURL.String())