Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

webrtc: return 404 in case a WHIP PATCH or WHIP DELETE request fails #3232

Merged
merged 1 commit into from
Apr 13, 2024
Merged

webrtc: return 404 in case a WHIP PATCH or WHIP DELETE request fails #3232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions internal/servers/webrtc/http_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,11 @@
candidates: candidates,
})
if res.err != nil {
writeError(ctx, http.StatusInternalServerError, res.err)
if errors.Is(res.err, ErrSessionNotFound) {
writeError(ctx, http.StatusNotFound, res.err)
} else {
writeError(ctx, http.StatusInternalServerError, res.err)
}

Check warning on line 243 in internal/servers/webrtc/http_server.go

View check run for this annotation

Codecov / codecov/patch

internal/servers/webrtc/http_server.go#L242-L243 

Added lines #L242 - L243 were not covered by tests
return
}

Expand All @@ -254,7 +258,11 @@
secret: secret,
})
if err != nil {
writeError(ctx, http.StatusInternalServerError, err)
if errors.Is(err, ErrSessionNotFound) {
writeError(ctx, http.StatusNotFound, err)
} else {
writeError(ctx, http.StatusInternalServerError, err)
}

Check warning on line 265 in internal/servers/webrtc/http_server.go

View check run for this annotation

Codecov / codecov/patch

internal/servers/webrtc/http_server.go#L264-L265 

Added lines #L264 - L265 were not covered by tests
return
}

Expand Down
205 changes: 149 additions & 56 deletions internal/servers/webrtc/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,16 @@ import (
"github.com/bluenviron/mediamtx/internal/stream"
"github.com/bluenviron/mediamtx/internal/test"
"github.com/bluenviron/mediamtx/internal/unit"
"github.com/google/uuid"
"github.com/pion/rtp"
pwebrtc "github.com/pion/webrtc/v3"
"github.com/stretchr/testify/require"
)

func uint16Ptr(v uint16) *uint16 {
return &v
}

func checkClose(t *testing.T, closeFunc func() error) {
require.NoError(t, closeFunc())
}
Expand Down Expand Up @@ -90,7 +95,13 @@ func (pm *dummyPathManager) AddReader(req defs.PathAddReaderReq) (defs.Path, *st
return pm.path, pm.path.stream, nil
}

func TestServerStaticPages(t *testing.T) {
func initializeTestServer(t *testing.T) *Server {
path := &dummyPath{
streamCreated: make(chan struct{}),
}

pathManager := &dummyPathManager{path: path}

s := &Server{
Address: "127.0.0.1:8886",
Encryption: false,
Expand All @@ -107,11 +118,17 @@ func TestServerStaticPages(t *testing.T) {
AdditionalHosts: []string{},
ICEServers: []conf.WebRTCICEServer{},
ExternalCmdPool: nil,
PathManager: &dummyPathManager{},
PathManager: pathManager,
Parent: test.NilLogger{},
}
err := s.Initialize()
require.NoError(t, err)

return s
}

func TestServerStaticPages(t *testing.T) {
s := initializeTestServer(t)
defer s.Close()

tr := &http.Transport{}
Expand All @@ -132,6 +149,75 @@ func TestServerStaticPages(t *testing.T) {
}
}

func TestServerOptionsPreflight(t *testing.T) {
s := initializeTestServer(t)
defer s.Close()

tr := &http.Transport{}
defer tr.CloseIdleConnections()
hc := &http.Client{Transport: tr}

// preflight requests must always work, without authentication
req, err := http.NewRequest(http.MethodOptions, "http://localhost:8886/teststream/whip", nil)
require.NoError(t, err)

req.Header.Set("Access-Control-Request-Method", "OPTIONS")

res, err := hc.Do(req)
require.NoError(t, err)
defer res.Body.Close()

require.Equal(t, http.StatusNoContent, res.StatusCode)

_, ok := res.Header["Link"]
require.Equal(t, false, ok)
}

func TestServerOptionsICEServer(t *testing.T) {
pathManager := &dummyPathManager{}

s := &Server{
Address: "127.0.0.1:8886",
Encryption: false,
ServerKey: "",
ServerCert: "",
AllowOrigin: "",
TrustedProxies: conf.IPNetworks{},
ReadTimeout: conf.StringDuration(10 * time.Second),
WriteQueueSize: 512,
LocalUDPAddress: "127.0.0.1:8887",
LocalTCPAddress: "127.0.0.1:8887",
IPsFromInterfaces: true,
IPsFromInterfacesList: []string{},
AdditionalHosts: []string{},
ICEServers: []conf.WebRTCICEServer{{
URL: "example.com",
Username: "myuser",
Password: "mypass",
}},
ExternalCmdPool: nil,
PathManager: pathManager,
Parent: test.NilLogger{},
}
err := s.Initialize()
require.NoError(t, err)
defer s.Close()

tr := &http.Transport{}
defer tr.CloseIdleConnections()
hc := &http.Client{Transport: tr}

iceServers, err := webrtc.WHIPOptionsICEServers(context.Background(), hc,
"http://myuser:mypass@localhost:8886/nonexisting/whep")
require.NoError(t, err)

require.Equal(t, []pwebrtc.ICEServer{{
URLs: []string{"example.com"},
Username: "myuser",
Credential: "mypass",
}}, iceServers)
}

func TestServerPublish(t *testing.T) {
path := &dummyPath{
streamCreated: make(chan struct{}),
Expand Down Expand Up @@ -166,26 +252,7 @@ func TestServerPublish(t *testing.T) {
defer tr.CloseIdleConnections()
hc := &http.Client{Transport: tr}

// preflight requests must always work, without authentication
func() {
req, err := http.NewRequest(http.MethodOptions, "http://localhost:8886/teststream/whip", nil)
require.NoError(t, err)

req.Header.Set("Access-Control-Request-Method", "OPTIONS")

res, err := hc.Do(req)
require.NoError(t, err)
defer res.Body.Close()

require.Equal(t, http.StatusNoContent, res.StatusCode)

_, ok := res.Header["Link"]
require.Equal(t, false, ok)
}()

ur := "http://myuser:mypass@localhost:8886/teststream/whip?param=value"

su, err := url.Parse(ur)
su, err := url.Parse("http://myuser:mypass@localhost:8886/teststream/whip?param=value")
require.NoError(t, err)

wc := &webrtc.WHIPClient{
Expand Down Expand Up @@ -291,9 +358,7 @@ func TestServerRead(t *testing.T) {
require.NoError(t, err)
defer s.Close()

ur := "http://myuser:mypass@localhost:8886/teststream/whep?param=value"

u, err := url.Parse(ur)
u, err := url.Parse("http://myuser:mypass@localhost:8886/teststream/whep?param=value")
require.NoError(t, err)

tr := &http.Transport{}
Expand Down Expand Up @@ -357,43 +422,15 @@ func TestServerRead(t *testing.T) {
}, pkt)
}

func TestServerReadNotFound(t *testing.T) {
pathManager := &dummyPathManager{}

s := &Server{
Address: "127.0.0.1:8886",
Encryption: false,
ServerKey: "",
ServerCert: "",
AllowOrigin: "",
TrustedProxies: conf.IPNetworks{},
ReadTimeout: conf.StringDuration(10 * time.Second),
WriteQueueSize: 512,
LocalUDPAddress: "127.0.0.1:8887",
LocalTCPAddress: "127.0.0.1:8887",
IPsFromInterfaces: true,
IPsFromInterfacesList: []string{},
AdditionalHosts: []string{},
ICEServers: []conf.WebRTCICEServer{},
ExternalCmdPool: nil,
PathManager: pathManager,
Parent: test.NilLogger{},
}
err := s.Initialize()
require.NoError(t, err)
func TestServerPostNotFound(t *testing.T) {
s := initializeTestServer(t)
defer s.Close()

tr := &http.Transport{}
defer tr.CloseIdleConnections()
hc := &http.Client{Transport: tr}

iceServers, err := webrtc.WHIPOptionsICEServers(context.Background(), hc,
"http://myuser:mypass@localhost:8886/nonexisting/whep")
require.NoError(t, err)

pc, err := pwebrtc.NewPeerConnection(pwebrtc.Configuration{
ICEServers: iceServers,
})
pc, err := pwebrtc.NewPeerConnection(pwebrtc.Configuration{})
require.NoError(t, err)
defer pc.Close() //nolint:errcheck

Expand All @@ -416,6 +453,62 @@ func TestServerReadNotFound(t *testing.T) {
require.Equal(t, http.StatusNotFound, res.StatusCode)
}

func TestServerPatchNotFound(t *testing.T) {
s := initializeTestServer(t)
defer s.Close()

tr := &http.Transport{}
defer tr.CloseIdleConnections()
hc := &http.Client{Transport: tr}

pc, err := pwebrtc.NewPeerConnection(pwebrtc.Configuration{})
require.NoError(t, err)
defer pc.Close() //nolint:errcheck

_, err = pc.AddTransceiverFromKind(pwebrtc.RTPCodecTypeVideo)
require.NoError(t, err)

offer, err := pc.CreateOffer(nil)
require.NoError(t, err)

frag, err := webrtc.ICEFragmentMarshal(offer.SDP, []*pwebrtc.ICECandidateInit{{
Candidate: "mycandidate",
SDPMLineIndex: uint16Ptr(0),
}})
require.NoError(t, err)

req, err := http.NewRequest(http.MethodPatch,
"http://localhost:8886/nonexisting/whep/"+uuid.UUID{}.String(), bytes.NewReader(frag))
require.NoError(t, err)

req.Header.Set("Content-Type", "application/trickle-ice-sdpfrag")

res, err := hc.Do(req)
require.NoError(t, err)
defer res.Body.Close()

require.Equal(t, http.StatusNotFound, res.StatusCode)
}

func TestServerDeleteNotFound(t *testing.T) {
s := initializeTestServer(t)
defer s.Close()

tr := &http.Transport{}
defer tr.CloseIdleConnections()
hc := &http.Client{Transport: tr}

req, err := http.NewRequest(http.MethodDelete,
"http://localhost:8886/nonexisting/whep/"+uuid.UUID{}.String(), nil)
require.NoError(t, err)

res, err := hc.Do(req)
require.NoError(t, err)
defer res.Body.Close()

require.Equal(t, http.StatusNotFound, res.StatusCode)
}

func TestICEServerNoClientOnly(t *testing.T) {
s := &Server{
ICEServers: []conf.WebRTCICEServer{
Expand Down
Loading