Fix linter issues

This commit is contained in:
2026-05-27 10:58:13 +03:00
parent 11a357ebc4
commit 024d5fd96c
13 changed files with 145 additions and 46 deletions

View File

@@ -1,21 +1,52 @@
package dialer
import (
"context"
"crypto/tls"
"encoding/base64"
"fmt"
"net"
"net/url"
)
func (d *Dialer) Dial() (net.Conn, error) {
if d.dialURL.Scheme == "https" {
return tls.Dial("tcp", d.dialURL.Host, &tls.Config{
ServerName: d.dialURL.Hostname(),
InsecureSkipVerify: d.app.Config().Upstream.InsecureTLS,
})
func (d *Dialer) Auth() (string, bool) {
url, _ := d.UpstreamURL()
if url.User == nil {
return "", false
}
return net.Dial("tcp", d.dialURL.Host)
username := url.User.Username()
password, _ := url.User.Password()
return base64.StdEncoding.EncodeToString(
[]byte(username + ":" + password),
), true
}
func (d *Dialer) Dial(ctx context.Context) (net.Conn, error) {
dialer := &net.Dialer{}
conn, err := dialer.DialContext(ctx, "tcp", d.dialURL.Host)
if err != nil {
return nil, fmt.Errorf("%w: %w (%w)", ErrDialer, ErrDial, err)
}
if d.dialURL.Scheme != "https" {
return conn, nil
}
tlsConn := tls.Client(conn, &tls.Config{
ServerName: d.dialURL.Hostname(),
//nolint:gosec
InsecureSkipVerify: d.app.Config().Upstream.InsecureTLS,
})
if err := tlsConn.HandshakeContext(ctx); err != nil {
_ = conn.Close()
return nil, fmt.Errorf("%w: %w (%w)", ErrDialer, ErrDial, err)
}
return tlsConn, nil
}
func (d *Dialer) UpstreamURL() (*url.URL, error) {
@@ -26,12 +57,12 @@ func (d *Dialer) UpstreamURL() (*url.URL, error) {
)
}
u, err := url.Parse(d.app.Config().Upstream.URL)
upstreamURL, err := url.Parse(d.app.Config().Upstream.URL)
if err != nil {
return nil, fmt.Errorf(
"%w: %w (%w)", ErrDialer, ErrUpstreamURL, err,
)
}
return u, nil
return upstreamURL, nil
}

View File

@@ -5,5 +5,6 @@ import "errors"
var (
ErrDialer = errors.New("dialer")
ErrConnectDependencies = errors.New("function ConnectDependencies()")
ErrDial = errors.New("function Dial()")
ErrUpstreamURL = errors.New("function UpstreamURL()")
)