Skip to content

dhall freeze: Remove cache import expression before a secure freeze #2486

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

Merged
mmhat merged 3 commits into from
Feb 1, 2023
Merged

dhall freeze: Remove cache import expression before a secure freeze #2486

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a1f5f6
dhall freeze: Remove cache import expression before a secure freeze
mmhat Feb 1, 2023
3d06da0
Simplify imports after freezing
mmhat Feb 1, 2023
4af747f
Added tests for secure freezing
mmhat Feb 1, 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
19 changes: 18 additions & 1 deletion dhall/src/Dhall/Freeze.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,26 @@ freezeExpressionWithSettings settings directory scope intent expression = do
cache expression_ =
return expression_

let uncache
(ImportAlt
(Core.shallowDenote -> Embed
Import{ importHashed = ImportHashed { hash = Just expectedHash, importType = Missing } }
)
(Core.shallowDenote -> Embed
import_@Import{ importHashed = ImportHashed{ hash = Nothing } }
)
) = Embed
(import_
{ importHashed = (importHashed import_)
{ hash = Just expectedHash
}
}
)
uncache expression_ = expression_

case intent of
Secure ->
traverse freezeFunction expression
traverse freezeFunction (Dhall.Optics.transformOf Core.subExpressions uncache expression)
Cache ->
Dhall.Optics.transformMOf Core.subExpressions cache expression

Expand Down