package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-27 01:00:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix error when authenticating with vlc and slashes in paths

Browse Source
This commit is contained in:
aler9
2020-10-31 14:57:14 +01:00
parent d85cfae2ed
commit 071637fde0
4 changed files with 106 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
auth/package_test.go
View File

@@ -46,7 +46,7 @@ func TestAuthMethods(t *testing.T) {
} }
} }
func TestAuthBasePath(t *testing.T) { func TestAuthVLC(t *testing.T) {
authServer := NewServer("testuser", "testpass", authServer := NewServer("testuser", "testpass",
[]headers.AuthMethod{headers.AuthBasic, headers.AuthDigest}) []headers.AuthMethod{headers.AuthBasic, headers.AuthDigest})
wwwAuthenticate := authServer.GenerateHeader() wwwAuthenticate := authServer.GenerateHeader()
@@ -54,9 +54,9 @@ func TestAuthBasePath(t *testing.T) {
ac, err := NewClient(wwwAuthenticate, "testuser", "testpass") ac, err := NewClient(wwwAuthenticate, "testuser", "testpass")
require.NoError(t, err) require.NoError(t, err)
authorization := ac.GenerateHeader(base.ANNOUNCE, authorization := ac.GenerateHeader(base.ANNOUNCE,
&url.URL{Scheme: "rtsp", Host: "myhost", Path: "mypath/"}) &url.URL{Scheme: "rtsp", Host: "myhost", Path: "/mypath/"})
err = authServer.ValidateHeader(authorization, base.ANNOUNCE, err = authServer.ValidateHeader(authorization, base.ANNOUNCE,
&url.URL{Scheme: "rtsp", Host: "myhost", Path: "mypath/trackId=0"}) &url.URL{Scheme: "rtsp", Host: "myhost", Path: "/mypath/trackId=0"})
require.NoError(t, err) require.NoError(t, err)
} }

18
auth/server.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/aler9/gortsplib/headers" "github.com/aler9/gortsplib/headers"
) )
// Server is an object that helps a server to authenticate a client. // Server allows a server to authenticate a client.
type Server struct { type Server struct {
user string user string
pass string pass string
@@ -126,19 +126,13 @@ func (as *Server) ValidateHeader(v base.HeaderValue, method base.Method, ur *url
uri := ur.String() uri := ur.String()
if *auth.URI != uri { if *auth.URI != uri {
// VLC strips the subpath // VLC strips the control path; do another try without the control path
newUrl := *ur base, _, ok := base.URLGetBaseControlPath(ur)
newUrl.Path = func() string { if ok {
ret := newUrl.Path ur.Path = "/" + base + "/"
uri = ur.String()
if n := strings.Index(ret[1:], "/"); n >= 0 {
ret = ret[:n+2]
} }
return ret
}()
uri = newUrl.String()
if *auth.URI != uri { if *auth.URI != uri {
return fmt.Errorf("wrong url") return fmt.Errorf("wrong url")
} }

2
base/url.go
View File

@@ -1,8 +1,8 @@
package base package base
import ( import (
"strings"
"net/url" "net/url"
"strings"
) )
func stringsReverseIndexByte(s string, c byte) int { func stringsReverseIndexByte(s string, c byte) int {