Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

add support for env proxying when using HTTPS with custom CAs #9

Merged
merged 1 commit into from
Nov 23, 2022
Merged
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
35 changes: 25 additions & 10 deletions plumbing/transport/client/client.go
Original file line number Diff line number Diff line change
@@ -6,7 +6,9 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"net"
gohttp "net/http"
"time"

"github.com/fluxcd/go-git/v5/plumbing/transport"
"github.com/fluxcd/go-git/v5/plumbing/transport/file"
@@ -24,12 +26,25 @@ var Protocols = map[string]transport.Transport{
"file": file.DefaultClient,
}

var dialer = net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}

func defaultTransport() *gohttp.Transport {
t := gohttp.DefaultTransport.(*gohttp.Transport).Clone()
if t.TLSClientConfig != nil {
t.TLSClientConfig = &tls.Config{}
}
return t
}

var insecureClient = http.NewClient(&gohttp.Client{
Transport: &gohttp.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
},
Transport: func() *gohttp.Transport {
t := defaultTransport()
t.TLSClientConfig.InsecureSkipVerify = true
return t
}(),
})

// InstallProtocol adds or modifies an existing protocol.
@@ -62,11 +77,11 @@ func getTransport(endpoint *transport.Endpoint) (transport.Transport, error) {
}
rootCAs.AppendCertsFromPEM(endpoint.CaBundle)
return http.NewClient(&gohttp.Client{
Transport: &gohttp.Transport{
TLSClientConfig: &tls.Config{
RootCAs: rootCAs,
},
},
Transport: func() *gohttp.Transport {
t := defaultTransport()
t.TLSClientConfig.RootCAs = rootCAs
return t
}(),
}), nil
}
}