Skip to content

Commit

Permalink
(#987) disable clusters and super clusters in anon tls mode
Browse files Browse the repository at this point in the history
Signed-off-by: R.I.Pienaar <[email protected]>
  • Loading branch information
ripienaar committed Sep 13, 2020
1 parent daf80dc commit 080a974
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
14 changes: 9 additions & 5 deletions broker/network/network_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@ import (
)

func (s *Server) setupCluster() (err error) {
peers, err := s.choria.NetworkBrokerPeers()
if err != nil {
return fmt.Errorf("could not determine network broker peers: %s", err)
}

if s.config.Choria.NetworkClientTLSAnon && (s.config.Choria.NetworkPeerPort > 0 || peers.Count() > 0) {
return fmt.Errorf("clustering is disabled when anonymous TLS is configured")
}

s.opts.Cluster.Host = s.config.Choria.NetworkListenAddress
s.opts.Cluster.NoAdvertise = true
s.opts.Cluster.Port = s.config.Choria.NetworkPeerPort
s.opts.Cluster.Username = s.config.Choria.NetworkPeerUser
s.opts.Cluster.Password = s.config.Choria.NetworkPeerPassword

peers, err := s.choria.NetworkBrokerPeers()
if err != nil {
return fmt.Errorf("could not determine network broker peers: %s", err)
}

for _, p := range peers.Servers() {
u, err := p.URL()
if err != nil {
Expand Down
4 changes: 4 additions & 0 deletions broker/network/network_gateways.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ func (s *Server) setupGateways() (err error) {
return nil
}

if s.config.Choria.NetworkClientTLSAnon && len(s.config.Choria.NetworkGatewayRemotes) > 0 {
return fmt.Errorf("super clusters are disabled when anonymous TLS is configured")
}

if s.config.Choria.NetworkGatewayName == "" {
return fmt.Errorf("network Gateways require a name")
}
Expand Down

0 comments on commit 080a974

Please sign in to comment.