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 provider ID to op and verify error before failing the op #46

Merged
merged 2 commits into from
Nov 5, 2024
Merged

adding provider ID to op and verify error before failing the op #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ef0a4
chore: adding provider ID to op and verify error before failing the op
WendelHime Nov 1, 2024
18aa1f1
fix: add comment explaining about both err handling approaches
WendelHime Nov 4, 2024
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
30 changes: 27 additions & 3 deletions fronted.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"strings"
"sync"
"sync/atomic"
"syscall"
"time"

tls "github.com/refraction-networking/utls"
Expand Down Expand Up @@ -371,10 +372,13 @@ func (f *fronted) doDial(m MasqueradeInterface) (conn net.Conn, retriable bool,
defer op.End()
op.Set("masquerade_domain", m.getDomain())
op.Set("masquerade_ip", m.getIpAddress())
op.Set("masquerade_provider", m.getProviderID())

conn, err = m.dial(f.certPool, f.clientHelloID)
if err != nil {
op.FailIf(err)
if !isNetworkUnreachable(err) {
op.FailIf(err)
}
log.Debugf("Could not dial to %v, %v", m.getIpAddress(), err)
// Don't re-add this candidate if it's any certificate error, as that
// will just keep failing and will waste connections. We can't access the underlying
Expand All @@ -386,12 +390,32 @@ func (f *fronted) doDial(m MasqueradeInterface) (conn net.Conn, retriable bool,
log.Debugf("Unexpected error dialing, keeping masquerade: %v", err)
retriable = true
}
} else {
log.Debugf("Got successful connection to: %v", m)
return
}
log.Debugf("Got successful connection to: %+v", m)
return
}

func isNetworkUnreachable(err error) bool {
var opErr *net.OpError
if errors.As(err, &opErr) {
// The following error verifications look for errors that generally happen at Linux/Unix devices
if errors.Is(opErr.Err, syscall.ENETUNREACH) || errors.Is(opErr.Err, syscall.EHOSTUNREACH) {
return true
}

// The string verification errors use a broader approach with errors from windows and also linux/unix devices
errMsg := opErr.Err.Error()
if strings.Contains(errMsg, "network is unreachable") ||
strings.Contains(errMsg, "no route to host") ||
strings.Contains(errMsg, "unreachable network") ||
strings.Contains(errMsg, "unreachable host") {
return true
}
}
return false
}

func verifyPeerCertificate(rawCerts [][]byte, roots *x509.CertPool, domain string) error {
if len(rawCerts) == 0 {
return fmt.Errorf("no certificates presented")
Expand Down
Loading