diff options
| -rw-r--r-- | docs/docs/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | internal/ogtags/cache.go | 4 | ||||
| -rw-r--r-- | internal/ogtags/fetch.go | 12 | ||||
| -rw-r--r-- | internal/test/playwright_test.go | 3 | ||||
| -rw-r--r-- | lib/anubis_test.go | 4 |
5 files changed, 15 insertions, 9 deletions
diff --git a/docs/docs/CHANGELOG.md b/docs/docs/CHANGELOG.md index 08afe7d..37bf3b4 100644 --- a/docs/docs/CHANGELOG.md +++ b/docs/docs/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Whitelisted [DuckDuckBot](https://duckduckgo.com/duckduckgo-help-pages/results/duckduckbot/) in botPolicies - Improvements to build scripts to make them less independent of the build host +- Improved the OpenGraph error logging ## v1.16.0 diff --git a/internal/ogtags/cache.go b/internal/ogtags/cache.go index 0d1a615..b3e35e4 100644 --- a/internal/ogtags/cache.go +++ b/internal/ogtags/cache.go @@ -23,8 +23,8 @@ func (c *OGTagCache) GetOGTags(url *url.URL) (map[string]string, error) { if errors.Is(err, syscall.ECONNREFUSED) { slog.Debug("Connection refused, returning empty tags") return nil, nil - } else if errors.Is(err, ErrNotFound) { - // not even worth a debug log... + } else if errors.Is(err, ErrOgHandled) { + // Error was handled in fetchHTMLDocument, return empty tags return nil, nil } if err != nil { diff --git a/internal/ogtags/fetch.go b/internal/ogtags/fetch.go index 3ea9aac..d4db711 100644 --- a/internal/ogtags/fetch.go +++ b/internal/ogtags/fetch.go @@ -11,8 +11,8 @@ import ( ) var ( - ErrNotFound = errors.New("page not found") /*todo: refactor into common errors lib? */ - emptyMap = map[string]string{} // used to indicate an empty result in the cache. Can't use nil as it would be a cache miss. + ErrOgHandled = errors.New("og: handled error") // used to indicate that the error was handled and should not be logged + emptyMap = map[string]string{} // used to indicate an empty result in the cache. Can't use nil as it would be a cache miss. ) func (c *OGTagCache) fetchHTMLDocument(urlStr string) (*html.Node, error) { @@ -31,7 +31,7 @@ func (c *OGTagCache) fetchHTMLDocument(urlStr string) (*html.Node, error) { if resp.StatusCode != http.StatusOK { slog.Debug("og: received non-OK status code", "url", urlStr, "status", resp.StatusCode) c.cache.Set(urlStr, emptyMap, c.ogTimeToLive) // Cache empty result for non-successful status codes - return nil, ErrNotFound + return nil, fmt.Errorf("%w: page not found", ErrOgHandled) } // Check content type @@ -43,11 +43,13 @@ func (c *OGTagCache) fetchHTMLDocument(urlStr string) (*html.Node, error) { mediaType, _, err := mime.ParseMediaType(ct) if err != nil { // Malformed Content-Type header - return nil, fmt.Errorf("invalid Content-Type '%s': %w", ct, err) + slog.Debug("og: malformed Content-Type header", "url", urlStr, "contentType", ct) + return nil, fmt.Errorf("%w malformed Content-Type header: %w", ErrOgHandled, err) } if mediaType != "text/html" && mediaType != "application/xhtml+xml" { - return nil, fmt.Errorf("unsupported Content-Type: %s", mediaType) + slog.Debug("og: unsupported Content-Type", "url", urlStr, "contentType", mediaType) + return nil, fmt.Errorf("%w unsupported Content-Type: %s", ErrOgHandled, mediaType) } } diff --git a/internal/test/playwright_test.go b/internal/test/playwright_test.go index 88d94bc..d5010de 100644 --- a/internal/test/playwright_test.go +++ b/internal/test/playwright_test.go @@ -101,6 +101,9 @@ func doesNPXExist(t *testing.T) { } func run(t *testing.T, command string) string { + if testing.Short() { + t.Skip("skipping integration smoke testing in short mode") + } t.Helper() shPath, err := exec.LookPath("sh") diff --git a/lib/anubis_test.go b/lib/anubis_test.go index 1e0cdf2..156863d 100644 --- a/lib/anubis_test.go +++ b/lib/anubis_test.go @@ -15,12 +15,12 @@ import ( func loadPolicies(t *testing.T, fname string) *policy.ParsedConfig { t.Helper() - policy, err := LoadPoliciesOrDefault("", anubis.DefaultDifficulty) + anubisPolicy, err := LoadPoliciesOrDefault("", anubis.DefaultDifficulty) if err != nil { t.Fatal(err) } - return policy + return anubisPolicy } func spawnAnubis(t *testing.T, opts Options) *Server { |