gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-14 10:10:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify, don't need connect processing

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2018-09-05 17:03:45 -07:00
parent 2ee868ba18
commit f032dc4529
2 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/client.go
View File

@@ -242,19 +242,21 @@ type subscription struct {
}
type clientOpts struct {
Echo bool `json:"echo"`
Verbose bool `json:"verbose"`
Pedantic bool `json:"pedantic"`
TLSRequired bool `json:"tls_required"`
Authorization string `json:"auth_token"`
Username string `json:"user"`
Password string `json:"pass"`
Name string `json:"name"`
Lang string `json:"lang"`
Version string `json:"version"`
Protocol int `json:"protocol"`
Import *SubjectPermission `json:"import,omitempty"` // Used for routes only
Export *SubjectPermission `json:"export,omitempty"` // Used for routes only
Echo bool `json:"echo"`
Verbose bool `json:"verbose"`
Pedantic bool `json:"pedantic"`
TLSRequired bool `json:"tls_required"`
Authorization string `json:"auth_token"`
Username string `json:"user"`
Password string `json:"pass"`
Name string `json:"name"`
Lang string `json:"lang"`
Version string `json:"version"`
Protocol int `json:"protocol"`
// Routes only
Import *SubjectPermission `json:"import,omitempty"`
Export *SubjectPermission `json:"export,omitempty"`
}
var defaultOpts = clientOpts{Verbose: true, Pedantic: true, Echo: true}

35
server/route.go
View File

@@ -54,15 +54,13 @@ type route struct {
}
type connectInfo struct {
Echo bool `json:"echo"`
Verbose bool `json:"verbose"`
Pedantic bool `json:"pedantic"`
User string `json:"user,omitempty"`
Pass string `json:"pass,omitempty"`
TLS bool `json:"tls_required"`
Name string `json:"name"`
Import *SubjectPermission `json:"import,omitempty"`
Export *SubjectPermission `json:"export,omitempty"`
Echo bool `json:"echo"`
Verbose bool `json:"verbose"`
Pedantic bool `json:"pedantic"`
User string `json:"user,omitempty"`
Pass string `json:"pass,omitempty"`
TLS bool `json:"tls_required"`
Name string `json:"name"`
}
// Used to hold onto mappings for unsubscribed
@@ -272,12 +270,6 @@ func (c *client) sendConnect(tlsRequired bool) {
Name: c.srv.info.ID,
}
// Check for any permissions to send across.
if perms := c.srv.opts.Cluster.Permissions; perms != nil {
cinfo.Import = perms.Import
cinfo.Export = perms.Export
}
b, err := json.Marshal(cinfo)
if err != nil {
c.Errorf("Error marshaling CONNECT to route: %v\n", err)
@@ -326,6 +318,7 @@ func (c *client) processRouteInfo(info *Info) {
c.route.authRequired = info.AuthRequired
c.route.tlsRequired = info.TLSRequired
// Copy over permissions as well.
c.opts.Import = info.Import
c.opts.Export = info.Export
@@ -818,10 +811,6 @@ func (s *Server) addRoute(c *client, info *Info) (bool, bool) {
rs := *c.route
r = &rs
}
// Snapshot permissions if they exist.
imports := c.opts.Import
exports := c.opts.Export
c.mu.Unlock()
remote.mu.Lock()
@@ -836,14 +825,6 @@ func (s *Server) addRoute(c *client, info *Info) (bool, bool) {
// on the opposite connection, and therefore end-up with both
// connections being dropped.
remote.route.retry = true
// If we had permissions we want to move these to the remote.
if imports != nil {
remote.opts.Import = imports
}
if exports != nil {
remote.opts.Export = exports
}
remote.mu.Unlock()
}