Skip to content

Commit

Permalink
autonatv2: catch panics
Browse files Browse the repository at this point in the history
  • Loading branch information
sukunrt committed Oct 2, 2024
1 parent 5773e76 commit 460f205
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
4 changes: 2 additions & 2 deletions p2p/protocol/autonatv2/autonat.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const (
DialProtocol = "/libp2p/autonat/2/dial-request"

maxMsgSize = 8192
streamTimeout = time.Minute
streamTimeout = 15 * time.Second
dialBackStreamTimeout = 5 * time.Second
dialBackDialTimeout = 30 * time.Second
dialBackDialTimeout = 10 * time.Second
dialBackMaxMsgSize = 1024
minHandshakeSizeBytes = 30_000 // for amplification attack prevention
maxHandshakeSizeBytes = 100_000
Expand Down
1 change: 0 additions & 1 deletion p2p/protocol/autonatv2/autonat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -657,5 +657,4 @@ func TestAreAddrsConsistency(t *testing.T) {
}
})
}

}
8 changes: 8 additions & 0 deletions p2p/protocol/autonatv2/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package autonatv2
import (
"context"
"fmt"
"os"
"runtime/debug"
"sync"
"time"

Expand Down Expand Up @@ -248,6 +250,12 @@ func newDialRequest(reqs []Request, nonce uint64) pb.Message {

// handleDialBack receives the nonce on the dial-back stream
func (ac *client) handleDialBack(s network.Stream) {
defer func() {
if rerr := recover(); rerr != nil {
fmt.Fprintf(os.Stderr, "caught panic: %s\n%s\n", rerr, debug.Stack())
}
}()

if err := s.Scope().SetService(ServiceName); err != nil {
log.Debugf("failed to attach stream to service %s: %w", ServiceName, err)
s.Reset()
Expand Down
11 changes: 10 additions & 1 deletion p2p/protocol/autonatv2/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"errors"
"fmt"
"io"
"os"
"runtime/debug"
"sync"
"time"

Expand Down Expand Up @@ -88,6 +90,13 @@ func (as *server) Close() {

// handleDialRequest is the dial-request protocol stream handler
func (as *server) handleDialRequest(s network.Stream) {
defer func() {
if rerr := recover(); rerr != nil {
fmt.Fprintf(os.Stderr, "caught panic: %s\n%s\n", rerr, debug.Stack())
}
}()

log.Debugf("received dial-request from: %s, addr: %s", s.Conn().RemotePeer(), s.Conn().RemoteMultiaddr())
evt := as.serveDialRequest(s)
log.Debugf("completed dial-request from %s, response status: %s, dial status: %s, err: %s",
s.Conn().RemotePeer(), evt.ResponseStatus, evt.DialStatus, evt.Error)
Expand All @@ -96,7 +105,7 @@ func (as *server) handleDialRequest(s network.Stream) {
}
}

func (as *server) serveDialRequest(s network.Stream) EventDialRequestCompleted {
func (as *server) serveDialRequest(s network.Stream) (result EventDialRequestCompleted) {
if err := s.Scope().SetService(ServiceName); err != nil {
s.Reset()
log.Debugf("failed to attach stream to %s service: %w", ServiceName, err)
Expand Down

0 comments on commit 460f205

Please sign in to comment.