diff options
author | terminaldweller <thabogre@gmail.com> | 2023-01-28 20:24:47 +0000 |
---|---|---|
committer | terminaldweller <thabogre@gmail.com> | 2023-01-28 20:24:47 +0000 |
commit | 49e73bd6db0d5947b49fab3f2c17f289b2a14f01 (patch) | |
tree | 37bb04532e33d49d1dbb02bdc5229d933eca7d14 /arbiter/arbiter.go | |
parent | hived now caches results. just trying not to exceed our quotas. (diff) | |
download | hived-49e73bd6db0d5947b49fab3f2c17f289b2a14f01.tar.gz hived-49e73bd6db0d5947b49fab3f2c17f289b2a14f01.zip |
added socks5 support for arbiter
Diffstat (limited to 'arbiter/arbiter.go')
-rw-r--r-- | arbiter/arbiter.go | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/arbiter/arbiter.go b/arbiter/arbiter.go index 8fce2be..5168b3a 100644 --- a/arbiter/arbiter.go +++ b/arbiter/arbiter.go @@ -8,6 +8,7 @@ import ( "flag" "fmt" "io/ioutil" + "net" "net/http" "net/url" "os" @@ -20,6 +21,7 @@ import ( "github.com/gorilla/mux" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "golang.org/x/net/proxy" ) var ( @@ -74,6 +76,28 @@ type errorChanStruct struct { err error } +func GetProxiedClient() (*http.Client, error) { + proxyURL := os.Getenv("ALL_PROXY") + if proxyURL == "" { + proxyURL = os.Getenv("HTTPS_PROXY") + } + dialer, err := proxy.SOCKS5("tcp", proxyURL, nil, proxy.Direct) + if err != nil { + return nil, err + } + dialContext := func(ctx context.Context, network, address string) (net.Conn, error) { + return dialer.Dial(network, address) + } + + transport := &http.Transport{ + DialContext: dialContext, + DisableKeepAlives: true, + } + client := &http.Client{Transport: transport} + + return client, nil +} + // OWASP: https://cheatsheetseries.owasp.org/cheatsheets/REST_Security_Cheat_Sheet.html func addSecureHeaders(w *http.ResponseWriter) { (*w).Header().Set("Cache-Control", "no-store") @@ -84,7 +108,7 @@ func addSecureHeaders(w *http.ResponseWriter) { (*w).Header().Set("Access-Control-Allow-Methods", "GET,POST,PUT,DELETE,OPTIONS") } -//binance +// binance func getPriceFromBinance(name, unit string, wg *sync.WaitGroup, priceChan chan<- priceChanStruct, @@ -92,7 +116,7 @@ func getPriceFromBinance(name, unit string, } -//kucoin +// kucoin func getPriceFromKu(name, uni string, wg *sync.WaitGroup, priceChan chan<- priceChanStruct, @@ -111,11 +135,22 @@ func getPriceFromCoinGecko( "vs_currencies=" + url.QueryEscape(unit) path := coingeckoAPIURLv3 + params fmt.Println(path) - resp, err := http.Get(path) + // resp, err := http.Get(path) + client, err := GetProxiedClient() + if err != nil { + priceChan <- priceChanStruct{name: name, price: 0.} + errChan <- errorChanStruct{hasError: true, err: err} + log.Error().Err(err) + return + } + + resp, err := client.Get(path) if err != nil { priceChan <- priceChanStruct{name: name, price: 0.} errChan <- errorChanStruct{hasError: true, err: err} log.Error().Err(err) + fmt.Println(err) + return } defer resp.Body.Close() @@ -152,11 +187,20 @@ func getPriceFromCoinCap( params := "/assets/" + url.QueryEscape(name) path := coincapAPIURLv2 + params fmt.Println(path) - resp, err := http.Get(path) + client, err := GetProxiedClient() + if err != nil { + priceChan <- priceChanStruct{name: name, price: 0.} + errChan <- errorChanStruct{hasError: true, err: err} + log.Error().Err(err) + return + } + // resp, err := http.Get(path) + resp, err := client.Get(path) if err != nil { priceChan <- priceChanStruct{name: name, price: 0.} errChan <- errorChanStruct{hasError: true, err: err} log.Error().Err(err) + return } defer resp.Body.Close() |