cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): support sanitizer value in the [style] bindings (#35564)

Browse Source 
When binding to `[style]` we correctly sanitized/unwrapped properties but we did not do it for the object itself.

```
@HostBinding("style")
style: SafeStyle = this.sanitizer.bypassSecurityTrustStyle(
    "background: red; color: white; display: block;"
  );
```

Above code would fail since the `[style]` would not unwrap the `SafeValue` and would treat it as object resulting in incorrect behavior.

Fix #35476 (FW-1875)

PR Close #35564
This commit is contained in:
Misko Hevery
2020-02-19 13:15:36 -08:00
committed by Miško Hevery
parent 975a11b37f
commit 3af103aa61
2 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/core/src/render3/instructions/styling.ts
View File

@ -625,23 +625,25 @@ export function getHostDirectiveDef(tData: TData): DirectiveDef<any>|null {
export function toStylingKeyValueArray(
keyValueArraySet: (keyValueArray: KeyValueArray<any>, key: string, value: any) => void,
stringParser: (styleKeyValueArray: KeyValueArray<any>, text: string) => void,
value: string|string[]|{[key: string]: any}|null|undefined): KeyValueArray<any> {
value: string|string[]|{[key: string]: any}|SafeValue|null|undefined): KeyValueArray<any> {
if (value == null /*|| value === undefined */ || value === '') return EMPTY_ARRAY as any;
const styleKeyValueArray: KeyValueArray<any> = [] as any;
if (Array.isArray(value)) {
for (let i = 0; i < value.length; i++) {
keyValueArraySet(styleKeyValueArray, value[i], true);
const unwrappedValue = unwrapSafeValue(value) as string | string[] | {[key: string]: any};
if (Array.isArray(unwrappedValue)) {
for (let i = 0; i < unwrappedValue.length; i++) {
keyValueArraySet(styleKeyValueArray, unwrappedValue[i], true);
}
} else if (typeof value === 'object') {
for (const key in value) {
if (value.hasOwnProperty(key)) {
keyValueArraySet(styleKeyValueArray, key, value[key]);
} else if (typeof unwrappedValue === 'object') {
for (const key in unwrappedValue) {
if (unwrappedValue.hasOwnProperty(key)) {
keyValueArraySet(styleKeyValueArray, key, unwrappedValue[key]);
}
}
} else if (typeof value === 'string') {
stringParser(styleKeyValueArray, value);
} else if (typeof unwrappedValue === 'string') {
stringParser(styleKeyValueArray, unwrappedValue);
} else {
ngDevMode && throwError('Unsupported styling type ' + typeof value + ': ' + value);
ngDevMode &&
throwError('Unsupported styling type ' + typeof unwrappedValue + ': ' + unwrappedValue);
}
return styleKeyValueArray;
}