all: fix minor inaccuracies

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to
 
 ### Added
 
-- Limiting request's body size ([#2305]).
+- HTTP API request body limit [#2305].
 
 [#2305]: https://github.com/AdguardTeam/AdGuardHome/issues/2305
 
@@ -22,6 +22,8 @@ and this project adheres to
 [#2271]: https://github.com/AdguardTeam/AdGuardHome/issues/2271
 [#2297]: https://github.com/AdguardTeam/AdGuardHome/issues/2297
 
+
+
 ## [v0.104.3] - 2020-11-19
 
 ### Fixed

internal/aghio/limitedreadcloser.go

@@ -48,6 +48,9 @@ func (lrc *limitedReadCloser) Close() error {
 // LimitReadCloser wraps ReadCloser to make it's Reader stop with
 // ErrLimitReached after n bytes read.
 func LimitReadCloser(rc io.ReadCloser, n int64) io.ReadCloser {
+	if n < 0 {
+		n = 0
+	}
 	return &limitedReadCloser{
 		limit: n,
 		n:     n,

internal/home/middlewares.go

@@ -24,7 +24,7 @@ func withMiddlewares(h http.Handler, middlewares ...middleware) (wrapped http.Ha
 // RequestBodySizeLimit is maximum request body length in bytes.
 const RequestBodySizeLimit = 64 * 1024
 
-// LimitRequestBody wraps underlying handler h, making it's request's body Read
+// 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) {

internal/update/check.go

@@ -31,14 +31,6 @@ func (u *Updater) GetVersionResponse(forceRecheck bool) (VersionInfo, error) {
 		return u.parseVersionResponse(u.versionJSON)
 	}
 
-	// According to godoc: When err is nil, resp always contains a non-nil
-	// resp.Body. Caller should close resp.Body when done reading from it.
-	//
-	// The http Client and Transport guarantee that Body is always non-nil,
-	// even on responses without a body or responses with a zero-length
-	// body. It is the caller's responsibility to close Body. The default
-	// HTTP client's Transport may not reuse HTTP/1.x "keep-alive" TCP
-	// connections if the Body is not read to completion and closed.
 	resp, err := u.Client.Get(u.VersionURL)
 	if err != nil {
 		return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)

internal/update/updater.go

@@ -219,16 +219,15 @@ func (u *Updater) clean() {
 }
 
 // MaxPackageFileSize is a maximum package file length in bytes.
-const MaxPackageFileSize = 5 * 1024 * 1024
+const MaxPackageFileSize = 32 * 1024 * 1024
 
 // Download package file and save it to disk
 func (u *Updater) downloadPackageFile(url string, filename string) error {
 	resp, err := u.Client.Get(url)
 	if err != nil {
 		return fmt.Errorf("http request failed: %w", err)
 	}
-	// According to go doc: When err is nil, resp always contains a non-nil
-	// resp.Body. Caller should close resp.Body when done reading from it.
+
 	resp.Body = aghio.LimitReadCloser(resp.Body, MaxPackageFileSize)
 	defer resp.Body.Close()