Commit 99aeec1
committed
Update resource URI validation and handling
URI scheme (protocol) validation rules are now specified through the Options class. By default file and http(s) URIs are allowed and validation rules defined. Validation rules for PHAR URIs are defined but the scheme is not enabled by default.
Resource retrieval has been updated to use file_get_contents for schemes other than http(s).
fixes #621
fixes #2826
in lieu of #19031 parent 5abe328 commit 99aeec1
File tree
11 files changed
+359
-268
lines changed- src
- Css
- FrameDecorator
- Image
- Renderer
- tests
- Css
11 files changed
+359
-268
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
325 | 325 | | |
326 | 326 | | |
327 | 327 | | |
328 | | - | |
329 | | - | |
330 | | - | |
| 328 | + | |
331 | 329 | | |
332 | | - | |
| 330 | + | |
| 331 | + | |
333 | 332 | | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
356 | 343 | | |
357 | 344 | | |
358 | 345 | | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | | - | |
365 | | - | |
366 | 346 | | |
367 | | - | |
| 347 | + | |
368 | 348 | | |
369 | 349 | | |
370 | 350 | | |
| |||
379 | 359 | | |
380 | 360 | | |
381 | 361 | | |
382 | | - | |
383 | 362 | | |
384 | 363 | | |
385 | 364 | | |
386 | 365 | | |
| 366 | + | |
| 367 | + | |
387 | 368 | | |
388 | 369 | | |
389 | 370 | | |
| |||
1421 | 1402 | | |
1422 | 1403 | | |
1423 | 1404 | | |
1424 | | - | |
1425 | 1405 | | |
1426 | 1406 | | |
1427 | 1407 | | |
1428 | 1408 | | |
1429 | | - | |
1430 | | - | |
1431 | | - | |
1432 | | - | |
1433 | | - | |
1434 | | - | |
| 1409 | + | |
| 1410 | + | |
1435 | 1411 | | |
1436 | 1412 | | |
1437 | 1413 | | |
| 1414 | + | |
1438 | 1415 | | |
1439 | 1416 | | |
1440 | 1417 | | |
| |||
1483 | 1460 | | |
1484 | 1461 | | |
1485 | 1462 | | |
1486 | | - | |
1487 | | - | |
1488 | | - | |
| 1463 | + | |
| 1464 | + | |
| 1465 | + | |
1489 | 1466 | | |
1490 | 1467 | | |
1491 | 1468 | | |
| |||
1675 | 1652 | | |
1676 | 1653 | | |
1677 | 1654 | | |
1678 | | - | |
| 1655 | + | |
1679 | 1656 | | |
1680 | 1657 | | |
1681 | 1658 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
196 | 196 | | |
197 | 197 | | |
198 | 198 | | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | 199 | | |
210 | 200 | | |
211 | 201 | | |
| |||
271 | 261 | | |
272 | 262 | | |
273 | 263 | | |
274 | | - | |
275 | | - | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
276 | 269 | | |
277 | 270 | | |
278 | 271 | | |
| |||
352 | 345 | | |
353 | 346 | | |
354 | 347 | | |
355 | | - | |
356 | 348 | | |
357 | 349 | | |
358 | | - | |
| 350 | + | |
| 351 | + | |
359 | 352 | | |
360 | 353 | | |
361 | 354 | | |
362 | | - | |
363 | | - | |
364 | | - | |
365 | | - | |
366 | | - | |
367 | | - | |
368 | | - | |
369 | | - | |
370 | | - | |
371 | | - | |
372 | | - | |
373 | | - | |
374 | | - | |
375 | | - | |
376 | | - | |
377 | | - | |
378 | | - | |
379 | | - | |
380 | | - | |
381 | | - | |
382 | | - | |
| 355 | + | |
| 356 | + | |
383 | 357 | | |
384 | | - | |
| 358 | + | |
385 | 359 | | |
| 360 | + | |
386 | 361 | | |
387 | | - | |
388 | | - | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
389 | 366 | | |
390 | | - | |
391 | | - | |
392 | 367 | | |
393 | 368 | | |
394 | 369 | | |
| |||
604 | 579 | | |
605 | 580 | | |
606 | 581 | | |
607 | | - | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
608 | 585 | | |
609 | 586 | | |
610 | 587 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
217 | | - | |
218 | | - | |
219 | | - | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
220 | 220 | | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | 221 | | |
241 | | - | |
242 | | - | |
243 | | - | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
244 | 226 | | |
245 | | - | |
246 | | - | |
247 | 227 | | |
| 228 | + | |
248 | 229 | | |
249 | 230 | | |
250 | 231 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| |||
0 commit comments