Commit b7575a1
Validate sizes and offsets when parsing NTLM challenge (#128692)
The managed NTLM client previously trusted the wire fields in
`CHALLENGE_MESSAGE` without checking that the declared offsets, lengths,
and AV pair sizes fit within the supplied blob. A malformed or truncated
challenge could cause out-of-range slice exceptions or silently misparse
target info. This addresses the long-standing `// TODO: Validate size
and offsets` in `ProcessChallenge`.
Changes:
- `ProcessChallenge` rejects challenges smaller than the fixed
`ChallengeMessage` header before reading.
- `GetField` guards against negative offsets and uses `offset >
payload.Length - length` so a huge offset can no longer wrap around to
look in-range.
- `ProcessTargetInfo` validates that each AV pair''s declared body fits
in the remaining bytes and that the `Timestamp` AV is at least 8 bytes.
On malformed input it returns `null`, and `ProcessChallenge` surfaces
that as `InvalidToken` to the caller.
- `targetInfoBuffer` is sized to include the trailing EOL bytes that the
method writes.
Behavior on well-formed challenges is unchanged; only malformed inputs
now fail cleanly with `InvalidToken` instead of throwing or producing
undefined data.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 67e6af4 commit b7575a1
2 files changed
Lines changed: 121 additions & 5 deletions
File tree
- src/libraries/System.Net.Security
- src/System/Net
- tests/UnitTests
Lines changed: 27 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
381 | | - | |
| 381 | + | |
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
| |||
508 | 508 | | |
509 | 509 | | |
510 | 510 | | |
511 | | - | |
| 511 | + | |
512 | 512 | | |
513 | 513 | | |
514 | 514 | | |
| |||
518 | 518 | | |
519 | 519 | | |
520 | 520 | | |
521 | | - | |
| 521 | + | |
522 | 522 | | |
523 | 523 | | |
524 | 524 | | |
| 525 | + | |
525 | 526 | | |
526 | 527 | | |
527 | 528 | | |
| |||
538 | 539 | | |
539 | 540 | | |
540 | 541 | | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
541 | 548 | | |
542 | 549 | | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
543 | 555 | | |
544 | 556 | | |
545 | 557 | | |
| |||
616 | 628 | | |
617 | 629 | | |
618 | 630 | | |
619 | | - | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
620 | 637 | | |
621 | 638 | | |
622 | 639 | | |
| |||
649 | 666 | | |
650 | 667 | | |
651 | 668 | | |
652 | | - | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
653 | 675 | | |
654 | 676 | | |
655 | 677 | | |
| |||
Lines changed: 94 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
435 | 435 | | |
436 | 436 | | |
437 | 437 | | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
438 | 532 | | |
439 | 533 | | |
0 commit comments