Skip to content

Commit f124c04

Browse files
committed
feat($interpolate): escaped interpolation expressions
This CL enables interpolation expressions to be escaped, by prefixing each character of their start/end markers with a REVERSE SOLIDUS U+005C, and to render the escaped expression as a regular interpolation expression. Example: `<span ng-init="foo='Hello'">{{foo}}, \\{\\{World!\\}\\}</span>` would be rendered as: `<span ng-init="foo='Hello'">Hello, {{World!}}</span>` This will also work with custom interpolation markers, for example: module. config(function($interpolateProvider) { $interpolateProvider.startSymbol('\\\\'); $interpolateProvider.endSymbol('//'); }). run(function($interpolate) { // Will alert with "hello\\bar//": alert($interpolate('\\\\foo//\\\\\\\\bar\\/\\/')({foo: "hello", bar: "world"})); }); This change effectively only changes the rendering of these escaped markers, because they are not context-aware, and are incapable of preventing nested expressions within those escaped markers from being evaluated. Therefore, backends are encouraged to ensure that when escaping expressions for security reasons, every single instance of a start or end marker have each of its characters prefixed with a backslash (REVERSE SOLIDUS, U+005C) Closes angular#5601
1 parent 95cdb53 commit f124c04

File tree

2 files changed

+56
-1
lines changed

2 files changed

+56
-1
lines changed

Diff for: src/ng/interpolate.js

+15-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,15 @@ function $InterpolateProvider() {
8181

8282
this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
8383
var startSymbolLength = startSymbol.length,
84-
endSymbolLength = endSymbol.length;
84+
endSymbolLength = endSymbol.length,
85+
escapedStartSymbol = startSymbol.replace(/./g, escape),
86+
escapedEndSymbol = endSymbol.replace(/./g, escape),
87+
escapedStartRegexp = new RegExp(escapedStartSymbol.replace(/./g, escape), 'g'),
88+
escapedEndRegexp = new RegExp(escapedEndSymbol.replace(/./g, escape), 'g');
89+
90+
function escape(ch) {
91+
return '\\' + ch;
92+
}
8593

8694
/**
8795
* @ngdoc service
@@ -180,6 +188,12 @@ function $InterpolateProvider() {
180188
separators.push('');
181189
}
182190

191+
forEach(separators, function(key, i) {
192+
separators[i] = separators[i].
193+
replace(escapedStartRegexp, startSymbol).
194+
replace(escapedEndRegexp, endSymbol);
195+
});
196+
183197
// Concatenating expressions makes it hard to reason about whether some combination of
184198
// concatenated values are unsafe to use and could easily lead to XSS. By requiring that a
185199
// single expression be used for iframe[src], object[src], etc., we ensure that the value

Diff for: test/ng/interpolateSpec.js

+41
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,47 @@ describe('$interpolate', function() {
6161
}));
6262

6363

64+
describe('interpolation escaping', function() {
65+
var obj;
66+
67+
beforeEach(function() {
68+
obj = {foo: 'Hello', bar: 'World'};
69+
});
70+
71+
it('should support escaping interpolation signs', inject(function($interpolate) {
72+
expect($interpolate('{{foo}} \\{\\{bar\\}\\}')(obj)).toBe('Hello {{bar}}');
73+
expect($interpolate('\\{\\{foo\\}\\} {{bar}}')(obj)).toBe('{{foo}} World');
74+
}));
75+
76+
77+
it('should unescape multiple expressions', inject(function($interpolate) {
78+
expect($interpolate('\\{\\{foo\\}\\}\\{\\{bar\\}\\} {{foo}}')(obj)).toBe('{{foo}}{{bar}} Hello');
79+
expect($interpolate('{{foo}}\\{\\{foo\\}\\}\\{\\{bar\\}\\}')(obj)).toBe('Hello{{foo}}{{bar}}');
80+
expect($interpolate('\\{\\{foo\\}\\}{{foo}}\\{\\{bar\\}\\}')(obj)).toBe('{{foo}}Hello{{bar}}');
81+
expect($interpolate('{{foo}}\\{\\{foo\\}\\}{{bar}}\\{\\{bar\\}\\}{{foo}}')(obj)).toBe('Hello{{foo}}World{{bar}}Hello');
82+
}));
83+
84+
85+
it('should support customizing escape signs', function() {
86+
module(function($interpolateProvider) {
87+
$interpolateProvider.startSymbol('[[');
88+
$interpolateProvider.endSymbol(']]');
89+
});
90+
inject(function($interpolate) {
91+
expect($interpolate('[[foo]] \\[\\[bar\\]\\]')(obj)).toBe('Hello [[bar]]');
92+
});
93+
});
94+
95+
96+
it('should unescape incomplete escaped expressions', inject(function($interpolate) {
97+
expect($interpolate('\\{\\{foo{{foo}}')(obj)).toBe('{{fooHello');
98+
expect($interpolate('\\}\\}foo{{foo}}')(obj)).toBe('}}fooHello');
99+
expect($interpolate('foo{{foo}}\\{\\{')(obj)).toBe('fooHello{{');
100+
expect($interpolate('foo{{foo}}\\}\\}')(obj)).toBe('fooHello}}');
101+
}));
102+
});
103+
104+
64105
describe('interpolating in a trusted context', function() {
65106
var sce;
66107
beforeEach(function() {

0 commit comments

Comments
 (0)