Skip to content

Support escaping dots in label keys with \. #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucaslorentz merged 1 commit into from
Mar 12, 2026
Merged

Support escaping dots in label keys with \. #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion caddyfile/fromlabels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ import (
"math"
"regexp"
"strconv"
"strings"
"text/template"
)

var whitespaceRegex = regexp.MustCompile("\\s+")
var labelParserRegex = regexp.MustCompile(`^(?:(.+)\.)?(?:(\d+)_)?([^.]+?)(?:_(\d+))?$`)

const escapedDotPlaceholder = "\x00"

// FromLabels converts key value labels into a caddyfile
func FromLabels(labels map[string]string, templateData interface{}, templateFuncs template.FuncMap) (*Container, error) {
container := CreateContainer()
Expand All @@ -37,7 +40,9 @@ func getOrCreateBlock(container *Container, path string, blocksByPath map[string
return block
}

parentPath, order, name := parsePath(path)
parentPath, order, name := parsePath(strings.ReplaceAll(path, `\.`, escapedDotPlaceholder))
parentPath = strings.ReplaceAll(parentPath, escapedDotPlaceholder, `\.`)
name = strings.ReplaceAll(name, escapedDotPlaceholder, ".")

block := CreateBlock()
block.Order = order
Expand Down
22 changes: 22 additions & 0 deletions caddyfile/testdata/labels/escaped_dots.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
caddy = (extendable-proxy)
caddy.reverse_proxy.{blocks\.proxy_target} =
caddy.reverse_proxy.{blocks\.proxy_options} =

caddy_1 = localhost
caddy_1.dynamic_dns.provider = cloudflare token123
caddy_1.dynamic_dns.domains.mydomain\.fr =
----------
(extendable-proxy) {
reverse_proxy {
{blocks.proxy_options}
{blocks.proxy_target}
}
}
localhost {
dynamic_dns {
domains {
mydomain.fr
}
provider cloudflare token123
}
}
Loading