summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Piccinini <piccinini@gmail.com>2020-11-16 19:43:39 +0100
committerGitHub <noreply@github.com>2020-11-16 11:43:39 -0700
commit670b723e3802ac37942dad07dc194539bccce9ff (patch)
tree248a51fd067a8116ed70685b5d6ba651a4654e06
parent13781e67ab1b2553598d0dd1a7153ce3cdbd4879 (diff)
requestbody: Add Caddyfile support (#3859)
* Add Caddyfile support for request_body: ``` request_body { max_size 10000000 } ``` * Improve Caddyfile parser for request_body module * Remove unnecessary `continue` * Add sample for caddyfile_adapt_test
-rw-r--r--caddyconfig/httpcaddyfile/directives.go1
-rw-r--r--caddytest/integration/caddyfile_adapt/request_body.txt45
-rw-r--r--modules/caddyhttp/requestbody/caddyfile.go51
3 files changed, 97 insertions, 0 deletions
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index 5d9a339..afa2cd4 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -41,6 +41,7 @@ var directiveOrder = []string{
"root",
"header",
+ "request_body",
"redir",
"rewrite",
diff --git a/caddytest/integration/caddyfile_adapt/request_body.txt b/caddytest/integration/caddyfile_adapt/request_body.txt
new file mode 100644
index 0000000..458b739
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/request_body.txt
@@ -0,0 +1,45 @@
+localhost
+request_body {
+ max_size 1MB
+}
+----------
+{
+ "apps": {
+ "http": {
+ "servers": {
+ "srv0": {
+ "listen": [
+ ":443"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "host": [
+ "localhost"
+ ]
+ }
+ ],
+ "handle": [
+ {
+ "handler": "subroute",
+ "routes": [
+ {
+ "handle": [
+ {
+ "handler": "request_body",
+ "max_size": 1000000
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "terminal": true
+ }
+ ]
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/modules/caddyhttp/requestbody/caddyfile.go b/modules/caddyhttp/requestbody/caddyfile.go
new file mode 100644
index 0000000..0a2459f
--- /dev/null
+++ b/modules/caddyhttp/requestbody/caddyfile.go
@@ -0,0 +1,51 @@
+// Copyright 2015 Matthew Holt and The Caddy Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package requestbody
+
+import (
+ "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
+ "github.com/caddyserver/caddy/v2/modules/caddyhttp"
+ "github.com/dustin/go-humanize"
+)
+
+func init() {
+ httpcaddyfile.RegisterHandlerDirective("request_body", parseCaddyfile)
+}
+
+func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) {
+ rb := new(RequestBody)
+
+ for h.Next() {
+ // configuration should be in a block
+ for h.NextBlock(0) {
+ switch h.Val() {
+ case "max_size":
+ var sizeStr string
+ if !h.AllArgs(&sizeStr) {
+ return nil, h.ArgErr()
+ }
+ size, err := humanize.ParseBytes(sizeStr)
+ if err != nil {
+ return nil, h.Errf("parsing max_size: %v", err)
+ }
+ rb.MaxSize = int64(size)
+ default:
+ return nil, h.Errf("unrecognized servers option '%s'", h.Val())
+ }
+ }
+ }
+
+ return rb, nil
+}