upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 00:02:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Enable signing check. Fix logs.

Browse source
This commit is contained in:
Adrien Ferrand 2020-02-13 21:45:22 +01:00
parent 6e8e6e4d48
commit d90b0c2b20
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
certbot-ci/windows_installer_integration_tests/test_main.py
View file

@ -142,7 +142,7 @@ def test_base(installer):
This test checks that the Certbot installer installs correctly Certbot, including a fully
functional automated renewal mechanism through a Windows scheduled task.
"""
_assert_certbot_is_broken()
_assert_certbot_is_missing()
# Install certbot
subprocess.check_output([installer, '/S'])
@ -183,7 +183,7 @@ def test_upgrade(upgrade_env):
# Break Certbot on purpose
_ps('Remove-Item "${env:ProgramFiles(x86)}\\Certbot\\bin\\certbot.exe" -Confirm:$false')
_assert_certbot_is_broken()
_assert_certbot_is_missing()
# Trigger the renew + auto-upgrade task, expecting Certbot to be reinstalled and functional again.
now = time.time()
@ -193,7 +193,7 @@ def test_upgrade(upgrade_env):
subprocess.check_output(['certbot', '--version'])
def _assert_certbot_is_broken():
def _assert_certbot_is_missing():
try:
subprocess.check_output(['certbot', '--version'])
except (subprocess.CalledProcessError, OSError):

27
windows-installer/auto-update.ps1
View file

@ -2,15 +2,15 @@
param()
begin {}
process {
New-EventLog -Source "auto-update.ps1" -LogName "CertbotAutoUpdate" -ErrorAction SilentlyContinue
New-EventLog -Source "certbot/auto-update.ps1" -LogName "CertbotAutoUpdate" -ErrorAction SilentlyContinue
function Write-Message($message, $level = "Information") {
Write-EventLog -Source "auto-update.ps1" -LogName "CertbotAutoUpdate" -EventID 1 -EntryType $level -Message $message
Write-EventLog -Source "certbot/auto-update.ps1" -LogName "CertbotAutoUpdate" -EventID 1 -EntryType $level -Message $message
Write-Host $message
}
function Write-Error($message) {
Write-EventLog -Source "auto-update.ps1" -LogName "CertbotAutoUpdate" -EventID 1 -EntryType Error -Message $message
Write-EventLog -Source "certbot/auto-update.ps1" -LogName "CertbotAutoUpdate" -EventID 1 -EntryType Error -Message $message
throw $message
}
@ -97,17 +97,16 @@ Aborting auto-upgrade process.
# Check installer has a valid signature from the Certbot release team
$signature = Get-AuthenticodeSignature $installerPath
# # Uncomment the following lines of code once the Certbot installer is correctly signed.
# if ($signature.Status -ne 'Valid') {
# throw "Downloaded installer has no or invalid Authenticode signature."
# }
# $publicKey = $certbotSigningPubKey -replace '-+.*-+' -replace "`n" -replace "`r"
# $refBinaryPublicKey = [System.Convert]::FromBase64String($publicKey)
# $curBinaryPublicKey = $signature.SignerCertificate.PublicKey.EncodedKeyValue.RawData
# $diff = Compare-Object -ReferenceObject $refBinaryPublicKey -DifferenceObject $curBinaryPublicKey
# if ($diff) {
# throw "Downloaded installer has not been signed by Certbot development team."
# }
if ($signature.Status -ne 'Valid') {
throw "Downloaded installer has no or invalid Authenticode signature."
}
$publicKey = $certbotSigningPubKey -replace '-+.*-+' -replace "`n" -replace "`r"
$refBinaryPublicKey = [System.Convert]::FromBase64String($publicKey)
$curBinaryPublicKey = $signature.SignerCertificate.PublicKey.EncodedKeyValue.RawData
$diff = Compare-Object -ReferenceObject $refBinaryPublicKey -DifferenceObject $curBinaryPublicKey
if ($diff) {
throw "Downloaded installer has not been signed by Certbot development team."
}
if (Test-Path $installDir\uninstall.exe) {
# Uninstall old Certbot first