Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-19 08:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added an extra security check to make sure that the parser can not execute anything while evaluting JSON.

Browse source
This commit is contained in:
Misko Hevery 2011-01-04 13:23:39 -08:00
parent cf891428bf
commit 5f080193cb
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/parser.js
View file

@ -216,7 +216,26 @@ function lex(text, parseStringsForObjects){
function parser(text, json){ function parser(text, json){
var ZERO = valueFn(0), var ZERO = valueFn(0),
tokens = lex(text, json); tokens = lex(text, json),
assignment = _assignment,
functionCall = _functionCall,
fieldAccess = _fieldAccess,
objectIndex = _objectIndex,
filterChain = _filterChain,
functionIdent = _functionIdent,
pipeFunction = _pipeFunction;
if(json){
// The extra level of aliasing is here, just in case the lexer misses something, so that
// we prevent any accidental execution in JSON.
assignment = logicalOR;
functionCall =
fieldAccess =
objectIndex =
filterChain =
functionIdent =
pipeFunction =
function (){ throwError("is not valid json", {text:text, index:0}); };
}
return { return {
assertAllConsumed: assertAllConsumed, assertAllConsumed: assertAllConsumed,
primary: primary, primary: primary,
@ -314,7 +333,7 @@ function parser(text, json){
} }
} }
function filterChain(){ function _filterChain(){
var left = expression(); var left = expression();
var token; var token;
while(true) { while(true) {
@ -334,7 +353,7 @@ function parser(text, json){
return pipeFunction(angularValidator); return pipeFunction(angularValidator);
} }
function pipeFunction(fnScope){ function _pipeFunction(fnScope){
var fn = functionIdent(fnScope); var fn = functionIdent(fnScope);
var argsFn = []; var argsFn = [];
var token; var token;
@ -360,7 +379,7 @@ function parser(text, json){
return assignment(); return assignment();
} }
function assignment(){ function _assignment(){
var left = logicalOR(); var left = logicalOR();
var right; var right;
var token; var token;
@ -448,7 +467,7 @@ function parser(text, json){
} }
} }
function functionIdent(fnScope) { function _functionIdent(fnScope) {
var token = expect(); var token = expect();
var element = token.text.split('.'); var element = token.text.split('.');
var instance = fnScope; var instance = fnScope;
@ -496,7 +515,7 @@ function parser(text, json){
return primary; return primary;
} }
function fieldAccess(object) { function _fieldAccess(object) {
var field = expect().text; var field = expect().text;
var getter = getterFn(field); var getter = getterFn(field);
return extend(function (self){ return extend(function (self){
@ -508,7 +527,7 @@ function parser(text, json){
}); });
} }
function objectIndex(obj) { function _objectIndex(obj) {
var indexFn = expression(); var indexFn = expression();
consume(']'); consume(']');
return extend( return extend(
@ -523,7 +542,7 @@ function parser(text, json){
}); });
} }
function functionCall(fn) { function _functionCall(fn) {
var argsFn = []; var argsFn = [];
if (peekToken().text != ')') { if (peekToken().text != ')') {
do { do {