@@ -6,11 +6,14 @@ import (
6
6
"bufio"
7
7
"context"
8
8
"fmt"
9
- "golang.org/x/net/proxy"
10
9
"net"
11
10
"net/http"
12
11
"net/url"
13
12
"os"
13
+
14
+ "github.com/kubescape/go-logger"
15
+ "github.com/kubescape/go-logger/helpers"
16
+ "golang.org/x/net/proxy"
14
17
)
15
18
16
19
type direct struct {}
@@ -35,10 +38,12 @@ func newHTTPProxy(uri *url.URL, forward proxy.Dialer) (proxy.Dialer, error) {
35
38
s := new (httpProxy )
36
39
s .host = uri .Host
37
40
s .forward = forward
41
+ logger .L ().Info ("setting proxy" , helpers .String ("scheme" , uri .Scheme ), helpers .String ("host" , s .host ))
38
42
if uri .User != nil {
39
43
s .haveAuth = true
40
44
s .username = uri .User .Username ()
41
45
s .password , _ = uri .User .Password ()
46
+ logger .L ().Info ("setting basic auth for proxy" , helpers .String ("username" , s .username ), helpers .Int ("len(password)" , len (s .password )))
42
47
}
43
48
44
49
return s , nil
@@ -107,19 +112,21 @@ func GetDialer() func(context.Context, string, string) (net.Conn, error) {
107
112
for _ , envVar := range envVars {
108
113
if httpProxy := os .Getenv (envVar ); httpProxy != "" {
109
114
uri , err := url .Parse (httpProxy )
110
- if err = = nil {
111
- proxyURI = uri
115
+ if err ! = nil {
116
+ logger . L (). Fatal ( "failed to parse proxy URI" , helpers . Error ( err ))
112
117
}
118
+ proxyURI = uri
113
119
}
114
120
}
115
121
// default proxy net dial
116
122
proxyNetDial := proxy .FromEnvironment ()
117
123
// if custom URI is defined, generate proxy net dial from that
118
124
if proxyURI != nil {
119
125
dial , err := proxy .FromURL (proxyURI , Direct )
120
- if err = = nil {
121
- proxyNetDial = dial
126
+ if err ! = nil {
127
+ logger . L (). Fatal ( "failed to create proxy dialer" , helpers . Error ( err ))
122
128
}
129
+ proxyNetDial = dial
123
130
}
124
131
// return dialer as a net.DialContext function
125
132
return func (ctx context.Context , a , b string ) (net.Conn , error ) {
0 commit comments