Commit b3db0dc
authored
fix: Filter sitemap-derived URLs by enqueue strategy (#1864)
## Summary
`SitemapRequestLoader` accepted every `<loc>` it parsed (including
nested sitemaps and `robots.txt` directives) without checking the host,
so a sitemap could push arbitrary URLs into the queue. This wires the
existing `EnqueueStrategy` mechanism into the sitemap loader and the
`robots.txt` discovery path.
## What changed
- `SitemapRequestLoader.__init__` gains `enqueue_strategy:
EnqueueStrategy = 'same-hostname'`, applied to nested `<sitemap><loc>`
and `<urlset><url><loc>` entries against the parent sitemap URL. Pass
`'all'` to opt out. The strategy is stamped on emitted `Request`s, so
`BasicCrawler._check_url_after_redirects` continues policing across
redirects.
- `RobotsTxtFile.get_sitemaps(*, enqueue_strategy)` filters cross-host
`Sitemap:` directives (already disallowed by spec). The
`discover_valid_sitemaps` path is closed as well.
- Hoisted the strategy matcher into
`crawlee._utils.urls.matches_enqueue_strategy` so request loaders and
`BasicCrawler` share one implementation. `BasicCrawler` now uses
`yarl.URL` to match the rest of the codebase.
- Memoised the public-suffix lookup used by `same-domain` so it isn't
re-run per URL on hot paths.
## Behavior change
The new default `'same-hostname'` matches `enqueue_links`. Callers
depending on cross-host sitemap entries must pass
`enqueue_strategy='all'` (or `'same-domain'`).
`RobotsTxtFile.get_sitemaps()` no longer returns cross-host entries; its
tests were rewritten to assert filtering, with a new
`test_extract_same_host_sitemaps_urls` covering the legitimate path.1 parent cbe4699 commit b3db0dc
9 files changed
Lines changed: 544 additions & 201 deletions
File tree
- docs/guides
- src/crawlee
- _utils
- crawlers/_basic
- request_loaders
- tests/unit
- _utils
- request_loaders
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
| |||
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
24 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
25 | 31 | | |
26 | 32 | | |
27 | 33 | | |
| |||
39 | 45 | | |
40 | 46 | | |
41 | 47 | | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | 48 | | |
55 | 49 | | |
56 | 50 | | |
| |||
77 | 71 | | |
78 | 72 | | |
79 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
80 | 86 | | |
81 | 87 | | |
82 | 88 | | |
| |||
89 | 95 | | |
90 | 96 | | |
91 | 97 | | |
92 | | - | |
93 | | - | |
94 | | - | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
95 | 117 | | |
96 | 118 | | |
97 | 119 | | |
| |||
103 | 125 | | |
104 | 126 | | |
105 | 127 | | |
106 | | - | |
107 | | - | |
108 | | - | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
109 | 135 | | |
110 | 136 | | |
111 | 137 | | |
112 | 138 | | |
113 | 139 | | |
114 | | - | |
115 | | - | |
116 | | - | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
117 | 147 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
546 | 546 | | |
547 | 547 | | |
548 | 548 | | |
549 | | - | |
| 549 | + | |
550 | 550 | | |
551 | 551 | | |
552 | 552 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
3 | 5 | | |
4 | 6 | | |
5 | 7 | | |
| 8 | + | |
| 9 | + | |
6 | 10 | | |
7 | 11 | | |
8 | 12 | | |
9 | 13 | | |
10 | 14 | | |
11 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
12 | 28 | | |
13 | 29 | | |
14 | 30 | | |
| |||
38 | 54 | | |
39 | 55 | | |
40 | 56 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | 57 | | |
45 | 58 | | |
46 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
47 | 63 | | |
48 | | - | |
| 64 | + | |
49 | 65 | | |
50 | 66 | | |
51 | | - | |
| 67 | + | |
52 | 68 | | |
53 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
0 commit comments