From 019f6791895e4e58a26f07ce27b09dd0ec9a483c Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano@smallstep.com>
Date: Fri, 11 Oct 2019 11:25:48 -0700
Subject: [PATCH] Create templates path, and remove unnecessary arguments.

---
 commands/onboard.go |  2 +-
 pki/pki.go          | 40 +++++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/commands/onboard.go b/commands/onboard.go
index cc4a1eef..9f35c993 100644
--- a/commands/onboard.go
+++ b/commands/onboard.go
@@ -162,7 +162,7 @@ func onboardAction(ctx *cli.Context) error {
 }
 
 func onboardPKI(config onboardingConfiguration) (*authority.Config, string, error) {
-	p, err := pki.New(pki.GetPublicPath(), pki.GetSecretsPath(), pki.GetConfigPath())
+	p, err := pki.New()
 	if err != nil {
 		return nil, "", err
 	}
diff --git a/pki/pki.go b/pki/pki.go
index 1896b7b4..7c1aeff8 100644
--- a/pki/pki.go
+++ b/pki/pki.go
@@ -15,8 +15,6 @@ import (
 	"strconv"
 	"strings"
 
-	"golang.org/x/crypto/ssh"
-
 	"github.com/pkg/errors"
 	"github.com/smallstep/certificates/authority"
 	"github.com/smallstep/certificates/authority/provisioner"
@@ -31,6 +29,7 @@ import (
 	"github.com/smallstep/cli/jose"
 	"github.com/smallstep/cli/ui"
 	"github.com/smallstep/cli/utils"
+	"golang.org/x/crypto/ssh"
 )
 
 const (
@@ -46,6 +45,8 @@ const (
 	// DBPath is the directory name under the step path where the private keys
 	// will be stored.
 	dbPath = "db"
+	// templatesPath is the directory to store templates
+	templatesPath = "templates"
 )
 
 // GetDBPath returns the path where the file-system persistence is stored
@@ -84,6 +85,11 @@ func GetOTTKeyPath() string {
 	return filepath.Join(config.StepPath(), privatePath, "ott_key")
 }
 
+// GetTemplatesPath returns the path where the templates are stored.
+func GetTemplatesPath() string {
+	return filepath.Join(config.StepPath(), templatesPath)
+}
+
 // GetProvisioners returns the map of provisioners on the given CA.
 func GetProvisioners(caURL, rootFile string) (provisioner.List, error) {
 	if len(rootFile) == 0 {
@@ -142,21 +148,17 @@ type PKI struct {
 }
 
 // New creates a new PKI configuration.
-func New(public, private, config string) (*PKI, error) {
-	if _, err := os.Stat(public); os.IsNotExist(err) {
-		if err = os.MkdirAll(public, 0700); err != nil {
-			return nil, errs.FileError(err, public)
-		}
-	}
-	if _, err := os.Stat(private); os.IsNotExist(err) {
-		if err = os.MkdirAll(private, 0700); err != nil {
-			return nil, errs.FileError(err, private)
-		}
-	}
-	if len(config) > 0 {
-		if _, err := os.Stat(config); os.IsNotExist(err) {
-			if err = os.MkdirAll(config, 0700); err != nil {
-				return nil, errs.FileError(err, config)
+func New() (*PKI, error) {
+	public := GetPublicPath()
+	private := GetSecretsPath()
+	config := GetConfigPath()
+
+	// Create directories
+	dirs := []string{public, private, config, GetTemplatesPath()}
+	for _, name := range dirs {
+		if _, err := os.Stat(name); os.IsNotExist(err) {
+			if err = os.MkdirAll(name, 0700); err != nil {
+				return nil, errs.FileError(err, name)
 			}
 		}
 	}
@@ -468,7 +470,7 @@ func (p *PKI) Save(opt ...Option) error {
 	if err != nil {
 		return errors.Wrapf(err, "error marshaling %s", p.config)
 	}
-	if err = utils.WriteFile(p.config, b, 0666); err != nil {
+	if err = utils.WriteFile(p.config, b, 0644); err != nil {
 		return errs.FileError(err, p.config)
 	}
 
@@ -497,7 +499,7 @@ func (p *PKI) Save(opt ...Option) error {
 	if err != nil {
 		return errors.Wrapf(err, "error marshaling %s", p.defaults)
 	}
-	if err = utils.WriteFile(p.defaults, b, 0666); err != nil {
+	if err = utils.WriteFile(p.defaults, b, 0644); err != nil {
 		return errs.FileError(err, p.defaults)
 	}