Skip to content
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.

Sign up for GitHub

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

Re-enable strong-naming #405

Merged
merged 5 commits into from
Feb 16, 2023
Merged

Re-enable strong-naming #405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2d8f96
- Re-enable strong-name signing during release build process (disable…
nwithan8 Nov 16, 2022
8a47fc4
- Add .NET 5 SDK to CI testing
nwithan8 Feb 15, 2023
6c7de1f
- Address feedback
nwithan8 Feb 15, 2023
77f9049
- Prep for using proper strong-name certificate
nwithan8 Feb 15, 2023
becb970
- Fix scripts
nwithan8 Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added EasyPost.pub
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions EasyPost/EasyPost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SignAssembly>false</SignAssembly>
<!-- We manually sign the DLLs later -->
<!-- Strong-name the assembly, required for .NET Framework compatibility -->
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\EasyPost.pub</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand All @@ -61,9 +63,9 @@
</ItemGroup>
<ItemGroup>
<None Include="..\README.md">
<Link>README.md</Link>
<Pack>true</Pack>
<PackagePath>/</PackagePath>
<Link>README.md</Link>
</None>
</ItemGroup>

Expand Down
9 changes: 6 additions & 3 deletions scripts/build_release_nuget.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,16 @@ CALL "scripts\install_cert.bat" %certFile% %certPass% %containerName% || GOTO :c
:: Restore dependencies and build solution
CALL "scripts\build_project.bat" %buildMode% || GOTO :commandFailed

:: Sign the DLLs
CALL "scripts\sign_dlls.bat" %certFile% %certPass% %containerName% || GOTO :commandFailed
:: Strong-name the DLLs
CALL "scripts\strong_name_dlls.bat" %containerName% || GOTO :commandFailed

:: Sign the DLLs for authenticity
CALL "scripts\sign_dlls.bat" %certFile% %certPass% || GOTO :commandFailed

:: Package the DLLs in a NuGet package (will fail if DLLs are missing)
CALL "scripts\pack_nuget.bat" %projectName% || GOTO :commandFailed

:: Sign the NuGet package
:: Sign the NuGet package for authenticity
CALL "scripts\sign_nuget.bat" %certFile% %certPass% || GOTO :commandFailed
SET nugetFileName=
FOR /R %%F IN (*.nupkg) DO (
Expand Down
11 changes: 3 additions & 8 deletions scripts/sign_dlls.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
:: This script will find and sign any DLLs with a provided PFX certificate
:: This script will find and sign any DLLs with a provided PFX certificate for authenticity

:: Requirements:
:: - dotnet is installed on the machine and is accessible everywhere (added to PATH) (might be in C:\Program Files\dotnet)
:: - sn.exe is installed on the machine and is accessible everywhere (added to PATH)
:: - signtool is installed on the machine and is accessible everywhere (added to PATH) (might be in C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64)

@ECHO OFF

:: Parse command line arguments
SET certFile=%1
SET certPass=%2
SET containerName=%3

:: Sign all DLLs found in the lib folder
:: Sign all DLLs found in the lib folder with our certificate to guarantee authenticity
@ECHO:
@ECHO Signing DLLs with certificate...
@ECHO Authenticating DLLs with %certFile%...
FOR /R "lib" %%F IN (*.dll) DO (
REM We need to run the DLLs through both sn.exe and signtool to get complete the signing process
REM sn erroneously triggers command failed if we put a fallback on this
sn -Rca "%%F" %containerName%
signtool sign /f %certFile% /p %certPass% /v /tr http://timestamp.digicert.com?alg=sha256 /td SHA256 /fd SHA256 "%%F" || GOTO :commandFailed
)

Expand Down
6 changes: 3 additions & 3 deletions scripts/sign_nuget.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:: This script will find and sign any NuGet packages with a provided PFX certificate
:: This script will find and sign any NuGet packages with a provided PFX certificate for authenticity

:: Requirements:
:: - NuGet is installed on the machine and is accessible everywhere (added to PATH)
Expand All @@ -9,9 +9,9 @@
SET certFile=%1
SET certPass=%2

:: Sign all NuGet packages found
:: Sign all NuGet packages found with our certificate to guarantee authenticity
@ECHO:
@ECHO Signing NuGet package with %certFile%...
@ECHO Authenticating NuGet package with %certFile%...
nwithan8 marked this conversation as resolved.
Show resolved Hide resolved
:: Should only be one .nupkg file at this point, since we deleted the old ones
FOR /R %%F IN (*.nupkg) DO (
nuget sign "%%F" -Timestamper http://timestamp.digicert.com -CertificatePath "%certFile%" -CertificatePassword "%certPass%" || GOTO :commandFailed
Expand Down
28 changes: 28 additions & 0 deletions scripts/strong_name_dlls.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
:: This script will find and finish strong-naming any DLLs with a provided PFX certificate

:: Requirements:
:: - dotnet is installed on the machine and is accessible everywhere (added to PATH) (might be in C:\Program Files\dotnet)
:: - sn.exe is installed on the machine and is accessible everywhere (added to PATH)

@ECHO OFF

:: Parse command line arguments
SET containerName=%1

:: Strong-name all DLLs found in the lib folder
@ECHO:
@ECHO Strong-naming (finishing delayed signing) DLLs with %certFile%...
FOR /R "lib" %%F IN (*.dll) DO (
REM sn erroneously triggers command failed if we put a fallback on this
sn -Rca "%%F" %containerName%
)

EXIT /B 0

:commandFailed
@ECHO Command failed.
GOTO :exitWithError

:exitWithError
@ECHO Exiting...
EXIT /B 1