mirror of
https://github.com/refraction-networking/uquic.git
synced 2025-04-05 05:07:36 +03:00
add some server tests
This commit is contained in:
Lucas Clemente
parent
fd28921bdd
commit
71580780d6
3 changed files with 144 additions and 42 deletions
93
server.go
93
server.go
|
|
@ -2,6 +2,7 @@ package quic
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
|
|
@ -11,14 +12,22 @@ import (
|
|||
"github.com/lucas-clemente/quic-go/protocol"
|
||||
)
|
||||
|
||||
type PacketHandler interface {
|
||||
HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, publicHeader *PublicHeader, r *bytes.Reader) error
|
||||
}
|
||||
|
||||
// A Server of QUIC
|
||||
type Server struct {
|
||||
conn *net.UDPConn
|
||||
|
||||
signer crypto.Signer
|
||||
scfg *handshake.ServerConfig
|
||||
|
||||
sessions map[protocol.ConnectionID]*Session
|
||||
sessions map[protocol.ConnectionID]PacketHandler
|
||||
|
||||
streamCallback StreamCallback
|
||||
|
||||
newSession func(conn *net.UDPConn, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback) PacketHandler
|
||||
}
|
||||
|
||||
// NewServer makes a new server
|
||||
|
|
@ -35,7 +44,8 @@ func NewServer(certPath, keyPath string, cb StreamCallback) (*Server, error) {
|
|||
signer: signer,
|
||||
scfg: scfg,
|
||||
streamCallback: cb,
|
||||
sessions: map[protocol.ConnectionID]*Session{},
|
||||
sessions: map[protocol.ConnectionID]PacketHandler{},
|
||||
newSession: NewSession,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
@ -46,53 +56,64 @@ func (s *Server) ListenAndServe(address string) error {
|
|||
return err
|
||||
}
|
||||
|
||||
conn, err := net.ListenUDP("udp", addr)
|
||||
s.conn, err = net.ListenUDP("udp", addr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for {
|
||||
data := make([]byte, 1400)
|
||||
n, remoteAddr, err := conn.ReadFromUDP(data)
|
||||
data := make([]byte, protocol.MaxPacketSize)
|
||||
n, remoteAddr, err := s.conn.ReadFromUDP(data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
data = data[:n]
|
||||
r := bytes.NewReader(data)
|
||||
// ToDo: check packet size and send errorcodes.QUIC_PACKET_TOO_LARGE if packet is too large
|
||||
|
||||
publicHeader, err := ParsePublicHeader(r)
|
||||
if err != nil {
|
||||
// ToDo: send errorcodes.QUIC_INVALID_PACKET_HEADER
|
||||
fmt.Printf("Could not parse public header")
|
||||
continue
|
||||
}
|
||||
|
||||
// fmt.Printf("<- Got packet %d (%d bytes) from %v\n", publicHeader.PacketNumber, n, remoteAddr)
|
||||
|
||||
// Send Version Negotiation Packet if the client is speaking a different protocol version
|
||||
if publicHeader.VersionFlag && !protocol.IsSupportedVersion(publicHeader.VersionNumber) {
|
||||
fmt.Println("Sending VersionNegotiationPacket")
|
||||
_, err = conn.WriteToUDP(composeVersionNegotiation(publicHeader.ConnectionID), remoteAddr)
|
||||
if err != nil {
|
||||
fmt.Printf("Error sending version negotiation: %s", err.Error())
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
session, ok := s.sessions[publicHeader.ConnectionID]
|
||||
if !ok {
|
||||
fmt.Printf("Serving new connection: %d from %v\n", publicHeader.ConnectionID, remoteAddr)
|
||||
session = NewSession(conn, publicHeader.VersionNumber, publicHeader.ConnectionID, s.scfg, s.streamCallback)
|
||||
s.sessions[publicHeader.ConnectionID] = session
|
||||
}
|
||||
err = session.HandlePacket(remoteAddr, data[0:n-r.Len()], publicHeader, r)
|
||||
if err != nil {
|
||||
fmt.Printf("Error handling packet: %s\n", err.Error())
|
||||
if err := s.handlePacket(s.conn, remoteAddr, data); err != nil {
|
||||
fmt.Printf("error handling packet: %s", err.Error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Close the server
|
||||
func (s *Server) Close() error {
|
||||
return s.conn.Close()
|
||||
}
|
||||
|
||||
func (s *Server) handlePacket(conn *net.UDPConn, remoteAddr *net.UDPAddr, packet []byte) error {
|
||||
r := bytes.NewReader(packet)
|
||||
// ToDo: check packet size and send errorcodes.QUIC_PACKET_TOO_LARGE if packet is too large
|
||||
|
||||
publicHeader, err := ParsePublicHeader(r)
|
||||
if err != nil {
|
||||
// ToDo: send errorcodes.QUIC_INVALID_PACKET_HEADER
|
||||
return errors.New("Could not parse public header")
|
||||
}
|
||||
|
||||
// fmt.Printf("<- Got packet %d (%d bytes) from %v\n", publicHeader.PacketNumber, n, remoteAddr)
|
||||
|
||||
// Send Version Negotiation Packet if the client is speaking a different protocol version
|
||||
if publicHeader.VersionFlag && !protocol.IsSupportedVersion(publicHeader.VersionNumber) {
|
||||
fmt.Println("Sending VersionNegotiationPacket")
|
||||
_, err = conn.WriteToUDP(composeVersionNegotiation(publicHeader.ConnectionID), remoteAddr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
session, ok := s.sessions[publicHeader.ConnectionID]
|
||||
if !ok {
|
||||
fmt.Printf("Serving new connection: %d from %v\n", publicHeader.ConnectionID, remoteAddr)
|
||||
session = s.newSession(conn, publicHeader.VersionNumber, publicHeader.ConnectionID, s.scfg, s.streamCallback)
|
||||
s.sessions[publicHeader.ConnectionID] = session
|
||||
}
|
||||
err = session.HandlePacket(remoteAddr, packet[0:len(packet)-r.Len()], publicHeader, r)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func composeVersionNegotiation(connectionID protocol.ConnectionID) []byte {
|
||||
fullReply := &bytes.Buffer{}
|
||||
responsePublicHeader := PublicHeader{
|
||||
|
|
|
|||
|
|
@ -1,17 +1,98 @@
|
|||
package quic
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"net"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/lucas-clemente/quic-go/handshake"
|
||||
"github.com/lucas-clemente/quic-go/protocol"
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
||||
)
|
||||
|
||||
type mockSession struct {
|
||||
connectionID protocol.ConnectionID
|
||||
packetCount int
|
||||
}
|
||||
|
||||
func (s *mockSession) HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, publicHeader *PublicHeader, r *bytes.Reader) error {
|
||||
s.packetCount++
|
||||
return nil
|
||||
}
|
||||
|
||||
func newMockSession(conn *net.UDPConn, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback) PacketHandler {
|
||||
return &mockSession{
|
||||
connectionID: connectionID,
|
||||
}
|
||||
}
|
||||
|
||||
var _ = Describe("Server", func() {
|
||||
It("composes version negotiation packets", func() {
|
||||
expected := append(
|
||||
[]byte{0x2d, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
protocol.SupportedVersionsAsTags...,
|
||||
Describe("with mock session", func() {
|
||||
var (
|
||||
server *Server
|
||||
)
|
||||
Expect(composeVersionNegotiation(1)).To(Equal(expected))
|
||||
|
||||
BeforeEach(func() {
|
||||
server = &Server{
|
||||
sessions: map[protocol.ConnectionID]PacketHandler{},
|
||||
newSession: newMockSession,
|
||||
}
|
||||
})
|
||||
|
||||
It("composes version negotiation packets", func() {
|
||||
expected := append(
|
||||
[]byte{0x2d, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
protocol.SupportedVersionsAsTags...,
|
||||
)
|
||||
Expect(composeVersionNegotiation(1)).To(Equal(expected))
|
||||
})
|
||||
|
||||
It("creates new sessions", func() {
|
||||
err := server.handlePacket(nil, nil, []byte{0x04, 0x4c, 0x01})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(server.sessions).To(HaveLen(1))
|
||||
Expect(server.sessions[0x4c].(*mockSession).connectionID).To(Equal(protocol.ConnectionID(0x4c)))
|
||||
Expect(server.sessions[0x4c].(*mockSession).packetCount).To(Equal(1))
|
||||
})
|
||||
|
||||
It("assigns packets to existing sessions", func() {
|
||||
err := server.handlePacket(nil, nil, []byte{0x04, 0x4c, 0x01})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
err = server.handlePacket(nil, nil, []byte{0x04, 0x4c, 0x01})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(server.sessions).To(HaveLen(1))
|
||||
Expect(server.sessions[0x4c].(*mockSession).connectionID).To(Equal(protocol.ConnectionID(0x4c)))
|
||||
Expect(server.sessions[0x4c].(*mockSession).packetCount).To(Equal(2))
|
||||
})
|
||||
})
|
||||
|
||||
It("setups and responds with version negotiation", func() {
|
||||
path := os.Getenv("GOPATH") + "/src/github.com/lucas-clemente/quic-go/example/"
|
||||
server, err := NewServer(path+"cert.der", path+"key.der", nil)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
addr, err2 := net.ResolveUDPAddr("udp", "localhost:13370")
|
||||
Expect(err2).ToNot(HaveOccurred())
|
||||
conn, err2 := net.DialUDP("udp", nil, addr)
|
||||
Expect(err2).ToNot(HaveOccurred())
|
||||
_, err2 = conn.Write([]byte{0x05, 0x01, 'Q', '0', '0', '0', 0x01})
|
||||
Expect(err2).ToNot(HaveOccurred())
|
||||
data := make([]byte, 1000)
|
||||
n, _, err2 := conn.ReadFromUDP(data)
|
||||
Expect(err2).ToNot(HaveOccurred())
|
||||
data = data[:n]
|
||||
expected := append(
|
||||
[]byte{0x2d, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
protocol.SupportedVersionsAsTags...,
|
||||
)
|
||||
Expect(data).To(Equal(expected))
|
||||
err2 = server.Close()
|
||||
Expect(err2).ToNot(HaveOccurred())
|
||||
}()
|
||||
err = server.ListenAndServe("localhost:13370")
|
||||
Expect(err).To(HaveOccurred())
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ type Session struct {
|
|||
}
|
||||
|
||||
// NewSession makes a new session
|
||||
func NewSession(conn *net.UDPConn, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback) *Session {
|
||||
func NewSession(conn *net.UDPConn, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback) PacketHandler {
|
||||
session := &Session{
|
||||
Connection: conn,
|
||||
streamCallback: streamCallback,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue