7d1ca48ae4
Merge in DNS/adguard-home from 2675-larger-requests to master Updates #2675. Squashed commit of the following: commit 2b45c9bfdc817980204b11de768b425fb72a6488 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 15 13:38:44 2021 +0300 home: imp names commit dad39ae7ee35346ea91f15665acc93ba0b5653df Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 15 13:31:53 2021 +0300 home: imp large req handling
86 lines
2.2 KiB
Go
86 lines
2.2 KiB
Go
package home
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghio"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
// middlerware is a wrapper function signature.
|
|
type middleware func(http.Handler) http.Handler
|
|
|
|
// withMiddlewares consequently wraps h with all the middlewares.
|
|
func withMiddlewares(h http.Handler, middlewares ...middleware) (wrapped http.Handler) {
|
|
wrapped = h
|
|
|
|
for _, mw := range middlewares {
|
|
wrapped = mw(wrapped)
|
|
}
|
|
|
|
return wrapped
|
|
}
|
|
|
|
// defaultReqBodySzLim is the default maximum request body size.
|
|
const defaultReqBodySzLim = 64 * 1024
|
|
|
|
// largerReqBodySzLim is the maximum request body size for APIs expecting larger
|
|
// requests.
|
|
const largerReqBodySzLim = 4 * 1024 * 1024
|
|
|
|
// expectsLargerRequests shows if this request should use a larger body size
|
|
// limit. These are exceptions for poorly designed current APIs as well as APIs
|
|
// that are designed to expect large files and requests. Remove once the new,
|
|
// better APIs are up.
|
|
//
|
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/2666 and
|
|
// https://github.com/AdguardTeam/AdGuardHome/issues/2675.
|
|
func expectsLargerRequests(r *http.Request) (ok bool) {
|
|
m := r.Method
|
|
if m != http.MethodPost {
|
|
return false
|
|
}
|
|
|
|
p := r.URL.Path
|
|
return p == "/control/access/set" ||
|
|
p == "/control/filtering/set_rules"
|
|
}
|
|
|
|
// limitRequestBody wraps underlying handler h, making it's request's body Read
|
|
// method limited.
|
|
func limitRequestBody(h http.Handler) (limited http.Handler) {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
var err error
|
|
|
|
var szLim int64 = defaultReqBodySzLim
|
|
if expectsLargerRequests(r) {
|
|
szLim = largerReqBodySzLim
|
|
}
|
|
|
|
r.Body, err = aghio.LimitReadCloser(r.Body, szLim)
|
|
if err != nil {
|
|
log.Error("limitRequestBody: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
h.ServeHTTP(w, r)
|
|
})
|
|
}
|
|
|
|
// wrapIndexBeta returns handler that deals with new client.
|
|
func (web *Web) wrapIndexBeta(http.Handler) (wrapped http.Handler) {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
h, pattern := Context.mux.Handler(r)
|
|
switch pattern {
|
|
case "/":
|
|
web.handlerBeta.ServeHTTP(w, r)
|
|
case "/install.html":
|
|
web.installerBeta.ServeHTTP(w, r)
|
|
default:
|
|
h.ServeHTTP(w, r)
|
|
}
|
|
})
|
|
}
|