[FIXED] Possible panic when server accepts TLS leafnode connection #1652
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
philpennock
approved these changes
Oct 19, 2020
|
@derekcollison The panic was for the non solicited. When calling |
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
kozlovic
force-pushed
the
fix_leafnode_accept_panic
branch
from
56dd752
to
3b8d00e
Compare
|
Pushing the change for the wrong comment.. |
derekcollison
approved these changes
Oct 19, 2020
server/leafnode.go
Outdated
| @@ -649,6 +649,14 @@ func (s *Server) createLeafNode(conn net.Conn, remote *leafNodeCfg) *client { | |||
| return nil | |||
| } | |||
|
|
|||
| // Not sure that can happen, but in case the connection was marked | |||
| // as closed during the call to parse... | |||
| if c.isClosed() { | |||
There was a problem hiding this comment.
Let's make this a small anonymous function inside this function to clean up?
ifClosedReturn := func()
There was a problem hiding this comment.
I would still need to have something like:
if closedReturn() {
return nil
}
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
kozlovic
added a commit
that referenced
this pull request
Oct 21, 2020
This is an addition to PR #1652. I have simply added a check but at this point in time there is no risk that connection is closed this early. I also renamed the small helper function and fixed a test that had an improper `s.mu.Unlock()` in an error condition. Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
kozlovic
added a commit
that referenced
this pull request
Nov 2, 2020
This is a port of PR #1652/#1660. The code in the 2.1.x branch is not sensitive to the issue fixed in these PRs because marking the connection as closed (for instance due to a TCP error in sendProtoNow) will not set `c.nc` to nil, so there won't be the nil dereference issue that was found in the main branch. However, porting the code for extra safety. Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Ivan Kozlovic ivan@synadia.com