mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-05-12 12:26:34 +00:00
2baea15387
Origintunneld has been observed to continue sending reply packets to the first incoming connection it received, even if a newer connection is observed to be sending the requests. OTD uses the funnel library from cloudflared, which is why the changes are here. In theory, cloudflared has the same type of bug where a ping session switching between quic connections will continue sending replies to the first connection. This bug has not been tested or confirmed though, but this PR will fix if it exists.
89 lines
1.9 KiB
Go
89 lines
1.9 KiB
Go
//go:build darwin || linux
|
|
|
|
package ingress
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/google/gopacket/layers"
|
|
"github.com/rs/zerolog"
|
|
"github.com/stretchr/testify/require"
|
|
"golang.org/x/net/icmp"
|
|
"golang.org/x/net/ipv4"
|
|
|
|
"github.com/cloudflare/cloudflared/packet"
|
|
)
|
|
|
|
func TestFunnelIdleTimeout(t *testing.T) {
|
|
const (
|
|
idleTimeout = time.Second
|
|
echoID = 42573
|
|
startSeq = 8129
|
|
)
|
|
logger := zerolog.New(os.Stderr)
|
|
proxy, err := newICMPProxy(localhostIP, "", &logger, idleTimeout)
|
|
require.NoError(t, err)
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
proxyDone := make(chan struct{})
|
|
go func() {
|
|
proxy.Serve(ctx)
|
|
close(proxyDone)
|
|
}()
|
|
|
|
// Send a packet to register the flow
|
|
pk := packet.ICMP{
|
|
IP: &packet.IP{
|
|
Src: localhostIP,
|
|
Dst: localhostIP,
|
|
Protocol: layers.IPProtocolICMPv4,
|
|
},
|
|
Message: &icmp.Message{
|
|
Type: ipv4.ICMPTypeEcho,
|
|
Code: 0,
|
|
Body: &icmp.Echo{
|
|
ID: echoID,
|
|
Seq: startSeq,
|
|
Data: []byte(t.Name()),
|
|
},
|
|
},
|
|
}
|
|
funnelID := flow3Tuple{
|
|
srcIP: pk.Src,
|
|
dstIP: pk.Dst,
|
|
originalEchoID: echoID,
|
|
}
|
|
muxer := newMockMuxer(0)
|
|
responder := packetResponder{
|
|
datagramMuxer: muxer,
|
|
}
|
|
require.NoError(t, proxy.Request(ctx, &pk, &responder))
|
|
validateEchoFlow(t, <-muxer.cfdToEdge, &pk)
|
|
funnel1, found := proxy.srcFunnelTracker.Get(funnelID)
|
|
require.True(t, found)
|
|
|
|
// Send second request, should reuse the funnel
|
|
require.NoError(t, proxy.Request(ctx, &pk, &packetResponder{
|
|
datagramMuxer: muxer,
|
|
}))
|
|
validateEchoFlow(t, <-muxer.cfdToEdge, &pk)
|
|
funnel2, found := proxy.srcFunnelTracker.Get(funnelID)
|
|
require.True(t, found)
|
|
require.Equal(t, funnel1, funnel2)
|
|
|
|
time.Sleep(idleTimeout * 2)
|
|
newMuxer := newMockMuxer(0)
|
|
newResponder := packetResponder{
|
|
datagramMuxer: newMuxer,
|
|
}
|
|
require.NoError(t, proxy.Request(ctx, &pk, &newResponder))
|
|
validateEchoFlow(t, <-newMuxer.cfdToEdge, &pk)
|
|
|
|
cancel()
|
|
<-proxyDone
|
|
}
|