caddytls: Run the replacer on automation policy subjects #5459
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I confirmed this fixes the case of |
mholt
reviewed
Mar 27, 2023
Comment on lines
+157
to
+163
| // replace placeholders in subjects to allow environment variables | ||
| repl := caddy.NewReplacer() | ||
| subjects := make([]string, len(ap.SubjectsRaw)) | ||
| for i, sub := range ap.SubjectsRaw { | ||
| subjects[i] = repl.ReplaceAll(sub, "") | ||
| } | ||
| ap.subjects = subjects |
There was a problem hiding this comment.
Would it work if we just replace the subjects in-place? 🤔
There was a problem hiding this comment.
No because then if you do curl localhost:2019/config/ you get a config without the placeholders in it (I think).
mholt
approved these changes
Mar 27, 2023
Also renamed the field to SubjectsRaw, which can be considered a breaking change but I don't expect this to affect much.
francislavoie
force-pushed
the
repl-tls-subjects
branch
from
5ccb00f
to
13cd375
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also renamed the field to SubjectsRaw, which can be considered a breaking change but I don't expect this to affect much.
This has come up semi-frequently. I think it's fine to support
{env.DOMAIN}for subjects. I'm not 100% sure if this will work in all the cases we expect it to, but it should at least be better supported than before.