1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
Description: fix CVE-2024-43805
Author: Michał Krassowski
Origin: upstream, https://github.com/jupyterlab/jupyterlab/commit/88e24baa
Bug: https://security-tracker.debian.org/tracker/CVE-2024-43805
Bug-Debian: https://bugs.debian.org/1082871
Forwarded: not-needed
Applied-Upstream: 4.2.5, commit:88e24baa
Reviewed-By: Yadd <yadd@debian.org>
Last-Update: 2024-11-19
--- a/packages/apputils-extension/schema/sanitizer.json
+++ b/packages/apputils-extension/schema/sanitizer.json
@@ -19,6 +19,12 @@
"title": "Autolink URL replacement",
"description": "Whether to replace URLs with links or not.",
"default": true
+ },
+ "allowNamedProperties": {
+ "type": "boolean",
+ "title": "Allow named properties",
+ "description": "Whether to allow untrusted elements to include `name` and `id` attributes. These attributes are stripped by default to prevent DOM clobbering attacks.",
+ "default": false
}
},
"type": "object"
--- a/packages/apputils-extension/src/index.ts
+++ b/packages/apputils-extension/src/index.ts
@@ -684,12 +684,15 @@
.composite as Array<string>;
const autolink = setting.get('autolink').composite as boolean;
+ const allowNamedProperties = setting.get('allowNamedProperties')
+ .composite as boolean;
if (allowedSchemes) {
sanitizer.setAllowedSchemes(allowedSchemes);
}
sanitizer.setAutolink(autolink);
+ sanitizer.setAllowNamedProperties(allowNamedProperties);
};
// Wait for the application to be restored and
--- a/packages/apputils/src/sanitizer.ts
+++ b/packages/apputils/src/sanitizer.ts
@@ -434,6 +434,10 @@
* A class to sanitize HTML strings.
*/
export class Sanitizer implements IRenderMime.ISanitizer {
+ constructor() {
+ this._options = this._generateOptions();
+ }
+
/**
* Sanitize an HTML string.
*
@@ -473,9 +477,18 @@
this._autolink = autolink;
}
- private _autolink: boolean = true;
+ /**
+ * Set the whether to allow `name` and `id` attributes.
+ */
+ setAllowNamedProperties(allowNamedProperties: boolean): void {
+ this._allowNamedProperties = allowNamedProperties;
+ this._options = this._generateOptions();
+ }
- private _options: sanitize.IOptions = {
+ private _autolink: boolean = true;
+ private _allowNamedProperties: boolean = false;
+ private _options: sanitize.IOptions;
+ private _generateOptions = (): sanitize.IOptions => ({
// HTML tags that are allowed to be used. Tags were extracted from Google Caja
allowedTags: [
'a',
@@ -590,7 +603,7 @@
'dir',
'draggable',
'hidden',
- 'id',
+ ...(this._allowNamedProperties ? ['id'] : []),
'inert',
'itemprop',
'itemref',
@@ -607,7 +620,7 @@
'coords',
'href',
'hreflang',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'rel',
'shape',
'tabindex',
@@ -641,7 +654,7 @@
'data-commandlinker-args',
'data-commandlinker-command',
'disabled',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'tabindex',
'type',
'value'
@@ -672,7 +685,7 @@
'autocomplete',
'enctype',
'method',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'novalidate'
],
h1: ['align'],
@@ -697,7 +710,7 @@
'height',
'hspace',
'ismap',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'src',
'usemap',
'vspace',
@@ -718,7 +731,7 @@
'maxlength',
'min',
'multiple',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'placeholder',
'readonly',
'required',
@@ -734,13 +747,13 @@
label: ['accesskey', 'for'],
legend: ['accesskey', 'align'],
li: ['type', 'value'],
- map: ['name'],
+ map: this._allowNamedProperties ? ['name'] : [],
menu: ['compact', 'label', 'type'],
meter: ['high', 'low', 'max', 'min', 'value'],
ol: ['compact', 'reversed', 'start', 'type'],
optgroup: ['disabled', 'label'],
option: ['disabled', 'label', 'selected', 'value'],
- output: ['for', 'name'],
+ output: ['for', ...(this._allowNamedProperties ? ['name'] : [])],
p: ['align'],
pre: ['width'],
progress: ['max', 'min', 'value'],
@@ -749,7 +762,7 @@
'autocomplete',
'disabled',
'multiple',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'required',
'size',
'tabindex'
@@ -789,7 +802,7 @@
'cols',
'disabled',
'inputmode',
- 'name',
+ ...(this._allowNamedProperties ? ['name'] : []),
'placeholder',
'readonly',
'required',
@@ -982,5 +995,5 @@
// Since embedded data is no longer deemed to be a threat, validation can be skipped.
// See https://github.com/jupyterlab/jupyterlab/issues/5183
allowedSchemesAppliedToAttributes: ['href', 'cite']
- };
+ });
}
|
