diff options
| author | Till <2353100+S7evinK@users.noreply.github.com> | 2022-08-02 13:58:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 13:58:08 +0200 |
| commit | 7ec70272d28c6b37f8a412dc577ff27da398d1df (patch) | |
| tree | 56f1bfbb219a40bb2113f405fd0bd20b1e6b23f5 /setup | |
| parent | ca3fa58388aeb8ac84a05fe5e0fab6bfa85f3fc6 (diff) | |
Disable NATS Server logging, allow self-signed certificates (#2605)
* Disable NATS Server logs in CI
* Add option to disable TLS validation for NATS
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/config/config_jetstream.go | 6 | ||||
| -rw-r--r-- | setup/jetstream/nats.go | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/setup/config/config_jetstream.go b/setup/config/config_jetstream.go index e4cfd4d3..a7827597 100644 --- a/setup/config/config_jetstream.go +++ b/setup/config/config_jetstream.go @@ -17,6 +17,10 @@ type JetStream struct { TopicPrefix string `yaml:"topic_prefix"` // Keep all storage in memory. This is mostly useful for unit tests. InMemory bool `yaml:"in_memory"` + // Disable logging. This is mostly useful for unit tests. + NoLog bool `yaml:"-"` + // Disables TLS validation. This should NOT be used in production + DisableTLSValidation bool `yaml:"disable_tls_validation"` } func (c *JetStream) Prefixed(name string) string { @@ -32,6 +36,8 @@ func (c *JetStream) Defaults(generate bool) { c.TopicPrefix = "Dendrite" if generate { c.StoragePath = Path("./") + c.NoLog = true + c.DisableTLSValidation = true } } diff --git a/setup/jetstream/nats.go b/setup/jetstream/nats.go index 248b0e65..be216a02 100644 --- a/setup/jetstream/nats.go +++ b/setup/jetstream/nats.go @@ -1,6 +1,7 @@ package jetstream import ( + "crypto/tls" "fmt" "reflect" "strings" @@ -45,6 +46,7 @@ func (s *NATSInstance) Prepare(process *process.ProcessContext, cfg *config.JetS NoSystemAccount: true, MaxPayload: 16 * 1024 * 1024, NoSigs: true, + NoLog: cfg.NoLog, }) if err != nil { panic(err) @@ -75,7 +77,13 @@ func (s *NATSInstance) Prepare(process *process.ProcessContext, cfg *config.JetS func setupNATS(process *process.ProcessContext, cfg *config.JetStream, nc *natsclient.Conn) (natsclient.JetStreamContext, *natsclient.Conn) { if nc == nil { var err error - nc, err = natsclient.Connect(strings.Join(cfg.Addresses, ",")) + opts := []nats.Option{} + if cfg.DisableTLSValidation { + opts = append(opts, nats.Secure(&tls.Config{ + InsecureSkipVerify: true, + })) + } + nc, err = natsclient.Connect(strings.Join(cfg.Addresses, ","), opts...) if err != nil { logrus.WithError(err).Panic("Unable to connect to NATS") return nil, nil |