-
Notifications
You must be signed in to change notification settings - Fork 689
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
Refactor signature object to add support for repository countersignatures #2006
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
139f67c
Refactor signature object to add support for repository countersignat…
PatoBeltran d8a665c
move verification logic to signature classes
PatoBeltran 68f3f07
Add null checks and update timestamp integrity check
PatoBeltran 5b0840c
Address feedback
PatoBeltran 6b84d8d
fix failing test
PatoBeltran 8105baf
address feedback
b54815a
enforce issues
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
This file contains 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 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 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 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 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 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 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 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 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 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
42 changes: 42 additions & 0 deletions
42
src/NuGet.Core/NuGet.Packaging/Signing/Signatures/AuthorPrimarySignature.cs
This file contains 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,42 @@ | ||
// Copyright (c) .NET Foundation. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
using System.Globalization; | ||
#if IS_DESKTOP | ||
using System.Security.Cryptography.Pkcs; | ||
using System.Security.Cryptography.X509Certificates; | ||
#endif | ||
using NuGet.Common; | ||
|
||
namespace NuGet.Packaging.Signing | ||
{ | ||
public sealed class AuthorPrimarySignature : PrimarySignature | ||
{ | ||
#if IS_DESKTOP | ||
|
||
public AuthorPrimarySignature(SignedCms signedCms) | ||
: base(signedCms, SignatureType.Author) | ||
{ | ||
} | ||
|
||
internal override SignatureVerificationStatus Verify( | ||
Timestamp timestamp, | ||
SignedPackageVerifierSettings settings, | ||
HashAlgorithmName fingerprintAlgorithm, | ||
X509Certificate2Collection certificateExtraStore, | ||
List<SignatureLog> issues) | ||
{ | ||
if (issues == null) | ||
{ | ||
throw new ArgumentNullException(nameof(issues)); | ||
} | ||
settings = settings ?? SignedPackageVerifierSettings.Default; | ||
|
||
issues.Add(SignatureLog.InformationLog(string.Format(CultureInfo.CurrentCulture, Strings.SignatureType, Type.ToString()))); | ||
return base.Verify(timestamp, settings, fingerprintAlgorithm, certificateExtraStore, issues); | ||
} | ||
#endif | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
src/NuGet.Core/NuGet.Packaging/Signing/Signatures/IRepositorySignature.cs
This file contains 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,17 @@ | ||
// Copyright (c) .NET Foundation. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
|
||
namespace NuGet.Packaging.Signing | ||
{ | ||
public interface IRepositorySignature | ||
{ | ||
#if IS_DESKTOP | ||
Uri V3ServiceIndexUrl { get; } | ||
|
||
IReadOnlyList<string> PackageOwners { get; } | ||
#endif | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we just pass a settings object instead of a bunch of flags? It's easier to maintain over time.