alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Add ca.WithInsecure and use methods for file names

Browse source
This commit is contained in:
max furman 2021-10-28 23:58:18 -07:00
parent e5951fd84c
commit d777fc23c2
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ca/client.go
View file

@ -226,7 +226,7 @@ func (o *clientOptions) getTransport(endpoint string) (tr http.RoundTripper, err
return tr, nil
}
// WithTransport adds a custom transport to the Client. It will fail if a
// WithTransport adds a custom transport to the Client. It will fail if a
// previous option to create the transport has been configured.
func WithTransport(tr http.RoundTripper) ClientOption {
return func(o *clientOptions) error {
@ -238,6 +238,17 @@ func WithTransport(tr http.RoundTripper) ClientOption {
}
}
// WithInsecure adds a insecure transport that bypasses TLS verification.
func WithInsecure() ClientOption {
return func(o *clientOptions) error {
o.transport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
return nil
}
}
// WithRootFile will create the transport using the given root certificate. It
// will fail if a previous option to create the transport has been configured.
func WithRootFile(filename string) ClientOption {

4
ca/identity/identity.go
View file

@ -72,11 +72,11 @@ func LoadDefaultIdentity() (*Identity, error) {
}
func profileConfigDir() string {
return filepath.Join(step.ProfilePath(), "config")
return filepath.Join(step.Path(), "config")
}
func profileIdentityDir() string {
return filepath.Join(step.ProfilePath(), "identity")
return filepath.Join(step.Path(), "identity")
}
// WriteDefaultIdentity writes the given certificates and key and the

7
pki/pki.go
View file

@ -376,15 +376,12 @@ func New(o apiv1.Options, opts ...Option) (*PKI, error) {
}
// Create profile directory and stub for default profile configuration.
if currentCtx := step.GetCurrentContext(); currentCtx != nil {
if currentCtx := step.Contexts().GetCurrent(); currentCtx != nil {
profile := GetProfileConfigPath()
if err := os.MkdirAll(profile, 0700); err != nil {
return nil, errs.FileError(err, profile)
}
if p.profileDefaults, err = getPath(profile, "defaults.json"); err != nil {
return nil, err
}
if err := ioutil.WriteFile(p.profileDefaults,
if err := ioutil.WriteFile(step.ProfileDefaultsFile(),
[]byte("{}"), 0600); err != nil {
return nil, err
}