Skip to content

Commit fa8fbbf

Browse files
authored
feat: allow template execution to be disabled via env var (resolves #540)
1 parent 92dd7ad commit fa8fbbf

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ The following environment variables can be set up to control which environment a
112112
| EPCC_CLIENT_SECRET | This is the Client Secret which can be retrieved via CM. |
113113
| EPCC_PROFILE | A profile name that allows for an independent session and isolation (e.g., distinct histories). |
114114
| EPCC_RUNBOOK_DIRECTORY | A directory that will be scanned for runbook, a runbook ends with `.epcc.yml`. |
115-
| EPCC_DISABLE_LEGACY_RESOURCES | If set disables legacy endpoints from being available. |
115+
| EPCC_DISABLE_LEGACY_RESOURCES | If set disables legacy endpoints from being available. |
116+
| EPCC_CLI_DISABLE_TEMPLATE_EXECUTION | If set to true, `epcc` will not render templates in variabes (i.e., `{{` will be treated literally), recommended when input might be untrusted. |
116117

117118
It is recommended to set EPCC_API_BASE_URL, EPCC_CLIENT_ID, and EPCC_CLIENT_SECRET to be able to interact with most things in the CLI.
118119

cmd/root.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,16 @@ Environment Variables
220220
- EPCC_BETA_API_FEATURES - Beta features in the API we want to enable.
221221
- EPCC_CLI_HTTP_HEADER_[0,1,...] - An additional HTTP header to set with all requests, the format should be "HeaderName: value"
222222
- EPCC_PROFILE - The name of the profile we will use (isolates namespace, credentials, etc...)
223-
223+
- EPCC_CLI_DISABLE_TLS_VERIFICATION - Disables TLS verification
224+
- EPCC_RUNBOOK_DIRECTORY - Directory to scan for additional runbooks
225+
- EPCC_CLI_DISABLE_TEMPLATE_EXECUTION - Disables template execution (recommended if input is untrusted).
224226
`,
225227
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
226228
log.SetLevel(logger.Loglevel)
227229

228-
env := config.GetEnv()
229-
if env.EPCC_RATE_LIMIT != 0 {
230-
rateLimit = env.EPCC_RATE_LIMIT
230+
e := config.GetEnv()
231+
if e.EPCC_RATE_LIMIT != 0 {
232+
rateLimit = e.EPCC_RATE_LIMIT
231233
}
232234
authentication.Initialize()
233235

config/config.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package config
33
import "sync/atomic"
44

55
type Env struct {
6-
EPCC_API_BASE_URL string `env:"EPCC_API_BASE_URL"`
7-
EPCC_CLIENT_ID string `env:"EPCC_CLIENT_ID"`
8-
EPCC_CLIENT_SECRET string `env:"EPCC_CLIENT_SECRET"`
9-
EPCC_BETA_API_FEATURES string `env:"EPCC_BETA_API_FEATURES"`
10-
EPCC_RATE_LIMIT uint16 `env:"EPCC_RATE_LIMIT"`
11-
EPCC_CLI_SUPPRESS_NO_AUTH_MESSAGES bool `env:"EPCC_CLI_SUPPRESS_NO_AUTH_MESSAGES"`
12-
EPCC_RUNBOOK_DIRECTORY string `env:"EPCC_RUNBOOK_DIRECTORY"`
13-
EPCC_DISABLE_LEGACY_RESOURCES bool `env:"EPCC_DISABLE_LEGACY_RESOURCES"`
6+
EPCC_API_BASE_URL string `env:"EPCC_API_BASE_URL"`
7+
EPCC_CLIENT_ID string `env:"EPCC_CLIENT_ID"`
8+
EPCC_CLIENT_SECRET string `env:"EPCC_CLIENT_SECRET"`
9+
EPCC_BETA_API_FEATURES string `env:"EPCC_BETA_API_FEATURES"`
10+
EPCC_RATE_LIMIT uint16 `env:"EPCC_RATE_LIMIT"`
11+
EPCC_CLI_SUPPRESS_NO_AUTH_MESSAGES bool `env:"EPCC_CLI_SUPPRESS_NO_AUTH_MESSAGES"`
12+
EPCC_RUNBOOK_DIRECTORY string `env:"EPCC_RUNBOOK_DIRECTORY"`
13+
EPCC_DISABLE_LEGACY_RESOURCES bool `env:"EPCC_DISABLE_LEGACY_RESOURCES"`
14+
EPCC_CLI_DISABLE_TEMPLATE_EXECUTION bool `env:"EPCC_CLI_DISABLE_TEMPLATE_EXECUTION"`
1415
}
1516

1617
var env = atomic.Pointer[Env]{}

external/templates/template.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package templates
33
import (
44
"bytes"
55
"github.com/Masterminds/sprig/v3"
6+
"github.com/elasticpath/epcc-cli/config"
67
log "github.com/sirupsen/logrus"
78
"strings"
89
"text/template"
@@ -13,6 +14,10 @@ func init() {
1314
}
1415
func Render(templateString string) string {
1516

17+
if config.GetEnv().EPCC_CLI_DISABLE_TEMPLATE_EXECUTION {
18+
return templateString
19+
}
20+
1621
if !strings.Contains(templateString, "{{") {
1722
return templateString
1823
}

0 commit comments

Comments
 (0)