summaryrefslogtreecommitdiffhomepage
path: root/caddytest
diff options
context:
space:
mode:
authorMatt Holt <[email protected]>2020-10-28 20:36:00 -0600
committerGitHub <[email protected]>2020-10-28 20:36:00 -0600
commitdb4f1c02772dfd1f50bd745b322be1b60c72ac41 (patch)
tree2658205ada92a332822aa78f88d69a0fe9120453 /caddytest
parentb6e96d6f4a55f96ccbb69f112822f0a923942246 (diff)
downloadcaddy-db4f1c02772dfd1f50bd745b322be1b60c72ac41.tar.gz
caddy-db4f1c02772dfd1f50bd745b322be1b60c72ac41.zip
httpcaddyfile: Revise automation policy generation (#3824)
* httpcaddyfile: Revise automation policy generation This should fix a frustrating edge case where wildcard subjects are used, which potentially get shadowed by more specific versions of themselves; see the new tests for an example. This change is motivated by an actual customer requirement. Although all the tests pass, this logic is incredibly complex and nuanced, and I'm worried it is not correct. But it took me about 4 days to get this far on a solution. I did my best. * Fix typo
Diffstat (limited to 'caddytest')
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_automation_policies.txt80
1 files changed, 80 insertions, 0 deletions
diff --git a/caddytest/integration/caddyfile_adapt/tls_automation_policies.txt b/caddytest/integration/caddyfile_adapt/tls_automation_policies.txt
new file mode 100644
index 000000000..0a90e4a1a
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/tls_automation_policies.txt
@@ -0,0 +1,80 @@
+{
+ local_certs
+}
+
+*.tld, *.*.tld {
+ tls {
+ on_demand
+ }
+}
+
+foo.tld, www.foo.tld {
+}
+----------
+{
+ "apps": {
+ "http": {
+ "servers": {
+ "srv0": {
+ "listen": [
+ ":443"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "host": [
+ "foo.tld",
+ "www.foo.tld"
+ ]
+ }
+ ],
+ "terminal": true
+ },
+ {
+ "match": [
+ {
+ "host": [
+ "*.tld",
+ "*.*.tld"
+ ]
+ }
+ ],
+ "terminal": true
+ }
+ ]
+ }
+ }
+ },
+ "tls": {
+ "automation": {
+ "policies": [
+ {
+ "subjects": [
+ "foo.tld",
+ "www.foo.tld"
+ ],
+ "issuer": {
+ "module": "internal"
+ }
+ },
+ {
+ "subjects": [
+ "*.*.tld",
+ "*.tld"
+ ],
+ "issuer": {
+ "module": "internal"
+ },
+ "on_demand": true
+ },
+ {
+ "issuer": {
+ "module": "internal"
+ }
+ }
+ ]
+ }
+ }
+ }
+} \ No newline at end of file