Skip to content

Commit

Permalink
Evaluate service imports when publishing advisories
Browse files Browse the repository at this point in the history
Signed-off-by: Neil Twigg <neil@nats.io>
  • Loading branch information
neilalexander committed Jul 12, 2023
1 parent e3b132a commit fbbbe28
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions server/client.go
Expand Up @@ -3127,20 +3127,14 @@ var needFlush = struct{}{}
// deliverMsg will deliver a message to a matching subscription and its underlying client.
// We process all connection/client types. mh is the part that will be protocol/client specific.
func (c *client) deliverMsg(prodIsMQTT bool, sub *subscription, acc *Account, subject, reply, mh, msg []byte, gwrply bool) bool {
// Check sub client and check echo
if sub.client == nil || c == sub.client && !sub.client.echo {
// Check sub client and check echo. Only do this if not an internal sub.
if sub.client == nil || (c == sub.client && !sub.client.echo && sub.icb == nil) {
return false
}

client := sub.client
client.mu.Lock()

// Check echo
if c == client && !client.echo {
client.mu.Unlock()
return false
}

// Check if we have a subscribe deny clause. This will trigger us to check the subject
// for a match against the denied subjects.
if client.mperms != nil && client.checkDenySub(string(subject)) {
Expand Down

0 comments on commit fbbbe28

Please sign in to comment.