Skip to content

Added package hash validation on restore #380

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

Open
ilchenkob wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added package hash validation on restore #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions build/modules/SitecoreImageBuilder/1.0.0/Public/Invoke-PackageRestore.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ function Invoke-PackageRestore
$expected | ForEach-Object {
$filePath = $_

$fileName = ($filePath.Replace(("{0}" -f $destinationPath), "")) -replace "([\/\\])", ""
$package = $packages.$fileName

if (Test-Path $filePath -PathType Leaf)
{
$requiredFile = Get-Item -Path $filePath

if ($requiredFile.Length -gt 0)
if ([string]::IsNullOrEmpty($package.hash) -And $(Get-Item -Path $filePath).Length -gt 0 -Or $package.hash -eq $(Get-FileHash -Path $filePath).Hash)
{
Write-Message ("Required package found: '{0}'" -f $filePath) -Level Debug

Expand All @@ -83,9 +84,6 @@ function Invoke-PackageRestore
Remove-Item -Path $filePath -Force
}

$fileName = ($filePath.Replace(("{0}" -f $destinationPath), "")) -replace "([\/\\])", ""
$package = $packages.$fileName

if ($null -eq $package)
{
throw ("Required package '{0}' was not defined in 'sitecore-packages.json' so it can't be downloaded, please add the package ' {1}' manually." -f $fileName, $filePath)
Expand Down Expand Up @@ -138,4 +136,4 @@ function Invoke-PackageRestore

$watch.Stop()
Write-Message "Restore completed. Time: $($watch.Elapsed.ToString("hh\:mm\:ss\.fff"))."
}
}
Loading