mirror of
https://github.com/aler9/gortsplib
synced 2025-10-05 15:16:51 +08:00
client: do not use InsecureSkipVerify by default
This commit is contained in:
16
client.go
16
client.go
@@ -145,7 +145,7 @@ type Client struct {
|
|||||||
// It defaults to 10 seconds.
|
// It defaults to 10 seconds.
|
||||||
WriteTimeout time.Duration
|
WriteTimeout time.Duration
|
||||||
// a TLS configuration to connect to TLS (RTSPS) servers.
|
// a TLS configuration to connect to TLS (RTSPS) servers.
|
||||||
// It defaults to &tls.Config{InsecureSkipVerify:true}
|
// It defaults to nil.
|
||||||
TLSConfig *tls.Config
|
TLSConfig *tls.Config
|
||||||
// disable being redirected to other servers, that can happen during Describe().
|
// disable being redirected to other servers, that can happen during Describe().
|
||||||
// It defaults to false.
|
// It defaults to false.
|
||||||
@@ -259,9 +259,6 @@ func (c *Client) Start(scheme string, host string) error {
|
|||||||
if c.WriteTimeout == 0 {
|
if c.WriteTimeout == 0 {
|
||||||
c.WriteTimeout = 10 * time.Second
|
c.WriteTimeout = 10 * time.Second
|
||||||
}
|
}
|
||||||
if c.TLSConfig == nil {
|
|
||||||
c.TLSConfig = &tls.Config{InsecureSkipVerify: true}
|
|
||||||
}
|
|
||||||
if c.InitialUDPReadTimeout == 0 {
|
if c.InitialUDPReadTimeout == 0 {
|
||||||
c.InitialUDPReadTimeout = 3 * time.Second
|
c.InitialUDPReadTimeout = 3 * time.Second
|
||||||
}
|
}
|
||||||
@@ -824,9 +821,16 @@ func (c *Client) connOpen() error {
|
|||||||
|
|
||||||
conn := func() net.Conn {
|
conn := func() net.Conn {
|
||||||
if c.scheme == "rtsps" {
|
if c.scheme == "rtsps" {
|
||||||
|
tlsConfig := c.TLSConfig
|
||||||
|
|
||||||
|
if tlsConfig == nil {
|
||||||
|
tlsConfig = &tls.Config{}
|
||||||
|
}
|
||||||
|
|
||||||
host, _, _ := net.SplitHostPort(c.host)
|
host, _, _ := net.SplitHostPort(c.host)
|
||||||
c.TLSConfig.ServerName = host
|
tlsConfig.ServerName = host
|
||||||
return tls.Client(nconn, c.TLSConfig)
|
|
||||||
|
return tls.Client(nconn, tlsConfig)
|
||||||
}
|
}
|
||||||
return nconn
|
return nconn
|
||||||
}()
|
}()
|
||||||
|
@@ -395,6 +395,9 @@ func TestClientRead(t *testing.T) {
|
|||||||
counter := 0
|
counter := 0
|
||||||
|
|
||||||
c := &Client{
|
c := &Client{
|
||||||
|
TLSConfig: &tls.Config{
|
||||||
|
InsecureSkipVerify: true,
|
||||||
|
},
|
||||||
Transport: func() *Transport {
|
Transport: func() *Transport {
|
||||||
switch transport {
|
switch transport {
|
||||||
case "udp":
|
case "udp":
|
||||||
|
@@ -73,9 +73,10 @@ func TestClientTLSSetServerName(t *testing.T) {
|
|||||||
|
|
||||||
err = c.Start(u.Scheme, u.Host)
|
err = c.Start(u.Scheme, u.Host)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
defer c.Close()
|
||||||
|
|
||||||
_, err = c.Options(u)
|
_, err = c.Options(u)
|
||||||
require.EqualError(t, err, "x509: certificate relies on legacy Common Name field, use SANs instead")
|
require.Error(t, err)
|
||||||
|
|
||||||
<-serverDone
|
<-serverDone
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user