summaryrefslogtreecommitdiffhomepage
path: root/replacer.go
diff options
context:
space:
mode:
authorBill Glover <[email protected]>2020-03-08 21:36:59 +0000
committerGitHub <[email protected]>2020-03-08 15:36:59 -0600
commit36a6c7daf0f45353efe860e254aa148b7574b04e (patch)
tree4f1aefd250dcbef27a060047663da20a48eb8e91 /replacer.go
parentca6e54bbb8ab2bad3cc9192bd4857be7e9501c6c (diff)
downloadcaddy-36a6c7daf0f45353efe860e254aa148b7574b04e.tar.gz
caddy-36a6c7daf0f45353efe860e254aa148b7574b04e.zip
Rework Replacer loop to handle escaped braces (#3121)
Fixes #3116 * Rework Replacer loop to ignore escaped braces * Add benchmark tests for replacer * Optimise handling of escaped braces * Handle escaped closing braces * Remove additional check for closing brace This commit removes the additional check for input in which the closing brace appears before the opening brace. This check has been removed for performance reasons as it is deemed an unlikely edge case. * Check for escaped closing braces in placeholder name
Diffstat (limited to 'replacer.go')
-rw-r--r--replacer.go15
1 files changed, 14 insertions, 1 deletions
diff --git a/replacer.go b/replacer.go
index aad13e2a2..88234046f 100644
--- a/replacer.go
+++ b/replacer.go
@@ -125,6 +125,14 @@ func (r *Replacer) replace(input, empty string,
// iterate the input to find each placeholder
var lastWriteCursor int
for i := 0; i < len(input); i++ {
+
+ // check for escaped braces
+ if i > 0 && input[i-1] == phEscape && (input[i] == phClose || input[i] == phOpen) {
+ sb.WriteString(input[lastWriteCursor : i-1])
+ lastWriteCursor = i
+ continue
+ }
+
if input[i] != phOpen {
continue
}
@@ -135,6 +143,11 @@ func (r *Replacer) replace(input, empty string,
continue
}
+ // if necessary look for the first closing brace that is not escaped
+ for end > 0 && end < len(input)-1 && input[end-1] == phEscape {
+ end = strings.Index(input[end+1:], string(phClose)) + end + 1
+ }
+
// write the substring from the last cursor to this point
sb.WriteString(input[lastWriteCursor:i])
@@ -237,4 +250,4 @@ var nowFunc = time.Now
// ReplacerCtxKey is the context key for a replacer.
const ReplacerCtxKey CtxKey = "replacer"
-const phOpen, phClose = '{', '}'
+const phOpen, phClose, phEscape = '{', '}', '\\'