JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for CSP context without "unsafe-eval".

Browse Source
This commit is contained in:
FelisCatus 2014-08-05 17:58:54 +08:00
parent e3066f9577
commit c3890faeac
3 changed files with 95 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/ast.js
View File

@ -50,15 +50,27 @@ function DEFNODE(type, props, methods, base) {
var self_props = props;
if (base && base.PROPS)
props = props.concat(base.PROPS);
var code = "return function AST_" + type + "(props){ if (props) { ";
for (var i = props.length; --i >= 0;) {
code += "this." + props[i] + " = props." + props[i] + ";";
}
var proto = base && new base;
if (proto && proto.initialize || (methods && methods.initialize))
code += "this.initialize();";
code += "}}";
var ctor = new Function(code)();
var ctor;
if (typeof UglifyJS_NoUnsafeEval === "undefined") {
var code = "return function AST_" + type + "(props){ if (props) { ";
for (var i = props.length; --i >= 0;) {
code += "this." + props[i] + " = props." + props[i] + ";";
}
if (proto && proto.initialize || (methods && methods.initialize))
code += "this.initialize();";
code += "}}";
ctor = new Function(code)();
} else {
ctor = function (values) {
if (values) {
for (var i = props.length; --i >= 0; )
this[props[i]] = values[props[i]];
if (proto && proto.initialize || (methods && methods.initialize))
this.initialize();
}
};
}
if (proto) {
ctor.prototype = proto;
ctor.BASE = base;

70
lib/mozilla-ast.js
View File

@ -394,6 +394,76 @@
};
function map(moztype, mytype, propmap) {
if (typeof UglifyJS_NoUnsafeEval !== "undefined") {
var prop_list = [];
if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop) {
var m = /([a-z0-9$_]+)(=|@|>|%)([a-z0-9$_]+)/i.exec(prop);
if (!m) throw new Error("Can't understand property map: " + prop);
if ('=@>%'.indexOf(m[2]) < 0) {
throw new Error("Can't understand operator in propmap: " + prop);
}
prop_list.push(m);
});
var moz_to_me = function (M) {
var props = {
start: my_start_token(M),
end: my_end_token(M)
};
for (var i = 0; i < prop_list.length; i++) {
var m = prop_list[i];
var moz = m[1], how = m[2], my = m[3];
var mozProp = M[moz];
var myProp;
switch (how) {
case "@":
myProp = mozProp.map(from_moz);
break;
case ">":
myProp = from_moz(mozProp);
break;
case "=":
myProp = mozProp;
break;
case "%":
myProp = from_moz(mozProp).body;
break;
}
props[my] = myProp;
}
return new mytype(props);
};
var me_to_moz = function (M) {
var props = {
type: moztype
};
for (var i = 0; i < prop_list.length; i++) {
var m = prop_list[i];
var moz = m[1], how = m[2], my = m[3];
var myProp = M[my];
var mozProp;
switch (how) {
case "@":
mozProp = myProp.map(to_moz);
break;
case ">":
mozProp = to_moz(myProp);
break;
case "=":
mozProp = myProp;
break;
case "%":
mozProp = to_moz_block(M);
break;
}
props[moz] = mozProp;
}
return props;
};
MOZ_TO_ME[moztype] = moz_to_me;
def_to_moz(mytype, me_to_moz);
return;
}
var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
moz_to_me += "return new " + mytype.name + "({\n" +
"start: my_start_token(M),\n" +

5
lib/utils.js
View File

@ -219,6 +219,11 @@ function set_intersection(a, b) {
// [1] https://github.com/marijnh/acorn
function makePredicate(words) {
if (!(words instanceof Array)) words = words.split(" ");
if (typeof UglifyJS_NoUnsafeEval !== "undefined") {
return function (str) {
return words.indexOf(str) >= 0;
};
}
var f = "", cats = [];
out: for (var i = 0; i < words.length; ++i) {
for (var j = 0; j < cats.length; ++j)