summaryrefslogtreecommitdiff
path: root/go/internal/config/httpclient.go
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2019-04-25 10:19:34 +0300
committerIgor Drozdov <idrozdov@gitlab.com>2019-05-01 14:51:39 +0300
commit8886eb709e290baa6f526dffffe8de9bd4badbbb (patch)
tree8201cdfb5e9d51bc73c99c6a4181d30fa03ad1ac /go/internal/config/httpclient.go
parent344cc6b443e08ec5648fcf8a3035e46bb404fd6a (diff)
downloadgitlab-shell-id-api-https.tar.gz
Support calling internal API using HTTPSid-api-https
Diffstat (limited to 'go/internal/config/httpclient.go')
-rw-r--r--go/internal/config/httpclient.go58
1 files changed, 53 insertions, 5 deletions
diff --git a/go/internal/config/httpclient.go b/go/internal/config/httpclient.go
index 82807a6..c71efad 100644
--- a/go/internal/config/httpclient.go
+++ b/go/internal/config/httpclient.go
@@ -2,16 +2,21 @@ package config
import (
"context"
+ "crypto/tls"
+ "crypto/x509"
+ "io/ioutil"
"net"
"net/http"
+ "path/filepath"
"strings"
"time"
)
const (
socketBaseUrl = "http://unix"
- UnixSocketProtocol = "http+unix://"
- HttpProtocol = "http://"
+ unixSocketProtocol = "http+unix://"
+ httpProtocol = "http://"
+ httpsProtocol = "https://"
defaultReadTimeoutSeconds = 300
)
@@ -27,10 +32,12 @@ func (c *Config) GetHttpClient() *HttpClient {
var transport *http.Transport
var host string
- if strings.HasPrefix(c.GitlabUrl, UnixSocketProtocol) {
+ if strings.HasPrefix(c.GitlabUrl, unixSocketProtocol) {
transport, host = c.buildSocketTransport()
- } else if strings.HasPrefix(c.GitlabUrl, HttpProtocol) {
+ } else if strings.HasPrefix(c.GitlabUrl, httpProtocol) {
transport, host = c.buildHttpTransport()
+ } else if strings.HasPrefix(c.GitlabUrl, httpsProtocol) {
+ transport, host = c.buildHttpsTransport()
} else {
return nil
}
@@ -48,7 +55,7 @@ func (c *Config) GetHttpClient() *HttpClient {
}
func (c *Config) buildSocketTransport() (*http.Transport, string) {
- socketPath := strings.TrimPrefix(c.GitlabUrl, UnixSocketProtocol)
+ socketPath := strings.TrimPrefix(c.GitlabUrl, unixSocketProtocol)
transport := &http.Transport{
DialContext: func(ctx context.Context, _, _ string) (net.Conn, error) {
dialer := net.Dialer{}
@@ -59,6 +66,47 @@ func (c *Config) buildSocketTransport() (*http.Transport, string) {
return transport, socketBaseUrl
}
+func (c *Config) buildHttpsTransport() (*http.Transport, string) {
+ certPool, err := x509.SystemCertPool()
+
+ if err != nil {
+ certPool = x509.NewCertPool()
+ }
+
+ caFile := c.HttpSettings.CaFile
+ if caFile != "" {
+ addCertToPool(certPool, caFile)
+ }
+
+ caPath := c.HttpSettings.CaPath
+ if caPath != "" {
+ fis, _ := ioutil.ReadDir(caPath)
+ for _, fi := range fis {
+ if fi.IsDir() {
+ continue
+ }
+
+ addCertToPool(certPool, filepath.Join(caPath, fi.Name()))
+ }
+ }
+
+ transport := &http.Transport{
+ TLSClientConfig: &tls.Config{
+ RootCAs: certPool,
+ InsecureSkipVerify: c.HttpSettings.SelfSignedCert,
+ },
+ }
+
+ return transport, c.GitlabUrl
+}
+
+func addCertToPool(certPool *x509.CertPool, fileName string) {
+ cert, err := ioutil.ReadFile(fileName)
+ if err == nil {
+ certPool.AppendCertsFromPEM(cert)
+ }
+}
+
func (c *Config) buildHttpTransport() (*http.Transport, string) {
return &http.Transport{}, c.GitlabUrl
}