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

Commit dd2effb

Browse files
loic-sharmaloic-sharma
authored
[Package Signing] Add Trusted Timestamp Status (#328)
Updates `NuGet.Services.*` dependencies to add the `Status` property to `TrustedTimestamp` entities. Also modified the Extract & Validate job to properly initialize timestamp's status as `Valid`. Depends on NuGet/ServerCommon#135
1 parent 0cf5377 commit dd2effb

12 files changed

Lines changed: 33 additions & 31 deletions

File tree

‎src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,25 @@
133133
<Version>1.1.2</Version>
134134
</PackageReference>
135135
<PackageReference Include="NuGet.Services.Configuration">
136-
<Version>2.12.0</Version>
136+
<Version>2.13.0</Version>
137137
</PackageReference>
138138
<PackageReference Include="NuGet.Services.Contracts">
139-
<Version>2.12.0</Version>
139+
<Version>2.13.0</Version>
140140
</PackageReference>
141141
<PackageReference Include="NuGet.Services.KeyVault">
142-
<Version>2.12.0</Version>
142+
<Version>2.13.0</Version>
143143
</PackageReference>
144144
<PackageReference Include="NuGet.Services.Logging">
145-
<Version>2.12.0</Version>
145+
<Version>2.13.0</Version>
146146
</PackageReference>
147147
<PackageReference Include="NuGet.Services.ServiceBus">
148-
<Version>2.12.0</Version>
148+
<Version>2.13.0</Version>
149149
</PackageReference>
150150
<PackageReference Include="NuGet.Services.Validation">
151-
<Version>2.12.0</Version>
151+
<Version>2.13.0</Version>
152152
</PackageReference>
153153
<PackageReference Include="NuGet.Services.Validation.Issues">
154-
<Version>2.12.0</Version>
154+
<Version>2.13.0</Version>
155155
</PackageReference>
156156
<PackageReference Include="NuGet.Versioning">
157157
<Version>4.3.0</Version>

‎src/Validation.Callback.Vcs/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</dependentAssembly>
7171
<dependentAssembly>
7272
<assemblyIdentity name="NuGet.Services.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
73-
<bindingRedirect oldVersion="0.0.0.0-2.12.0.0" newVersion="2.12.0.0" />
73+
<bindingRedirect oldVersion="0.0.0.0-2.13.0.0" newVersion="2.13.0.0" />
7474
</dependentAssembly>
7575
<dependentAssembly>
7676
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

‎src/Validation.Common/Validation.Common.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@
105105
<Reference Include="NuGet.ApplicationInsights.Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106106
<HintPath>..\..\packages\NuGet.ApplicationInsights.Owin.4.1.0\lib\net452\NuGet.ApplicationInsights.Owin.dll</HintPath>
107107
</Reference>
108-
<Reference Include="NuGet.Services.KeyVault, Version=2.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109-
<HintPath>..\..\packages\NuGet.Services.KeyVault.2.12.0\lib\net45\NuGet.Services.KeyVault.dll</HintPath>
108+
<Reference Include="NuGet.Services.KeyVault, Version=2.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<HintPath>..\..\packages\NuGet.Services.KeyVault.2.13.0\lib\net45\NuGet.Services.KeyVault.dll</HintPath>
110110
</Reference>
111-
<Reference Include="NuGet.Services.Logging, Version=2.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112-
<HintPath>..\..\packages\NuGet.Services.Logging.2.12.0\lib\net452\NuGet.Services.Logging.dll</HintPath>
111+
<Reference Include="NuGet.Services.Logging, Version=2.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112+
<HintPath>..\..\packages\NuGet.Services.Logging.2.13.0\lib\net452\NuGet.Services.Logging.dll</HintPath>
113113
</Reference>
114114
<Reference Include="NuGet.Services.VirusScanning.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<HintPath>..\..\packages\NuGet.Services.VirusScanning.Vcs.3.2.0\lib\net452\NuGet.Services.VirusScanning.Core.dll</HintPath>

‎src/Validation.Common/app.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="NuGet.Services.Logging" publicKeyToken="31BF3856AD364E35" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-2.12.0.0" newVersion="2.12.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.13.0.0" newVersion="2.13.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -40,7 +40,7 @@
4040
</dependentAssembly>
4141
<dependentAssembly>
4242
<assemblyIdentity name="NuGet.Services.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
43-
<bindingRedirect oldVersion="0.0.0.0-2.12.0.0" newVersion="2.12.0.0" />
43+
<bindingRedirect oldVersion="0.0.0.0-2.13.0.0" newVersion="2.13.0.0" />
4444
</dependentAssembly>
4545
<dependentAssembly>
4646
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

‎src/Validation.Common/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net452" />
2323
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
2424
<package id="NuGet.ApplicationInsights.Owin" version="4.1.0" targetFramework="net452" />
25-
<package id="NuGet.Services.KeyVault" version="2.12.0" targetFramework="net452" />
26-
<package id="NuGet.Services.Logging" version="2.12.0" targetFramework="net452" />
25+
<package id="NuGet.Services.KeyVault" version="2.13.0" targetFramework="net452" />
26+
<package id="NuGet.Services.Logging" version="2.13.0" targetFramework="net452" />
2727
<package id="NuGet.Services.VirusScanning.Vcs" version="3.2.0" targetFramework="net452" />
2828
<package id="Owin" version="1.0" targetFramework="net452" />
2929
<package id="Serilog" version="2.0.0" targetFramework="net452" />

‎src/Validation.PackageSigning.Core/Validation.PackageSigning.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
</ItemGroup>
4040
<ItemGroup>
4141
<PackageReference Include="NuGet.Services.ServiceBus">
42-
<Version>2.12.0</Version>
42+
<Version>2.13.0</Version>
4343
</PackageReference>
4444
<PackageReference Include="NuGet.Services.Storage">
45-
<Version>2.12.0</Version>
45+
<Version>2.13.0</Version>
4646
</PackageReference>
4747
<PackageReference Include="NuGet.Services.Validation">
48-
<Version>2.12.0</Version>
48+
<Version>2.13.0</Version>
4949
</PackageReference>
5050
<PackageReference Include="WindowsAzure.Storage">
5151
<Version>7.1.2</Version>

‎src/Validation.PackageSigning.ExtractAndValidateSignature/SignaturePartsExtractor.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ private void InitializeTrustedTimestamp(
225225
PackageSignatureKey = packageSignature.Key,
226226
EndCertificate = thumbprintToEndCertificate[timestampEndCertificate.Thumbprint],
227227
Value = value,
228+
Status = TrustedTimestampStatus.Valid,
228229
};
229230
trustedTimestamp.EndCertificateKey = trustedTimestamp.EndCertificate.Key;
230231
packageSignature.TrustedTimestamps.Add(trustedTimestamp);

‎src/Validation.PackageSigning.ExtractAndValidateSignature/Validation.PackageSigning.ExtractAndValidateSignature.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,22 @@
109109
<Version>4.7.0-preview1-4886</Version>
110110
</PackageReference>
111111
<PackageReference Include="NuGet.Services.Configuration">
112-
<Version>2.12.0</Version>
112+
<Version>2.13.0</Version>
113113
</PackageReference>
114114
<PackageReference Include="NuGet.Services.Contracts">
115-
<Version>2.12.0</Version>
115+
<Version>2.13.0</Version>
116116
</PackageReference>
117117
<PackageReference Include="NuGet.Services.KeyVault">
118-
<Version>2.12.0</Version>
118+
<Version>2.13.0</Version>
119119
</PackageReference>
120120
<PackageReference Include="NuGet.Services.Logging">
121-
<Version>2.12.0</Version>
121+
<Version>2.13.0</Version>
122122
</PackageReference>
123123
<PackageReference Include="NuGet.Services.ServiceBus">
124-
<Version>2.12.0</Version>
124+
<Version>2.13.0</Version>
125125
</PackageReference>
126126
<PackageReference Include="NuGet.Services.Validation">
127-
<Version>2.12.0</Version>
127+
<Version>2.13.0</Version>
128128
</PackageReference>
129129
<PackageReference Include="NuGetGallery.Core">
130130
<Version>4.4.4-dev-19677</Version>

‎src/Validation.PackageSigning.ValidateCertificate/Validation.PackageSigning.ValidateCertificate.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@
105105
<Version>1.1.2</Version>
106106
</PackageReference>
107107
<PackageReference Include="NuGet.Services.Configuration">
108-
<Version>2.12.0</Version>
108+
<Version>2.13.0</Version>
109109
</PackageReference>
110110
<PackageReference Include="NuGet.Services.Contracts">
111-
<Version>2.12.0</Version>
111+
<Version>2.13.0</Version>
112112
</PackageReference>
113113
<PackageReference Include="NuGet.Services.KeyVault">
114-
<Version>2.12.0</Version>
114+
<Version>2.13.0</Version>
115115
</PackageReference>
116116
<PackageReference Include="NuGet.Services.Validation">
117-
<Version>2.12.0</Version>
117+
<Version>2.13.0</Version>
118118
</PackageReference>
119119
<PackageReference Include="System.Net.Http">
120120
<Version>4.3.3</Version>

‎src/Validation.Runner/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</dependentAssembly>
4848
<dependentAssembly>
4949
<assemblyIdentity name="NuGet.Services.KeyVault" publicKeyToken="31bf3856ad364e35" culture="neutral" />
50-
<bindingRedirect oldVersion="0.0.0.0-2.12.0.0" newVersion="2.12.0.0" />
50+
<bindingRedirect oldVersion="0.0.0.0-2.13.0.0" newVersion="2.13.0.0" />
5151
</dependentAssembly>
5252
<dependentAssembly>
5353
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />

0 commit comments

Comments
 (0)