Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 1f9093b

Browse files
authored
Merge pull request #444 from NuGet/loshar-fi
[ReleasePrep][2018.05.11]FI of master into dev
2 parents 5fbb374 + 7fbb24e commit 1f9093b

5 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/Validation.PackageSigning.ProcessSignature/Settings/dev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GalleryDb": {
3-
"ConnectionString": "Data Source=tcp:#{Jobs.validation.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;Integrated Security=False;User ID=$$Dev-GalleryDBReadOnly-UserName$$;Password=$$Dev-GalleryDBReadOnly-Password$$;Connect Timeout=30;Encrypt=True"
3+
"ConnectionString": "Data Source=tcp:#{Jobs.validation.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;Integrated Security=False;User ID=$$Dev-GalleryDBWriter-UserName$$;Password=$$Dev-GalleryDBWriter-Password$$;Connect Timeout=30;Encrypt=True"
44
},
55
"ValidationDb": {
66
"ConnectionString": "Data Source=tcp:#{Jobs.validation.DatabaseAddress};Initial Catalog=nuget-dev-validation;Integrated Security=False;User ID=$$Dev-ValidationDBWriter-UserName$$;Password=$$Dev-ValidationDBWriter-Password$$;Connect Timeout=30;Encrypt=True"

src/Validation.PackageSigning.ProcessSignature/Settings/int.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GalleryDb": {
3-
"ConnectionString": "Data Source=tcp:#{Jobs.validation.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;Integrated Security=False;User ID=$$Int-GalleryDBReadonly-UserName$$;Password=$$Int-GalleryDBReadonly-Password$$;Connect Timeout=30;Encrypt=True"
3+
"ConnectionString": "Data Source=tcp:#{Jobs.validation.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;Integrated Security=False;User ID=$$Int-GalleryDBWriter-UserName$$;Password=$$Int-GalleryDBWriter-Password$$;Connect Timeout=30;Encrypt=True"
44
},
55
"ValidationDb": {
66
"ConnectionString": "Data Source=tcp:#{Jobs.validation.DatabaseAddress};Initial Catalog=nuget-int-validation;Integrated Security=False;User ID=$$Int-ValidationDBWriter-UserName$$;Password=$$Int-ValidationDBWriter-Password$$;Connect Timeout=30;Encrypt=True"

src/Validation.PackageSigning.ProcessSignature/Settings/prod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"GalleryDb": {
3-
"ConnectionString": "Data Source=tcp:#{Jobs.validation.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;Integrated Security=False;User ID=$$Prod-GalleryDBReadonly-UserName$$;Password=$$Prod-GalleryDBReadonly-Password$$;Connect Timeout=30;Encrypt=True"
3+
"ConnectionString": "Data Source=tcp:#{Jobs.validation.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;Integrated Security=False;User ID=$$Prod-GalleryDBWriter-UserName$$;Password=$$Prod-GalleryDBWriter-Password$$;Connect Timeout=30;Encrypt=True"
44
},
55
"ValidationDb": {
66
"ConnectionString": "Data Source=tcp:#{Jobs.validation.DatabaseAddress};Initial Catalog=nuget-prod-validation;Integrated Security=False;User ID=$$Prod-ValidationDBWriter-UserName$$;Password=$$Prod-ValidationDBWriter-Password$$;Connect Timeout=30;Encrypt=True"

src/Validation.PackageSigning.ProcessSignature/SignatureFormatValidator.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,16 @@ public SignatureFormatValidator(IOptionsSnapshot<ProcessSignatureConfiguration>
6464

6565
var repoAllowListEntries = _config
6666
.Value
67-
.AllowedRepositorySigningCertificates
67+
.AllowedRepositorySigningCertificates?
6868
.Select(hash => new CertificateHashAllowListEntry(
6969
VerificationTarget.Repository,
7070
SignaturePlacement.PrimarySignature | SignaturePlacement.Countersignature,
7171
hash,
7272
HashAlgorithmName.SHA256))
7373
.ToList();
7474

75+
repoAllowListEntries = repoAllowListEntries ?? new List<CertificateHashAllowListEntry>();
76+
7577
_authorOrRepositorySignatureSettings = new SignedPackageVerifierSettings(
7678
allowUnsigned: _authorSignatureSettings.AllowUnsigned,
7779
allowIllegal: _authorSignatureSettings.AllowIllegal,

tests/Validation.PackageSigning.core.tests/Storage/CertificateStoreTests.cs renamed to tests/Validation.PackageSigning.Core.Tests/Storage/CertificateStoreTests.cs

File renamed without changes.

0 commit comments

Comments
 (0)