GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-28 07:19:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: geo db load fail after download error

Browse Source 
now geo db are downloaded to a temp file, have a integrity check by a
loading test, and then moved to where it should be.

fix: #944
This commit is contained in:
Haruue Icymoon 2024-02-21 16:21:49 +08:00
parent bb99579bb9
commit e22aa0630b
No known key found for this signature in database
GPG Key ID: F6083B28CBCBC148
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/internal/utils/geoloader.go
View File

@ -1,6 +1,7 @@
package utils package utils
import ( import (
"fmt"
"io" "io"
"net/http" "net/http"
"os" "os"
@ -15,6 +16,7 @@ const (
geoipURL = "https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat" geoipURL = "https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat"
geositeFilename = "geosite.dat" geositeFilename = "geosite.dat"
geositeURL = "https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat" geositeURL = "https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat"
geoDlTmpPattern = ".hysteria-geoloader.dlpart.*"
geoDefaultUpdateInterval = 7 * 24 * time.Hour // 7 days geoDefaultUpdateInterval = 7 * 24 * time.Hour // 7 days
) )
@ -49,7 +51,7 @@ func (l *GeoLoader) shouldDownload(filename string) bool {
} }
} }
func (l *GeoLoader) download(filename, url string) error { func (l *GeoLoader) downloadAndCheck(filename, url string, checkFunc func(filename string) error) error {
l.DownloadFunc(filename, url) l.DownloadFunc(filename, url)
resp, err := http.Get(url) resp, err := http.Get(url)
@ -59,16 +61,34 @@ func (l *GeoLoader) download(filename, url string) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
f, err := os.Create(filename) f, err := os.CreateTemp(".", geoDlTmpPattern)
if err != nil { if err != nil {
l.DownloadErrFunc(err) l.DownloadErrFunc(err)
return err return err
} }
defer f.Close() defer os.Remove(f.Name())
_, err = io.Copy(f, resp.Body) _, err = io.Copy(f, resp.Body)
l.DownloadErrFunc(err) if err != nil {
return err f.Close()
l.DownloadErrFunc(err)
return err
}
f.Close()
err = checkFunc(f.Name())
if err != nil {
l.DownloadErrFunc(fmt.Errorf("integrity check failed: %w", err))
return err
}
err = os.Rename(f.Name(), filename)
if err != nil {
l.DownloadErrFunc(fmt.Errorf("rename failed: %w", err))
return err
}
return nil
} }
func (l *GeoLoader) LoadGeoIP() (map[string]*v2geo.GeoIP, error) { func (l *GeoLoader) LoadGeoIP() (map[string]*v2geo.GeoIP, error) {
@ -82,7 +102,10 @@ func (l *GeoLoader) LoadGeoIP() (map[string]*v2geo.GeoIP, error) {
filename = geoipFilename filename = geoipFilename
} }
if autoDL && l.shouldDownload(filename) { if autoDL && l.shouldDownload(filename) {
err := l.download(filename, geoipURL) err := l.downloadAndCheck(filename, geoipURL, func(filename string) error {
_, err := v2geo.LoadGeoIP(filename)
return err
})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -106,7 +129,10 @@ func (l *GeoLoader) LoadGeoSite() (map[string]*v2geo.GeoSite, error) {
filename = geositeFilename filename = geositeFilename
} }
if autoDL && l.shouldDownload(filename) { if autoDL && l.shouldDownload(filename) {
err := l.download(filename, geositeURL) err := l.downloadAndCheck(filename, geositeURL, func(filename string) error {
_, err := v2geo.LoadGeoSite(filename)
return err
})
if err != nil { if err != nil {
return nil, err return nil, err
} }