root/golib
1
0
Fork 0
mirror of https://github.com/therootcompany/golib.git synced 2026-11-04 06:55:00 +00:00
Code Issues Projects Releases Wiki Activity

fix(iplist): preserve cache after invalid refresh

Browse Source
This commit is contained in:
AJ ONeal 2026-09-08 22:17:22 -06:00
parent d55380ce48
commit 5b92532901
No known key found for this signature in database
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/iplist/iplist.go
View File

@ -94,12 +94,13 @@ func readSource(ctx context.Context, source, cacheDir string, seen map[string]st
} }
digest := sha256.Sum256([]byte(key)) digest := sha256.Sum256([]byte(key))
path := filepath.Join(cacheDir, "ip-sources", hex.EncodeToString(digest[:8])+".tsv") path := filepath.Join(cacheDir, "ip-sources", hex.EncodeToString(digest[:8])+".tsv")
previous, previousErr := os.ReadFile(path)
cache := httpcache.NewWith(parsed.String(), path, https.NewInternalClient()) cache := httpcache.NewWith(parsed.String(), path, https.NewInternalClient())
cache.Header = header cache.Header = header
cache.MaxAge = defaultMaxAge cache.MaxAge = defaultMaxAge
cache.MaxBytes = defaultMaxBytes cache.MaxBytes = defaultMaxBytes
if _, fetchErr := cache.Fetch(ctx); fetchErr != nil { if _, fetchErr := cache.Fetch(ctx); fetchErr != nil {
if _, statErr := os.Stat(path); statErr != nil { if previousErr != nil {
return nil, fmt.Errorf("fetch %s: %w", safeURL(source), fetchErr) return nil, fmt.Errorf("fetch %s: %w", safeURL(source), fetchErr)
} }
} }
@ -107,7 +108,15 @@ func readSource(ctx context.Context, source, cacheDir string, seen map[string]st
if err != nil { if err != nil {
return nil, fmt.Errorf("read cached source %s: %w", safeURL(source), err) return nil, fmt.Errorf("read cached source %s: %w", safeURL(source), err)
} }
return Parse(strings.NewReader(string(body))) entries, err := Parse(strings.NewReader(string(body)))
if err != nil {
if previousErr == nil {
_ = os.WriteFile(path, previous, 0o600)
_ = os.Remove(path + ".meta")
}
return nil, fmt.Errorf("parse cached source %s: %w", safeURL(source), err)
}
return entries, nil
} }
// Parse reads the first TSV column. Blank lines, comments, and an optional // Parse reads the first TSV column. Blank lines, comments, and an optional