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

Adding custom SNI name #35

Merged
merged 2 commits into from
May 12, 2022
Merged

Adding custom SNI name #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a3e09
Adding custom SNI name
Mzack9999 Apr 15, 2022
0e57a7c
adding support for sni via request context
Mzack9999 May 9, 2022
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
8 changes: 8 additions & 0 deletions fastdialer/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package fastdialer

type ContextOption string

const (
// SniName to use in tls connection
SniName ContextOption = "sni-name"
)
18 changes: 15 additions & 3 deletions fastdialer/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,25 @@ func (d *Dialer) dial(ctx context.Context, network, address string, shouldUseTLS
hostPort := net.JoinHostPort(ip, port)
if shouldUseTLS {
tlsconfigCopy := tlsconfig.Clone()
if !iputil.IsIP(hostname) {
switch {
case d.options.SNIName != "":
tlsconfigCopy.ServerName = d.options.SNIName
case ctx.Value(SniName) != nil:
sniName := ctx.Value(SniName).(string)
tlsconfigCopy.ServerName = sniName
case !iputil.IsIP(hostname):
tlsconfigCopy.ServerName = hostname
}
conn, err = tls.DialWithDialer(d.dialer, network, hostPort, tlsconfig)
conn, err = tls.DialWithDialer(d.dialer, network, hostPort, tlsconfigCopy)
} else if shouldUseZTLS {
ztlsconfigCopy := ztlsconfig.Clone()
if !iputil.IsIP(hostname) {
switch {
case d.options.SNIName != "":
ztlsconfigCopy.ServerName = d.options.SNIName
case ctx.Value(SniName) != nil:
sniName := ctx.Value(SniName).(string)
ztlsconfigCopy.ServerName = sniName
case !iputil.IsIP(hostname):
ztlsconfigCopy.ServerName = hostname
}
conn, err = ztls.DialWithDialer(d.dialer, network, hostPort, ztlsconfigCopy)
Expand Down
1 change: 1 addition & 0 deletions fastdialer/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type Options struct {
DialerKeepAlive time.Duration
Dialer *net.Dialer
WithZTLS bool
SNIName string
}

// DefaultOptions of the cache
Expand Down