diff --git a/lib/rule_default.js b/lib/rule_default.js index 5470900..ccccad9 100644 --- a/lib/rule_default.js +++ b/lib/rule_default.js @@ -14,7 +14,7 @@ function saveMapConfig(content,cb){ new Promise(function(resolve,reject){ var anyproxyHome = utils.getAnyProxyHome(), mapCfgPath = path.join(anyproxyHome,configFile); - + if(typeof content == "object"){ content = JSON.stringify(content); } @@ -74,7 +74,7 @@ setTimeout(function(){ module.exports = { summary:function(){ - var tip = "the default rule for AnyProxy which supports CORS."; + var tip = "the default rule for AnyProxy."; if(!isRootCAFileExists){ tip += "\nRoot CA does not exist, will not intercept any https requests."; } @@ -83,27 +83,21 @@ module.exports = { shouldUseLocalResponse : function(req,reqBody){ //intercept all options request - if(req.method == "OPTIONS"){ - return true; - }else{ - var simpleUrl = (req.headers.host || "") + (req.url || ""); - mapConfig.map(function(item){ - var key = item.keyword; - if(simpleUrl.indexOf(key) >= 0){ - req.anyproxy_map_local = item.local; - return false; - } - }); + var simpleUrl = (req.headers.host || "") + (req.url || ""); + mapConfig.map(function(item){ + var key = item.keyword; + if(simpleUrl.indexOf(key) >= 0){ + req.anyproxy_map_local = item.local; + return false; + } + }); - return !!req.anyproxy_map_local; - } + return !!req.anyproxy_map_local; }, dealLocalResponse : function(req,reqBody,callback){ - if(req.method == "OPTIONS"){ - callback(200,mergeCORSHeader(req.headers),""); - }else if(req.anyproxy_map_local){ + if(req.anyproxy_map_local){ fs.readFile(req.anyproxy_map_local,function(err,buffer){ if(err){ callback(200, {}, "[AnyProxy failed to load local file] " + err); @@ -127,11 +121,10 @@ module.exports = { }, replaceResponseHeader: function(req,res,header){ - return mergeCORSHeader(req.headers, header); }, // Deprecated - // replaceServerResData: function(req,res,serverResData){ + // replaceServerResData: function(req,res,serverResData){ // return serverResData; // }, @@ -190,21 +183,4 @@ module.exports = { // } ]; } - -}; - -function mergeCORSHeader(reqHeader,originHeader){ - var targetObj = originHeader || {}; - - delete targetObj["Access-Control-Allow-Credentials"]; - delete targetObj["Access-Control-Allow-Origin"]; - delete targetObj["Access-Control-Allow-Methods"]; - delete targetObj["Access-Control-Allow-Headers"]; - - targetObj["access-control-allow-credentials"] = "true"; - targetObj["access-control-allow-origin"] = reqHeader['origin'] || reqHeader['Origin'] || "-___-||"; - targetObj["access-control-allow-methods"] = "GET, POST, PUT"; - targetObj["access-control-allow-headers"] = reqHeader['access-control-request-headers'] || "-___-||"; - - return targetObj; -} \ No newline at end of file +}; \ No newline at end of file