feat: add headerup rule support

scmmishra · Aug 6, 2024 · 8fcf695 · 8fcf695
1 parent cf07378
commit 8fcf695
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -19,10 +19,14 @@ require (
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/gizak/termui/v3 v3.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/mattn/go-runewidth v0.0.2 // indirect
+	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -16,6 +16,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc=
+github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -28,10 +30,16 @@ github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST
 github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
+github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840=
+github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=

diff --git a/internal/caddy/caddy.go b/internal/caddy/caddy.go
@@ -74,6 +74,11 @@ func appendRule(builder *strings.Builder, rule config.Rule, port int) {
 		builder.WriteString(fmt.Sprintf("  tls {\n    %s\n  }\n", newTls))
 	}
 
+	// Add header_up directives
+	for _, header := range rule.HeaderUp {
+		builder.WriteString(fmt.Sprintf("  header_up %s %s\n", header.Name, header.Value))
+	}
+
 	for _, handle := range rule.Handle {
 		builder.WriteString(fmt.Sprintf("  handle %s {\n", handle.Path))
 		for _, directive := range handle.Directives {

diff --git a/internal/caddy/caddy_test.go b/internal/caddy/caddy_test.go
@@ -43,12 +43,18 @@ func TestConvertToCaddyfile(t *testing.T) {
 						To:   "http://localhost:{port}",
 					},
 				},
+				HeaderUp: []config.HeaderUp{
+					{
+						Name:  "X-Real-IP",
+						Value: "{http.request.remote.host}",
+					},
+				},
 			},
 		},
 	}
 
 	caddyfile := ConvertToCaddyfile(caddyCfg, 8080)
-	expectedCaddyfile := "{\n  email [email protected]\n  on_demand_tls {\n    ask https://acme.example.com/directory\n    interval 3600\n    burst 13\n  }\n}\n\nlocalhost {\n  tls {\n    internal\n  }\n  handle / {\n    root * /usr/share/caddy\n  }\n  handle /healthz {\n    respond \"OK\" 200\n  }\n  reverse_proxy / http://localhost:8080\n}\n\n"
+	expectedCaddyfile := "{\n  email [email protected]\n  on_demand_tls {\n    ask https://acme.example.com/directory\n    interval 3600\n    burst 13\n  }\n}\n\nlocalhost {\n  tls {\n    internal\n  }\n  header_up X-Real-IP {http.request.remote.host}\n  handle / {\n    root * /usr/share/caddy\n  }\n  handle /healthz {\n    respond \"OK\" 200\n  }\n  reverse_proxy / http://localhost:8080\n}\n\n"
 	assert.Equal(t, expectedCaddyfile, caddyfile)
 }
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -41,11 +41,17 @@ type Handle struct {
 	Directives []string `yaml:"directives"`
 }
 
+type HeaderUp struct {
+	Name  string `yaml:"name"`
+	Value string `yaml:"value"`
+}
+
 type Rule struct {
 	Match        string         `yaml:"match"`
 	Tls          string         `yaml:"tls"`
 	ReverseProxy []ReverseProxy `yaml:"reverse_proxy"`
 	Handle       []Handle       `yaml:"handle"`
+	HeaderUp     []HeaderUp     `yaml:"header_up"`
 }
 
 type OnDemandTlsConfig struct {