Browse Source

rewrite: Add `method` Caddyfile directive (#4528)

master
Francis Lavoie 3 years ago
committed by GitHub
parent
commit
bcb7a19cd3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      caddyconfig/httpcaddyfile/directives.go
  2. 27
      caddytest/integration/caddyfile_adapt/method_directive.txt
  3. 19
      modules/caddyhttp/rewrite/caddyfile.go

3
caddyconfig/httpcaddyfile/directives.go

@ -45,7 +45,8 @@ var directiveOrder = []string{
"redir",
// URI manipulation
// incoming request manipulation
"method",
"rewrite",
"uri",
"try_files",

27
caddytest/integration/caddyfile_adapt/method_directive.txt

@ -0,0 +1,27 @@
:8080 {
method FOO
}
----------
{
"apps": {
"http": {
"servers": {
"srv0": {
"listen": [
":8080"
],
"routes": [
{
"handle": [
{
"handler": "rewrite",
"method": "FOO"
}
]
}
]
}
}
}
}
}

19
modules/caddyhttp/rewrite/caddyfile.go

@ -27,6 +27,7 @@ import (
func init() {
httpcaddyfile.RegisterHandlerDirective("rewrite", parseCaddyfileRewrite)
httpcaddyfile.RegisterHandlerDirective("method", parseCaddyfileMethod)
httpcaddyfile.RegisterHandlerDirective("uri", parseCaddyfileURI)
httpcaddyfile.RegisterDirective("handle_path", parseCaddyfileHandlePath)
}
@ -51,6 +52,24 @@ func parseCaddyfileRewrite(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler,
return rewr, nil
}
// parseCaddyfileMethod sets up a basic method rewrite handler from Caddyfile tokens. Syntax:
//
// method [<matcher>] <method>
//
func parseCaddyfileMethod(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) {
var rewr Rewrite
for h.Next() {
if !h.NextArg() {
return nil, h.ArgErr()
}
rewr.Method = h.Val()
if h.NextArg() {
return nil, h.ArgErr()
}
}
return rewr, nil
}
// parseCaddyfileURI sets up a handler for manipulating (but not "rewriting") the
// URI from Caddyfile tokens. Syntax:
//

Loading…
Cancel
Save