-
Notifications
You must be signed in to change notification settings - Fork 447
Signature Validation: Remove exceptions #2757
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0a84572
Refactored ValidateSignature to remove exceptions and some logs
iNinja b68f179
Updated documentation. Added null checks for parameters. Added base f…
iNinja a96eb31
Added test
iNinja cec927c
Add tests
iNinja 0fd03ab
Addresed PR feedback
iNinja 6651ddf
Merge branch 'dev' into iinglese/validate-signature
iNinja ce49c84
Merge branch 'dev' into iinglese/validate-signature
iNinja File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
368 changes: 368 additions & 0 deletions
368
src/Microsoft.IdentityModel.JsonWebTokens/JsonWebTokenHandler.ValidateSignature.cs
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
src/Microsoft.IdentityModel.Tokens/Validation/SignatureValidationResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| using System; | ||
| using Microsoft.IdentityModel.Tokens; | ||
|
|
||
| namespace Microsoft.IdentityModel.JsonWebTokens.Results | ||
| { | ||
| #nullable enable | ||
| /// <summary> | ||
| /// Contains the result of validating a signature. | ||
| /// The <see cref="TokenValidationResult"/> contains a collection of <see cref="ValidationResult"/> for each step in the token validation. | ||
| /// </summary> | ||
| internal class SignatureValidationResult: ValidationResult | ||
| { | ||
| private Exception? _exception; | ||
|
|
||
| /// <summary> | ||
| /// Creates an instance of <see cref="SignatureValidationResult"/> representing the successful result of validating a signature. | ||
| /// </summary> | ||
| public SignatureValidationResult(bool isValid, ValidationFailureType validationFailureType) : base(validationFailureType) | ||
| { | ||
| IsValid = isValid; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Creates an instance of <see cref="SignatureValidationResult"/> representing the failed result of validating a signature. | ||
| /// </summary> | ||
| /// <param name="validationFailure"> is the <see cref="ValidationFailure"/> that occurred while validating the signature.</param> | ||
| /// <param name="exceptionDetail"> contains the <see cref="ExceptionDetail"/> of the error that occurred while validating the signature.</param> | ||
| public SignatureValidationResult(ValidationFailureType validationFailure, ExceptionDetail? exceptionDetail) | ||
| : base(validationFailure, exceptionDetail) | ||
| { | ||
| IsValid = false; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Creates an instance of <see cref="SignatureValidationResult"/> representing a successful validation. | ||
| /// </summary> | ||
| internal static SignatureValidationResult Success() => | ||
| new SignatureValidationResult(true, ValidationFailureType.ValidationSucceeded); | ||
|
|
||
| /// <summary> | ||
| /// Creates an instance of <see cref="SignatureValidationResult"/> representing a failure due to a null parameter. | ||
| /// </summary> | ||
| /// <param name="parameterName">The name of the null parameter.</param> | ||
| internal static SignatureValidationResult NullParameterFailure(string parameterName) => | ||
| new SignatureValidationResult( | ||
| ValidationFailureType.SignatureValidationFailed, | ||
| ExceptionDetail.NullParameter(parameterName)); | ||
|
|
||
| /// <summary> | ||
| /// Gets the <see cref="Exception"/> that occurred while validating the signature. | ||
| /// </summary> | ||
| public override Exception? Exception | ||
| { | ||
| get | ||
| { | ||
| if (_exception != null || ExceptionDetail == null) | ||
| return _exception; | ||
|
|
||
| HasValidOrExceptionWasRead = true; | ||
| _exception = ExceptionDetail.GetException(); | ||
| _exception.Source = "Microsoft.IdentityModel.JsonWebTokens"; | ||
|
|
||
| if (_exception is SecurityTokenException securityTokenException) | ||
| { | ||
| securityTokenException.ExceptionDetail = ExceptionDetail; | ||
| } | ||
|
|
||
| return _exception; | ||
| } | ||
| } | ||
| } | ||
| #nullable restore | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.