github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stack): Skip SSL Verification (#3064) 

* fix(stack): Skip SSL Verification

* fix(stack): Skip SSL Verification

* fix(stack): move httpsCli into service

* fix(stack): clean-up

* fix(stack): move httpsCli back into the function

* fix(stack): move httpsCli and InstallProtocol back into service

* fix(stack): clean-up debugging

* fix(stack): parameter cleanup

Co-Authored-By: Anthony Lapenna <anthony.lapenna@portainer.io>
pull/3148/head
Steven Kang 2019-09-10 10:56:16 +12:00 committed by Anthony Lapenna
parent 628d4960cc
commit ec19faaa24
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/cmd/portainer/main.go
View File

@ -102,7 +102,7 @@ func initLDAPService() portainer.LDAPService {
} }
func initGitService() portainer.GitService { func initGitService() portainer.GitService {
return &git.Service{} return git.NewService()
} }
func initClientFactory(signatureService portainer.DigitalSignatureService, reverseTunnelService portainer.ReverseTunnelService) *docker.ClientFactory { func initClientFactory(signatureService portainer.DigitalSignatureService, reverseTunnelService portainer.ReverseTunnelService) *docker.ClientFactory {

26
api/git/git.go
View File

@ -1,21 +1,37 @@
package git package git
import ( import (
"crypto/tls"
"net/http"
"net/url" "net/url"
"strings" "strings"
"time"
"gopkg.in/src-d/go-git.v4" "gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/transport/client"
githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
) )
// Service represents a service for managing Git. // Service represents a service for managing Git.
type Service struct{} type Service struct {
httpsCli *http.Client
}
// NewService initializes a new service. // NewService initializes a new service.
func NewService(dataStorePath string) (*Service, error) { func NewService() *Service {
service := &Service{} httpsCli := &http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
},
Timeout: 300 * time.Second,
}
return service, nil client.InstallProtocol("https", githttp.NewClient(httpsCli))
return &Service{
httpsCli: httpsCli,
}
} }
// ClonePublicRepository clones a public git repository using the specified URL in the specified // ClonePublicRepository clones a public git repository using the specified URL in the specified
@ -32,7 +48,7 @@ func (service *Service) ClonePrivateRepositoryWithBasicAuth(repositoryURL, refer
return cloneRepository(repositoryURL, referenceName, destination) return cloneRepository(repositoryURL, referenceName, destination)
} }
func cloneRepository(repositoryURL, referenceName string, destination string) error { func cloneRepository(repositoryURL, referenceName, destination string) error {
options := &git.CloneOptions{ options := &git.CloneOptions{
URL: repositoryURL, URL: repositoryURL,
} }