Skip to content
This repository was archived by the owner on Aug 1, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
[submodule "crypto"]
path = vendor/golang.org/x/crypto
url = https://go.googlesource.com/crypto
[submodule "go-http-dialer"]
path = vendor/github.com/mwitkow/go-http-dialer
url = https://github.com/mwitkow/go-http-dialer

49 changes: 40 additions & 9 deletions qpm/core/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ package core

import (
"fmt"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"log"
"net"
"net/url"
"os"
msg "qpm.io/common/messages"
"runtime"
"time"

"github.com/mwitkow/go-http-dialer"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
msg "qpm.io/common/messages"
)

var (
Expand Down Expand Up @@ -38,17 +43,43 @@ func NewContext() *Context {
address = Address
}

noTls := os.Getenv("NO_TLS") == "1"
// noTls := os.Getenv("NO_TLS") == "1"

var tlsOption grpc.DialOption
if noTls {
tlsOption = grpc.WithInsecure()
// var tlsOption grpc.DialOption
// if noTls {
// tlsOption = grpc.WithInsecure()
// } else {
// tlsOption = grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""))
// }

// conn, err := grpc.Dial(address, tlsOption, grpc.WithUserAgent(UA))

opts := make([]grpc.DialOption, 0)
opts = append(opts, grpc.WithUserAgent(UA))

noTLS := os.Getenv("NO_TLS") == "1"
if noTLS {
opts = append(opts, grpc.WithInsecure())
} else {
tlsOption = grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""))
opts = append(opts, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, "")))
}

conn, err := grpc.Dial(address, tlsOption, grpc.WithUserAgent(UA))
httpProxy := os.Getenv("HTTP_PROXY")
if httpProxy != "" {
log.Println("env: ", httpProxy)
httpProxyURL, err := url.Parse(httpProxy)
if err != nil {
log.Fatalf("did not get http proxy: %v", err)
} else {
proxyDialer := http_dialer.New(httpProxyURL)
opts = append(opts, grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { return proxyDialer.Dial("tcp", addr) }))
}
}

conn, err := grpc.Dial(address, opts...)
if err != nil {
log.Fatalf("did not connect: %v", err)
}
if err != nil {
log.Fatalf("did not connect: %v", err)
}
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/mwitkow/go-http-dialer
Submodule go-http-dialer added at 378f74