Skip to content

[Backport 21.2.X] fix(core): avoid caching missing locale data #69352

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
SkyZeroZx wants to merge 1 commit into
base: 21.2.x
Choose a base branch
from
+20 −1
Open

[Backport 21.2.X] fix(core): avoid caching missing locale data #69352

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
11 changes: 10 additions & 1 deletion packages/core/src/i18n/locale_data_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,20 @@ export function getLocalePluralCase(locale: string): (value: number) => number {
*/
export function getLocaleData(normalizedLocale: string): any {
if (!(normalizedLocale in LOCALE_DATA)) {
LOCALE_DATA[normalizedLocale] =
const globalLocaleData =
global.ng &&
global.ng.common &&
global.ng.common.locales &&
global.ng.common.locales[normalizedLocale];
// Only cache global locale data when an entry is actually found, to avoid
// caching missing lookups. In SSR this cache is process-wide across requests,
// so caching `undefined` would retain attacker-controlled locale identifiers
// indefinitely. It would also make the `in` check above short-circuit on
// subsequent lookups and skip the global fallback.
if (globalLocaleData !== undefined) {
LOCALE_DATA[normalizedLocale] = globalLocaleData;
}
return globalLocaleData;
}
return LOCALE_DATA[normalizedLocale];
}
Expand Down
10 changes: 10 additions & 0 deletions packages/core/test/i18n/locale_data_api_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ describe('locale data api', () => {
expect(findLocaleData('de-CH')).toEqual(localeDeCH);
});

it('should not cache missing global locale data lookups', () => {
const localeEnNZ: any[] = ['en-NZ'];

expect(findLocaleData('en-NZ')).toEqual(localeEn);

global.ng.common.locales['en-nz'] = localeEnNZ;

expect(findLocaleData('en-NZ')).toBe(localeEnNZ);
});

it('should find the parent LOCALE_DATA if the exact locale is not available and the parent locale is on the global object', () => {
expect(findLocaleData('de-BE')).toEqual(localeDe);
});
Expand Down
Loading