c129361e55
Merge in DNS/adguard-home from 2305-limit-message-size to master Closes #2305. Squashed commit of the following: commit 6edd1e0521277a680f0053308efcf3d9cacc8e62 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Nov 23 14:03:36 2020 +0300 aghio: fix final inaccuracies commit 4dd382aaf25132b31eb269749a2cd36daf0cb792 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Nov 23 13:59:10 2020 +0300 all: improve code quality commit 060f923f6023d0e6f26441559b7023d5e5f96843 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Nov 23 13:10:57 2020 +0300 aghio: add validation to constructor commit f57a2f596f5dc578548241c315c68dce7fc93905 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:19:26 2020 +0300 all: fix minor inaccuracies commit 93462c71725d3d00655a4bd565b77e64451fff60 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:13:23 2020 +0300 home: make test name follow convention commit 4922986ad84481b054479c43b4133a1b97bee86b Merge: 1f5472abc046ec13fd
Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:09:01 2020 +0300 Merge branch 'master' into 2305-limit-message-size commit 1f5472abcfa7427f389825fc59eb4253e1e2bfb7 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:08:21 2020 +0300 aghio: improve readability commit 60dc706b093fa22bbf62f13b2341934364ddc4df Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 18:44:08 2020 +0300 home: cover middleware with test commit bedf436b947ca1fa4493af2fc94f1f40beec7c35 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 17:10:23 2020 +0300 aghio: improved error informativeness commit 682c5da9f21fa330fb3536bb1c112129c91b9990 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 13:37:51 2020 +0300 all: limit readers for ReadAll dealing with miscellanious data. commit 78c6dd8d90a0a43fe6ee3f9ed4d5fc637b15ba74 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 19 20:07:43 2020 +0300 all: handle ReadAll calls dealing with request's bodies. commit bfe1a6faf6468eb44515e2b0ecffa8c51f90b7e8 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 19 17:25:34 2020 +0300 home: add middlewares commit bbd1d491b318e6ba07f8af23ad546183383783a8 Merge: 7b77c2cad62a8fe0b7
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 19 16:44:04 2020 +0300 Merge branch 'master' into 2305-limit-message-size commit 7b77c2cad03154177392460982e1d73ee2a30177 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 17 15:33:33 2020 +0300 aghio: create package
115 lines
3.2 KiB
Go
115 lines
3.2 KiB
Go
package update
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghio"
|
|
)
|
|
|
|
const versionCheckPeriod = 8 * 60 * 60
|
|
|
|
// VersionInfo - VersionInfo
|
|
type VersionInfo struct {
|
|
NewVersion string // New version string
|
|
Announcement string // Announcement text
|
|
AnnouncementURL string // Announcement URL
|
|
SelfUpdateMinVersion string // Min version starting with which we can auto-update
|
|
CanAutoUpdate bool // If true - we can auto-update
|
|
}
|
|
|
|
// MaxResponseSize is responses on server's requests maximum length in bytes.
|
|
const MaxResponseSize = 64 * 1024
|
|
|
|
// GetVersionResponse - downloads version.json (if needed) and deserializes it
|
|
func (u *Updater) GetVersionResponse(forceRecheck bool) (VersionInfo, error) {
|
|
if !forceRecheck &&
|
|
u.versionCheckLastTime.Unix()+versionCheckPeriod > time.Now().Unix() {
|
|
return u.parseVersionResponse(u.versionJSON)
|
|
}
|
|
|
|
resp, err := u.Client.Get(u.VersionURL)
|
|
if err != nil {
|
|
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxResponseSize)
|
|
if err != nil {
|
|
return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// This use of ReadAll is safe, because we just limited the appropriate
|
|
// ReadCloser.
|
|
body, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
|
|
}
|
|
|
|
u.versionJSON = body
|
|
u.versionCheckLastTime = time.Now()
|
|
|
|
return u.parseVersionResponse(body)
|
|
}
|
|
|
|
func (u *Updater) parseVersionResponse(data []byte) (VersionInfo, error) {
|
|
info := VersionInfo{}
|
|
versionJSON := make(map[string]interface{})
|
|
err := json.Unmarshal(data, &versionJSON)
|
|
if err != nil {
|
|
return info, fmt.Errorf("version.json: %w", err)
|
|
}
|
|
|
|
var ok1, ok2, ok3, ok4 bool
|
|
info.NewVersion, ok1 = versionJSON["version"].(string)
|
|
info.Announcement, ok2 = versionJSON["announcement"].(string)
|
|
info.AnnouncementURL, ok3 = versionJSON["announcement_url"].(string)
|
|
info.SelfUpdateMinVersion, ok4 = versionJSON["selfupdate_min_version"].(string)
|
|
if !ok1 || !ok2 || !ok3 || !ok4 {
|
|
return info, fmt.Errorf("version.json: invalid data")
|
|
}
|
|
|
|
packageURL, ok := u.getDownloadURL(versionJSON)
|
|
|
|
if ok &&
|
|
info.NewVersion != u.VersionString &&
|
|
strings.TrimPrefix(u.VersionString, "v") >= strings.TrimPrefix(info.SelfUpdateMinVersion, "v") {
|
|
info.CanAutoUpdate = true
|
|
}
|
|
|
|
u.NewVersion = info.NewVersion
|
|
u.PackageURL = packageURL
|
|
|
|
return info, nil
|
|
}
|
|
|
|
// Get download URL for the current GOOS/GOARCH/ARMVersion
|
|
func (u *Updater) getDownloadURL(json map[string]interface{}) (string, bool) {
|
|
var key string
|
|
|
|
if u.Arch == "arm" && u.ARMVersion != "" {
|
|
// the key is:
|
|
// download_linux_armv5 for ARMv5
|
|
// download_linux_armv6 for ARMv6
|
|
// download_linux_armv7 for ARMv7
|
|
key = fmt.Sprintf("download_%s_%sv%s", u.OS, u.Arch, u.ARMVersion)
|
|
}
|
|
|
|
val, ok := json[key]
|
|
if !ok {
|
|
// the key is download_linux_arm or download_linux_arm64 for regular ARM versions
|
|
key = fmt.Sprintf("download_%s_%s", u.OS, u.Arch)
|
|
val, ok = json[key]
|
|
}
|
|
|
|
if !ok {
|
|
return "", false
|
|
}
|
|
|
|
return val.(string), true
|
|
}
|