diff options
| author | Chirayu Krishnappa | 2013-10-17 19:44:36 -0700 | 
|---|---|---|
| committer | Chirayu Krishnappa | 2013-10-30 17:01:51 -0700 | 
| commit | 3d6a89e8888b14ae5cb5640464e12b7811853c7e (patch) | |
| tree | 9fd167fd0bd210569b507a80d91f0787b9278b84 /test | |
| parent | 5b620653f61ae3d9f1de8346de271752fa12f26f (diff) | |
| download | angular.js-3d6a89e8888b14ae5cb5640464e12b7811853c7e.tar.bz2 | |
feat($parse): secure expressions by hiding "private" properties
BREAKING CHANGE:
This commit introduces the notion of "private" properties (properties
whose names begin and/or end with an underscore) on the scope chain.
These properties will not be available to Angular expressions (i.e. {{
}} interpolation in templates and strings passed to `$parse`)  They are
freely available to JavaScript code (as before).
Motivation
----------
Angular expressions execute in a limited context.  They do not have
direct access to the global scope, Window, Document or the Function
constructor.  However, they have direct access to names/properties on
the scope chain.  It has been a long standing best practice to keep
sensitive APIs outside of the scope chain (in a closure or your
controller.)  That's easier said that done for two reasons: (1)
JavaScript does not have a notion of private properties so if you need
someone on the scope chain for JavaScript use, you also expose it to
Angular expressions, and (2) the new "controller as" syntax that's now
in increased usage exposes the entire controller on the scope chain
greatly increaing the exposed surface.  Though Angular expressions are
written and controlled by the developer, they (1) typically deal with
user input and (2) don't get the kind of test coverage that JavaScript
code would.  This commit provides a way, via a naming convention, to
allow publishing/restricting properties from controllers/scopes to
Angular expressions enabling one to only expose those properties that
are actually needed by the expressions.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ng/parseSpec.js | 67 | 
1 files changed, 65 insertions, 2 deletions
| diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js index d7d0d941..c72b7e81 100644 --- a/test/ng/parseSpec.js +++ b/test/ng/parseSpec.js @@ -591,6 +591,57 @@ describe('parser', function() {        });        describe('sandboxing', function() { +        describe('private members', function() { +          it('should NOT allow access to private members', function() { +            forEach(['_name', 'name_', '_', '_name_'], function(name) { +              function _testExpression(expression) { +                scope.a = {b: name}; +                scope[name] = {a: scope.a}; +                scope.piece_1 = "XX" + name.charAt(0) + "XX"; +                scope.piece_2 = "XX" + name.substr(1) + "XX"; +                expect(function() { +                  scope.$eval(expression); +                }).toThrowMinErr( +                        '$parse', 'isecprv', 'Referencing private fields in Angular expressions is disallowed! ' + +                        'Expression: ' + expression); +              } + +              function testExpression(expression) { +                if (expression.indexOf('"NAME"') != -1) { +                  var concatExpr = 'piece_1.substr(2, 1) + piece_2.substr(2, LEN)'.replace('LEN', name.length-1); +                  _testExpression(expression.replace(/"NAME"/g, concatExpr)); +                  _testExpression(expression.replace(/"NAME"/g, '(' + concatExpr + ')')); +                } +                _testExpression(expression.replace(/NAME/g, name)); +              } + +              // Not all of these are exploitable.  The tests ensure that the contract is honored +              // without caring about the implementation or exploitability. +              testExpression('NAME');                testExpression('NAME = 1'); +              testExpression('(NAME)');              testExpression('(NAME) = 1'); +              testExpression('a.NAME');              testExpression('a.NAME = 1'); +              testExpression('NAME.b');              testExpression('NAME.b = 1'); +              testExpression('a.NAME.b');            testExpression('a.NAME.b = 1'); +              testExpression('NAME()');              testExpression('NAME() = 1'); +              testExpression('(NAME)()');            testExpression('(NAME = 1)()'); +              testExpression('(NAME).foo()');        testExpression('(NAME = 1).foo()'); +              testExpression('a.NAME()');            testExpression('a.NAME() = 1'); +              testExpression('a.NAME.foo()');        testExpression('a.NAME.foo()'); +              testExpression('foo(NAME)');           testExpression('foo(NAME = 1)'); +              testExpression('foo(a.NAME)');         testExpression('foo(a.NAME = 1)'); +              testExpression('foo(1, a.NAME)');      testExpression('foo(1, a.NAME = 1)'); +              testExpression('foo(a["NAME"])');      testExpression('foo(a["NAME"] = 1)'); +              testExpression('foo(1, a["NAME"])');   testExpression('foo(1, a["NAME"] = 1)'); +              testExpression('foo(b = a["NAME"])');  testExpression('foo(b = (a["NAME"] = 1))'); +              testExpression('a["NAME"]');           testExpression('a["NAME"] = 1'); +              testExpression('a["NAME"]()'); +              testExpression('a["NAME"].foo()'); +              testExpression('a.b["NAME"]');         testExpression('a.b["NAME"] = 1'); +              testExpression('a["b"]["NAME"]');      testExpression('a["b"]["NAME"] = 1'); +            }); +          }); +        }); +          describe('Function constructor', function() {            it('should NOT allow access to Function constructor in getter', function() {              expect(function() { @@ -651,17 +702,29 @@ describe('parser', function() {              expect(function() {                scope.$eval('{}.toString["constructor"]["constructor"] = 1');              }).toThrowMinErr( -                    '$parse', 'isecfn', 'Referencing Function in Angular expressions is disallowed! ' + +                    '$parse', 'isecfld', 'Referencing "constructor" field in Angular expressions is disallowed! ' +                      'Expression: {}.toString["constructor"]["constructor"] = 1');              scope.key1 = "const";              scope.key2 = "ructor";              expect(function() { +              scope.$eval('{}.toString[key1 + key2].foo'); +            }).toThrowMinErr( +                    '$parse', 'isecfn', 'Referencing Function in Angular expressions is disallowed! ' + +                    'Expression: {}.toString[key1 + key2].foo'); + +            expect(function() { +              scope.$eval('{}.toString[key1 + key2] = 1'); +            }).toThrowMinErr( +                    '$parse', 'isecfld', 'Referencing "constructor" field in Angular expressions is disallowed! ' + +                    'Expression: {}.toString[key1 + key2] = 1'); + +            expect(function() {                scope.$eval('{}.toString[key1 + key2].foo = 1');              }).toThrowMinErr(                      '$parse', 'isecfn', 'Referencing Function in Angular expressions is disallowed! ' + -                        'Expression: {}.toString[key1 + key2].foo = 1'); +                    'Expression: {}.toString[key1 + key2].foo = 1');              expect(function() {                scope.$eval('{}.toString["constructor"]["a"] = 1'); | 
