sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix server name in TLS connections

Browse Source
This commit is contained in:
Adnan Maolood 2020-11-27 17:45:15 -05:00
parent 82688746dd
commit e0ac1685d2
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client.go
View File

@ -85,6 +85,13 @@ func (c *Client) Do(req *Request) (*Response, error) {
} }
func (c *Client) do(req *Request, via []*Request) (*Response, error) { func (c *Client) do(req *Request, via []*Request) (*Response, error) {
// Extract hostname
colonPos := strings.LastIndex(req.Host, ":")
if colonPos == -1 {
colonPos = len(req.Host)
}
hostname := req.Host[:colonPos]
// Connect to the host // Connect to the host
config := &tls.Config{ config := &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
@ -95,6 +102,7 @@ func (c *Client) do(req *Request, via []*Request) (*Response, error) {
VerifyConnection: func(cs tls.ConnectionState) error { VerifyConnection: func(cs tls.ConnectionState) error {
return c.verifyConnection(req, cs) return c.verifyConnection(req, cs)
}, },
ServerName: hostname,
} }
netConn, err := (&net.Dialer{}).DialContext(req.Context, "tcp", req.Host) netConn, err := (&net.Dialer{}).DialContext(req.Context, "tcp", req.Host)
if err != nil { if err != nil {
@ -166,6 +174,7 @@ func (c *Client) do(req *Request, via []*Request) (*Response, error) {
target = req.URL.ResolveReference(target) target = req.URL.ResolveReference(target)
redirect := NewRequestFromURL(target) redirect := NewRequestFromURL(target)
redirect.Context = req.Context
if c.CheckRedirect != nil { if c.CheckRedirect != nil {
if err := c.CheckRedirect(redirect, via); err != nil { if err := c.CheckRedirect(redirect, via); err != nil {
return resp, err return resp, err