Skip to content

Commit a7dfa58

Browse files
git001git001
committed
Add Debug output of args replacement
1 parent f98ab3d commit a7dfa58

File tree

4 files changed

+80
-7
lines changed

4 files changed

+80
-7
lines changed

‎caddyfile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func parseGlobalCaddyfileBlock(d *caddyfile.Dispenser, prev interface{}) (interf
105105
//
106106
func (c *Cmd) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
107107
// consume "exec", then grab the command, if present.
108-
if d.NextArg() && d.NextArg() {
108+
if d.NextArg() {
109109
c.Command = d.Val()
110110
}
111111

‎go.mod

+74-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,80 @@
1-
module github.com/abiosoft/caddy-exec
1+
module github.com/git001/caddy-exec
22

3-
go 1.14
3+
go 1.18
44

55
require (
66
github.com/caddyserver/caddy/v2 v2.4.1
77
go.uber.org/zap v1.16.0
88
)
9+
10+
require (
11+
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 // indirect
12+
github.com/DataDog/zstd v1.4.1 // indirect
13+
github.com/Masterminds/goutils v1.1.0 // indirect
14+
github.com/Masterminds/semver/v3 v3.1.0 // indirect
15+
github.com/Masterminds/sprig/v3 v3.1.0 // indirect
16+
github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f // indirect
17+
github.com/beorn7/perks v1.0.1 // indirect
18+
github.com/caddyserver/certmagic v0.13.1 // indirect
19+
github.com/cespare/xxhash v1.1.0 // indirect
20+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
21+
github.com/cheekybits/genny v1.0.0 // indirect
22+
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
23+
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
24+
github.com/dgraph-io/badger v1.5.3 // indirect
25+
github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20200413122845-09dd2e1a4195 // indirect
26+
github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3 // indirect
27+
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
28+
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
29+
github.com/go-sql-driver/mysql v1.5.0 // indirect
30+
github.com/golang/protobuf v1.4.3 // indirect
31+
github.com/golang/snappy v0.0.1 // indirect
32+
github.com/google/cel-go v0.6.0 // indirect
33+
github.com/google/uuid v1.2.0 // indirect
34+
github.com/huandu/xstrings v1.3.1 // indirect
35+
github.com/imdario/mergo v0.3.8 // indirect
36+
github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect
37+
github.com/klauspost/cpuid/v2 v2.0.6 // indirect
38+
github.com/libdns/libdns v0.2.0 // indirect
39+
github.com/lucas-clemente/quic-go v0.20.1 // indirect
40+
github.com/lunixbochs/vtclean v1.0.0 // indirect
41+
github.com/manifoldco/promptui v0.3.1 // indirect
42+
github.com/marten-seemann/qpack v0.2.1 // indirect
43+
github.com/marten-seemann/qtls-go1-15 v0.1.4 // indirect
44+
github.com/marten-seemann/qtls-go1-16 v0.1.3 // indirect
45+
github.com/mattn/go-colorable v0.1.6 // indirect
46+
github.com/mattn/go-isatty v0.0.12 // indirect
47+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
48+
github.com/mholt/acmez v0.1.3 // indirect
49+
github.com/miekg/dns v1.1.30 // indirect
50+
github.com/mitchellh/copystructure v1.0.0 // indirect
51+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
52+
github.com/pkg/errors v0.9.1 // indirect
53+
github.com/prometheus/client_golang v1.9.0 // indirect
54+
github.com/prometheus/client_model v0.2.0 // indirect
55+
github.com/prometheus/common v0.15.0 // indirect
56+
github.com/prometheus/procfs v0.2.0 // indirect
57+
github.com/russross/blackfriday/v2 v2.0.1 // indirect
58+
github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189 // indirect
59+
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
60+
github.com/smallstep/certificates v0.15.4 // indirect
61+
github.com/smallstep/cli v0.15.2 // indirect
62+
github.com/smallstep/nosql v0.3.0 // indirect
63+
github.com/smallstep/truststore v0.9.6 // indirect
64+
github.com/spf13/cast v1.3.1 // indirect
65+
github.com/urfave/cli v1.22.2 // indirect
66+
go.etcd.io/bbolt v1.3.3 // indirect
67+
go.step.sm/crypto v0.6.0 // indirect
68+
go.uber.org/atomic v1.6.0 // indirect
69+
go.uber.org/multierr v1.5.0 // indirect
70+
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
71+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
72+
golang.org/x/sys v0.0.0-20201231184435-2d18734c6014 // indirect
73+
golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect
74+
golang.org/x/text v0.3.3 // indirect
75+
google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98 // indirect
76+
google.golang.org/grpc v1.27.1 // indirect
77+
google.golang.org/protobuf v1.24.0 // indirect
78+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
79+
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
80+
)

‎go.sum

-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go
3434
github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic=
3535
github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
3636
github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
37-
github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
3837
github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
3938
github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
4039
github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
@@ -133,7 +132,6 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
133132
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
134133
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
135134
github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
136-
github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
137135
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
138136
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
139137
github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
@@ -388,7 +386,6 @@ github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
388386
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
389387
github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
390388
github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
391-
github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE=
392389
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
393390
github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
394391
github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
@@ -593,7 +590,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
593590
github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
594591
github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
595592
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
596-
github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
597593
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
598594
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
599595
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

‎middleware.go

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/caddyserver/caddy/v2"
88
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
9+
"go.uber.org/zap"
910
)
1011

1112
var (
@@ -49,6 +50,10 @@ func (m Middleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy
4950

5051
for index, argument := range m.Args {
5152
m.Args[index] = repl.ReplaceAll(argument, "")
53+
m.Cmd.log.Debug("Replace Argument",
54+
zap.String("argument orig", argument),
55+
zap.String("argument repl", m.Args[index]),
56+
)
5257
}
5358

5459
err := m.run()

0 commit comments

Comments
 (0)