Skip to content
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

Jump to bottom

Better validation of style values #1121

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Better validation of style values #1121

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
27 changes: 23 additions & 4 deletions ts/util/Styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,9 @@ export class Styles {
* Patterns for style values and comments
*/
public static pattern: {[name: string]: RegExp} = {
style: /([-a-z]+)[\s\n]*:[\s\n]*((?:'[^']*'|"[^"]*"|\n|.)*?)[\s\n]*(?:;|$)/g,
sanitize: /['";]/,
value: /^((:?'(?:\\.|[^'])*(?:'|$)|"(?:\\.|[^"])*(?:"|$)|\n|\\.|[^'";])*?)(?:;|$).*/,
style: /([-a-z]+)[\s\n]*:[\s\n]*((?:'(?:\\.|[^'])*(?:'|$)|"(?:\\.|[^"])*(?:"|$)|\n|\\.|[^';])*?)[\s\n]*(?:;|$)/g,
comment: /\/\*[^]*?\*\//g
};

Expand Down Expand Up @@ -394,6 +396,23 @@ export class Styles {
this.parse(cssText);
}

/**
* @param {string} text The value to be sanitized
* @return {string} The sanitized value (removes ; and anything past that, and balances quotation marks)
*/
protected sanitizeValue(text: string): string {
let PATTERN = (this.constructor as typeof Styles).pattern;
if (!text.match(PATTERN.sanitize)) {
return text;
}
text = text.replace(PATTERN.value, '$1');
const test = text.replace(/\\./g, '').replace(/(['"]).*?\1/g, '').replace(/[^'"]/g, '');
if (test.length) {
text += test.charAt(0);
}
return text;
}

/**
* @return {string} The CSS string for the styles currently defined
*/
Expand All @@ -402,7 +421,7 @@ export class Styles {
for (const name of Object.keys(this.styles)) {
const parent = this.parentName(name);
if (!this.styles[parent]) {
styles.push(name + ': ' + this.styles[name] + ';');
styles.push(name + ': ' + this.sanitizeValue(this.styles[name]) + ';');
}
}
return styles.join(' ');
Expand Down Expand Up @@ -524,10 +543,10 @@ export class Styles {
protected parse(cssText: string = '') {
let PATTERN = (this.constructor as typeof Styles).pattern;
this.styles = {};
const parts = cssText.replace(PATTERN.comment, '').split(PATTERN.style);
const parts = cssText.replace(/\n/g, ' ').replace(PATTERN.comment, '').split(PATTERN.style);
while (parts.length > 1) {
let [space, name, value] = parts.splice(0, 3);
if (space.match(/[^\s\n]/)) return;
if (space.match(/[^\s\n;]/)) return;
this.set(name, value);
}
}
Expand Down