This repository was archived by the owner on Apr 12, 2024. It is now read-only.
fix($templateRequest): Handle empty templates in cache correctly. #14496
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes angular#14479, where $templateRequest looks for truthiness of $templateCache.get, while it should look for definedness instead.
| @@ -68,8 +68,14 @@ function $TemplateRequestProvider() { | |||
| // are included in there. This also makes Angular accept any script | |||
| // directive, no matter its name. However, we still need to unwrap trusted | |||
| // types. | |||
| if (!isString(tpl) || !$templateCache.get(tpl)) { | |||
There was a problem hiding this comment.
Couldn't you just change this line to ... || isUndefined($templateCache.get(tpl))... and leave everythng else unchanged ?
There was a problem hiding this comment.
The reasoning is that people asked for wrong fixes several times, so my original code was probably confusing. I've unrolled the if to accomodate clearer comments, but that can be reverted if you prefer.
Edit : No point making this longer than needed, actually. Reverted to the simpler version.
…check. Following gkalpak's comments on the PR.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Bug fix.
What is the current behavior? (You can also link to an open issue here)
Empty templates in $templateCache are not considered as in cache for $templateRequest security purposes, so they trigger $sce checks. Specifically, $templateRequest calls $templateCache.get, but looks for the falsiness of the return value instead of it being defined.
What is the new behavior (if this is a feature change)?
Empty templates in $templateCache are now considered as trusted as any other in $templateCache.
Does this PR introduce a breaking change?
No.
Please check if the PR fulfills these requirements
I'm not sure docs are necessary, as this bug wasn't documented.
Other information:
Fixes #14479.