Fixed bug in ADODBStream.ReadText().

Author: kirk-sayre-work

appended-code.js

@@ -9,8 +9,9 @@ for (varName in this) {
         try {
             const script = new vm.Script(varValue);
             logJS(varValue)
-            eval(varValue)
+            // Automatically evaling all JS can result in the program state getting polluted.
+            //eval(varValue)
         }
         catch (err) {}
     }
-}
+}

emulator/ADODBStream.js

@@ -4,79 +4,82 @@ const iconv = require("iconv-lite");
 /* Includes code (ADODBStream.writetext, .loadfromfile) from
  * https://github.com/HynekPetrak/malware-jail. The license follows.
 
-The MIT License (MIT)
+ The MIT License (MIT)
 
-Copyright (c) 2016 Hynek Petrak
+ Copyright (c) 2016 Hynek Petrak
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
 */
 
 function ADODBStream() {
-	this.virtual_filename = "(undefined)";
-	this.charset = "";
-	this.position = 0;
-	this.open = () => {};
-	this.savetofile = function(filename) {
-		this.virtual_filename = filename;
-		lib.writeFile(filename, this.buffer);
-		lib.logResource(lib.getUUID(), this.virtual_filename, this.buffer, true);
-	};
-	this.close = () => {};
-	this.read = () => this.buffer;
-
-	this.write = this.writetext = function(text) {
-		if (this.charset)
-			this.buffer = iconv.encode(text, this.charset);
-		else
-			this.buffer = text;
-	};
-	this.loadfromfile = function(filename) {
-		if (this.charset)
-			this.buffer = iconv.decode(lib.readFile(filename), this.charset);
-		else
-			this.buffer = lib.readFile(filename);
-	};
-	this.copyto = (target) => target.write(this.buffer);
+    this.virtual_filename = "(undefined)";
+    this.charset = "";
+    this.position = 0;
+    this.open = () => {};
+    this.savetofile = function(filename) {
+        this.virtual_filename = filename;
+        lib.writeFile(filename, this.buffer);
+        lib.logResource(lib.getUUID(), this.virtual_filename, this.buffer, true);
+    };
+    this.close = () => {};
+    this.read = this.readtext = function() {
+        return this.buffer;
+    };
+    this.write = this.writetext = function(text) {
+        if (this.charset)
+            this.buffer = iconv.encode(text, this.charset);
+        else
+            this.buffer = text;
+    };
+    this.loadfromfile = function(filename) {
+        if (this.charset)
+            this.buffer = iconv.decode(lib.readFile(filename), this.charset);
+        else
+            this.buffer = lib.readFile(filename);
+    };
+    this.tojson = function(data) {
+        console.log(data);
+        return "[1]";
+    }
+    this.copyto = (target) => target.write(this.buffer);
 }
 
 module.exports = function() {
-	return new Proxy(new ADODBStream(), {
-		get: function(target, name) {
-			name = name.toLowerCase();
-			switch (name) {
-				case "size":
-				case "length":
-					return target.buffer.length;
-				case "readtext":
-					return target.buffer;
-				default:
-					if (name in target) return target[name];
-					lib.kill(`ADODBStream.${name} not implemented!`);
-			}
-		},
-		set: function(a, b, c) {
-			b = b.toLowerCase();
-			/*			if (c.length < 1024)
-				console.log(`ADODBStream[${b}] = ${c};`);
-*/
-			a[b] = c;
-			return true;
-		},
-	});
+    return new Proxy(new ADODBStream(), {
+        get: function(target, name) {
+            name = name.toLowerCase();
+            switch (name) {
+            case "size":
+            case "length":
+                return target.buffer.length;
+            default:
+                if (name in target) return target[name];
+                lib.kill(`ADODBStream.${name} not implemented!`);
+            }
+        },
+        set: function(a, b, c) {
+            b = b.toLowerCase();
+            /*      if (c.length < 1024)
+                    console.log(`ADODBStream[${b}] = ${c};`);
+            */
+            a[b] = c;
+            return true;
+        },
+    });
 };

emulator/DOM.js

@@ -1,22 +1,22 @@
 const lib = require("../lib");
 
 function VirtualDOMTag(name) {
-	this.name = name;
+    this.name = name;
 }
 
 // Catches requests to <tag>.nodeTypedValue in order to emulate them correctly
 module.exports = function(name) {
-	return new Proxy(new VirtualDOMTag(name), {
-		get: function(target, name) {
-			name = name.toLowerCase();
-			switch (name) {
-				case "nodetypedvalue":
-					if (target.dataType !== "bin.base64") return target.text;
-					return new Buffer(target.text, "base64").toString("utf8");
-				default:
-					if (name in target) return target[name];
-					lib.kill(`VirtualDOMTag.${name} not implemented!`);
-			}
-		},
-	});
-};
+    return new Proxy(new VirtualDOMTag(name), {
+	get: function(target, name) {
+	    name = name.toLowerCase();
+	    switch (name) {
+	    case "nodetypedvalue":
+		if (target.dataType !== "bin.base64") return target.text;
+		return new Buffer(target.text, "base64").toString("utf8");
+	    default:
+		if (name in target) return target[name];
+		lib.kill(`VirtualDOMTag.${name} not implemented!`);
+	    }
+	},
+    });
+};