Repository navigation
Commit 488fe9b
authored
Merge commit from fork
Every special-use classifier was built on isInSubnet, which short-circuits to
false when the receiver's prefix is shorter than the reference range's. That
prefix comes from the CIDR suffix on the parsed input, so a suffix such as /0
suppressed classification entirely: isLoopback, isPrivate, isLinkLocal,
isCGNAT, isMulticast, isUnspecified, isBroadcast, isULA, isMapped4, isTeredo,
is6to4, isDocumentation and getType all reported internal addresses as
unremarkable while correctForm() still returned the real target. Guards built
on these checks to block SSRF could be bypassed with '127.0.0.1/0'.
The suffix also defeated the IPv4-mapped/NAT64 normalization added in 10.2.1
for GHSA-22jq-vg5j-6vgg, since that path is reached through isInSubnet:
'::ffff:127.0.0.1/0' reverted to reading as non-internal.
Split the two questions apart. isHostInSubnet compares the address's host bits
against the reference range only and backs every classifier; isInSubnet keeps
its subnet-containment semantics, including the guard that a wider network is
not contained in a narrower one, so '10.0.0.0/8' is still not in '10.0.0.0/16'.
Tests assert suffix-independent classification across every prefix length for
both families, that public addresses are not newly misclassified, and that
containment still rejects wider networks.1 parent e86ab3e commit 488fe9b
6 files changed
Lines changed: 240 additions & 50 deletions
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
9 | 19 | | |
10 | 20 | | |
11 | 21 | | |
12 | 22 | | |
13 | 23 | | |
14 | | - | |
15 | | - | |
16 | | - | |
| 24 | + | |
| 25 | + | |
17 | 26 | | |
18 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
19 | 41 | | |
20 | 42 | | |
21 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
449 | 449 | | |
450 | 450 | | |
451 | 451 | | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
452 | 460 | | |
453 | 461 | | |
454 | 462 | | |
455 | 463 | | |
456 | 464 | | |
457 | | - | |
| 465 | + | |
458 | 466 | | |
459 | 467 | | |
460 | 468 | | |
461 | 469 | | |
462 | 470 | | |
463 | 471 | | |
464 | 472 | | |
465 | | - | |
| 473 | + | |
466 | 474 | | |
467 | 475 | | |
468 | 476 | | |
469 | 477 | | |
470 | 478 | | |
471 | 479 | | |
472 | 480 | | |
473 | | - | |
| 481 | + | |
474 | 482 | | |
475 | 483 | | |
476 | 484 | | |
477 | 485 | | |
478 | 486 | | |
479 | 487 | | |
480 | 488 | | |
481 | | - | |
| 489 | + | |
482 | 490 | | |
483 | 491 | | |
484 | 492 | | |
485 | 493 | | |
486 | 494 | | |
487 | 495 | | |
488 | 496 | | |
489 | | - | |
| 497 | + | |
490 | 498 | | |
491 | 499 | | |
492 | 500 | | |
493 | 501 | | |
494 | 502 | | |
495 | 503 | | |
496 | 504 | | |
497 | | - | |
| 505 | + | |
498 | 506 | | |
499 | 507 | | |
500 | 508 | | |
501 | 509 | | |
502 | 510 | | |
503 | 511 | | |
504 | 512 | | |
505 | | - | |
| 513 | + | |
506 | 514 | | |
507 | 515 | | |
508 | 516 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
567 | 567 | | |
568 | 568 | | |
569 | 569 | | |
570 | | - | |
| 570 | + | |
571 | 571 | | |
572 | 572 | | |
573 | 573 | | |
| |||
1094 | 1094 | | |
1095 | 1095 | | |
1096 | 1096 | | |
1097 | | - | |
| 1097 | + | |
1098 | 1098 | | |
1099 | 1099 | | |
1100 | 1100 | | |
| |||
1182 | 1182 | | |
1183 | 1183 | | |
1184 | 1184 | | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
1185 | 1193 | | |
1186 | 1194 | | |
1187 | 1195 | | |
| |||
1206 | 1214 | | |
1207 | 1215 | | |
1208 | 1216 | | |
1209 | | - | |
| 1217 | + | |
1210 | 1218 | | |
1211 | 1219 | | |
1212 | 1220 | | |
| |||
1251 | 1259 | | |
1252 | 1260 | | |
1253 | 1261 | | |
1254 | | - | |
| 1262 | + | |
1255 | 1263 | | |
1256 | 1264 | | |
1257 | 1265 | | |
| |||
1272 | 1280 | | |
1273 | 1281 | | |
1274 | 1282 | | |
1275 | | - | |
| 1283 | + | |
1276 | 1284 | | |
1277 | 1285 | | |
1278 | 1286 | | |
| |||
1284 | 1292 | | |
1285 | 1293 | | |
1286 | 1294 | | |
1287 | | - | |
| 1295 | + | |
1288 | 1296 | | |
1289 | 1297 | | |
1290 | 1298 | | |
1291 | 1299 | | |
1292 | 1300 | | |
1293 | 1301 | | |
1294 | 1302 | | |
1295 | | - | |
| 1303 | + | |
1296 | 1304 | | |
1297 | 1305 | | |
1298 | 1306 | | |
| |||
1313 | 1321 | | |
1314 | 1322 | | |
1315 | 1323 | | |
1316 | | - | |
| 1324 | + | |
1317 | 1325 | | |
1318 | 1326 | | |
1319 | 1327 | | |
| |||
1387 | 1395 | | |
1388 | 1396 | | |
1389 | 1397 | | |
1390 | | - | |
| 1398 | + | |
1391 | 1399 | | |
1392 | 1400 | | |
1393 | 1401 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
674 | 674 | | |
675 | 675 | | |
676 | 676 | | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
677 | 738 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1419 | 1419 | | |
1420 | 1420 | | |
1421 | 1421 | | |
| 1422 | + | |
| 1423 | + | |
| 1424 | + | |
| 1425 | + | |
| 1426 | + | |
| 1427 | + | |
| 1428 | + | |
| 1429 | + | |
| 1430 | + | |
| 1431 | + | |
| 1432 | + | |
| 1433 | + | |
| 1434 | + | |
| 1435 | + | |
| 1436 | + | |
| 1437 | + | |
| 1438 | + | |
| 1439 | + | |
| 1440 | + | |
| 1441 | + | |
| 1442 | + | |
| 1443 | + | |
| 1444 | + | |
| 1445 | + | |
| 1446 | + | |
| 1447 | + | |
| 1448 | + | |
| 1449 | + | |
| 1450 | + | |
| 1451 | + | |
| 1452 | + | |
| 1453 | + | |
| 1454 | + | |
| 1455 | + | |
| 1456 | + | |
| 1457 | + | |
| 1458 | + | |
| 1459 | + | |
| 1460 | + | |
| 1461 | + | |
| 1462 | + | |
| 1463 | + | |
| 1464 | + | |
| 1465 | + | |
| 1466 | + | |
| 1467 | + | |
| 1468 | + | |
| 1469 | + | |
| 1470 | + | |
| 1471 | + | |
| 1472 | + | |
| 1473 | + | |
| 1474 | + | |
| 1475 | + | |
| 1476 | + | |
| 1477 | + | |
| 1478 | + | |
| 1479 | + | |
| 1480 | + | |
| 1481 | + | |
| 1482 | + | |
| 1483 | + | |
| 1484 | + | |
| 1485 | + | |
| 1486 | + | |
| 1487 | + | |
| 1488 | + | |
| 1489 | + | |
| 1490 | + | |
| 1491 | + | |
| 1492 | + | |
| 1493 | + | |
| 1494 | + | |
| 1495 | + | |
| 1496 | + | |
| 1497 | + | |
| 1498 | + | |
| 1499 | + | |
| 1500 | + | |
| 1501 | + | |
| 1502 | + | |
| 1503 | + | |
| 1504 | + | |
| 1505 | + | |
| 1506 | + | |
| 1507 | + | |
| 1508 | + | |
| 1509 | + | |
| 1510 | + | |
1422 | 1511 | | |
0 commit comments