octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/upgrade: Increase size limits, send version header

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3088
This commit is contained in:
Jakob Borg 2016-05-13 09:01:31 +00:00 committed by Audrius Butkevicius
parent 935c273c8f
commit 2e9bf0b67c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/upgrade/upgrade_supported.go
View File

@ -39,7 +39,7 @@ const (
maxBinarySize = 64 << 20 // 64 MiB maxBinarySize = 64 << 20 // 64 MiB
// The max expected size of the signature file. // The max expected size of the signature file.
maxSignatureSize = 1 << 10 // 1 KiB maxSignatureSize = 10 << 10 // 10 KiB
// We set the same limit on the archive. The binary will compress and we // We set the same limit on the archive. The binary will compress and we
// include some other stuff - currently the release archive size is // include some other stuff - currently the release archive size is
@ -55,7 +55,7 @@ const (
readTimeout = 30 * time.Minute readTimeout = 30 * time.Minute
// The limit on the size of metadata that we accept. // The limit on the size of metadata that we accept.
maxMetadataSize = 100 << 10 // 100 KiB maxMetadataSize = 10 << 20 // 10 MiB
) )
// This is an HTTP/HTTPS client that does *not* perform certificate // This is an HTTP/HTTPS client that does *not* perform certificate
@ -74,10 +74,19 @@ var insecureHTTP = &http.Client{
}, },
} }
func insecureGet(url, version string) (*http.Response, error) {
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
}
req.Header.Set("X-Syncthing-Version", version)
return insecureHTTP.Do(req)
}
// FetchLatestReleases returns the latest releases, including prereleases or // FetchLatestReleases returns the latest releases, including prereleases or
// not depending on the argument // not depending on the argument
func FetchLatestReleases(releasesURL, version string) []Release { func FetchLatestReleases(releasesURL, version string) []Release {
resp, err := insecureHTTP.Get(releasesURL) resp, err := insecureGet(releasesURL, version)
if err != nil { if err != nil {
l.Infoln("Couldn't fetch release information:", err) l.Infoln("Couldn't fetch release information:", err)
return nil return nil
@ -88,7 +97,10 @@ func FetchLatestReleases(releasesURL, version string) []Release {
} }
var rels []Release var rels []Release
json.NewDecoder(io.LimitReader(resp.Body, maxMetadataSize)).Decode(&rels) err = json.NewDecoder(io.LimitReader(resp.Body, maxMetadataSize)).Decode(&rels)
if err != nil {
l.Infoln("Fetching release information:", err)
}
resp.Body.Close() resp.Body.Close()
return rels return rels