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

Jump to bottom

chore: Simplified GetRepoHTTPClient function #9396

Merged
merged 2 commits into from
May 25, 2022
Merged

chore: Simplified GetRepoHTTPClient function #9396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5848b81
chore: Simplified GetRepoHTTPClient function
ls0f May 13, 2022
e86df18
simplified code and improve unit test coverage
ls0f May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 22 additions & 38 deletions util/git/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,46 +203,30 @@ func GetRepoHTTPClient(repoURL string, insecure bool, creds Creds, proxyURL stri

return &cert, nil
}

transport := &http.Transport{
Proxy: proxyFunc,
TLSClientConfig: &tls.Config{
GetClientCertificate: clientCertFunc,
},
DisableKeepAlives: true,
}
customHTTPClient.Transport = transport
if insecure {
customHTTPClient.Transport = &http.Transport{
Proxy: proxyFunc,
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
GetClientCertificate: clientCertFunc,
},
DisableKeepAlives: true,
}
} else {
parsedURL, err := url.Parse(repoURL)
if err != nil {
return customHTTPClient
}
serverCertificatePem, err := certutil.GetCertificateForConnect(parsedURL.Host)
if err != nil {
return customHTTPClient
} else if len(serverCertificatePem) > 0 {
certPool := certutil.GetCertPoolFromPEMData(serverCertificatePem)
customHTTPClient.Transport = &http.Transport{
Proxy: proxyFunc,
TLSClientConfig: &tls.Config{
RootCAs: certPool,
GetClientCertificate: clientCertFunc,
},
DisableKeepAlives: true,
}
} else {
// else no custom certificate stored.
customHTTPClient.Transport = &http.Transport{
Proxy: proxyFunc,
TLSClientConfig: &tls.Config{
GetClientCertificate: clientCertFunc,
},
DisableKeepAlives: true,
}
}
transport.TLSClientConfig.InsecureSkipVerify = true
crenshaw-dev marked this conversation as resolved.
Show resolved Hide resolved
return customHTTPClient
}
parsedURL, err := url.Parse(repoURL)
if err != nil {
return customHTTPClient
}
serverCertificatePem, err := certutil.GetCertificateForConnect(parsedURL.Host)
if err != nil {
return customHTTPClient
}
if len(serverCertificatePem) > 0 {
certPool := certutil.GetCertPoolFromPEMData(serverCertificatePem)
transport.TLSClientConfig.RootCAs = certPool
}

return customHTTPClient
}

Expand Down
55 changes: 37 additions & 18 deletions util/git/git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/argoproj/argo-cd/v2/common"
"github.com/argoproj/argo-cd/v2/test/fixture/log"
"github.com/argoproj/argo-cd/v2/test/fixture/path"
"github.com/argoproj/argo-cd/v2/test/fixture/test"
Expand Down Expand Up @@ -151,22 +152,22 @@ func TestCustomHTTPClient(t *testing.T) {
assert.NotNil(t, client)
assert.NotNil(t, client.Transport)
if client.Transport != nil {
httpClient := client.Transport.(*http.Transport)
assert.NotNil(t, httpClient.TLSClientConfig)

assert.Equal(t, false, httpClient.TLSClientConfig.InsecureSkipVerify)

assert.NotNil(t, httpClient.TLSClientConfig.GetClientCertificate)
if httpClient.TLSClientConfig.GetClientCertificate != nil {
cert, err := httpClient.TLSClientConfig.GetClientCertificate(nil)
transport := client.Transport.(*http.Transport)
assert.NotNil(t, transport.TLSClientConfig)
assert.Equal(t, true, transport.DisableKeepAlives)
assert.Equal(t, false, transport.TLSClientConfig.InsecureSkipVerify)
assert.NotNil(t, transport.TLSClientConfig.GetClientCertificate)
assert.Nil(t, transport.TLSClientConfig.RootCAs)
if transport.TLSClientConfig.GetClientCertificate != nil {
cert, err := transport.TLSClientConfig.GetClientCertificate(nil)
assert.NoError(t, err)
if err == nil {
assert.NotNil(t, cert)
assert.NotEqual(t, 0, len(cert.Certificate))
assert.NotNil(t, cert.PrivateKey)
}
}
proxy, err := httpClient.Proxy(nil)
proxy, err := transport.Proxy(nil)
assert.Nil(t, err)
assert.Equal(t, "http://proxy:5000", proxy.String())
}
Expand All @@ -182,14 +183,14 @@ func TestCustomHTTPClient(t *testing.T) {
assert.NotNil(t, client)
assert.NotNil(t, client.Transport)
if client.Transport != nil {
httpClient := client.Transport.(*http.Transport)
assert.NotNil(t, httpClient.TLSClientConfig)

assert.Equal(t, true, httpClient.TLSClientConfig.InsecureSkipVerify)

assert.NotNil(t, httpClient.TLSClientConfig.GetClientCertificate)
if httpClient.TLSClientConfig.GetClientCertificate != nil {
cert, err := httpClient.TLSClientConfig.GetClientCertificate(nil)
transport := client.Transport.(*http.Transport)
assert.NotNil(t, transport.TLSClientConfig)
assert.Equal(t, true, transport.DisableKeepAlives)
assert.Equal(t, true, transport.TLSClientConfig.InsecureSkipVerify)
assert.NotNil(t, transport.TLSClientConfig.GetClientCertificate)
assert.Nil(t, transport.TLSClientConfig.RootCAs)
if transport.TLSClientConfig.GetClientCertificate != nil {
cert, err := transport.TLSClientConfig.GetClientCertificate(nil)
assert.NoError(t, err)
if err == nil {
assert.NotNil(t, cert)
Expand All @@ -199,10 +200,28 @@ func TestCustomHTTPClient(t *testing.T) {
}
req, err := http.NewRequest("GET", "http://proxy-from-env:7878", nil)
assert.Nil(t, err)
proxy, err := httpClient.Proxy(req)
proxy, err := transport.Proxy(req)
assert.Nil(t, err)
assert.Equal(t, "http://proxy-from-env:7878", proxy.String())
}
// GetRepoHTTPClient with root ca
cert, err := ioutil.ReadFile("../../test/fixture/certs/argocd-test-server.crt")
assert.NoError(t, err)
temppath := t.TempDir()
defer os.RemoveAll(temppath)
err = ioutil.WriteFile(filepath.Join(temppath, "127.0.0.1"), cert, 0666)
assert.NoError(t, err)
os.Setenv(common.EnvVarTLSDataPath, temppath)
client = GetRepoHTTPClient("https://127.0.0.1", false, creds, "")
assert.NotNil(t, client)
assert.NotNil(t, client.Transport)
if client.Transport != nil {
transport := client.Transport.(*http.Transport)
assert.NotNil(t, transport.TLSClientConfig)
assert.Equal(t, true, transport.DisableKeepAlives)
assert.Equal(t, false, transport.TLSClientConfig.InsecureSkipVerify)
assert.NotNil(t, transport.TLSClientConfig.RootCAs)
}
}

func TestLsRemote(t *testing.T) {
Expand Down