Merge pull request #107 from prometheus-lua/master

Merge changes to dev branch

Author: levno-710

readme.md

@@ -55,5 +55,6 @@ lua ./cli.lua [options]
 - [pnlmon](https://github.com/pnlmon)
 - [britzl](https://github.com/britzl)
 - [SpinnySpiwal](https://github.com/SpinnySpiwal)
+- [oxince](https://github.com/oxince)
 ## License
 This Project is Licensed under the GNU General Public License v3.0. For more details, please refer to [LICENSE](https://github.com/levno-710/Prometheus/blob/master/LICENSE).

src/cli.lua

@@ -13,19 +13,20 @@ package.path = script_path() .. "?.lua;" .. package.path;
 local Prometheus = require("prometheus");
 Prometheus.Logger.logLevel = Prometheus.Logger.LogLevel.Info;
 
--- Override error callback
---[[Prometheus.Logger.errorCallback = function(...)
-    print(Prometheus.colors(Prometheus.Config.NameUpper .. ": " .. ..., "red"))
-	os.exit(1);
-end]]
-
 -- Check if the file exists
 local function file_exists(file)
     local f = io.open(file, "rb")
     if f then f:close() end
     return f ~= nil
 end
 
+string.split = function(str, sep)
+    local fields = {}
+    local pattern = string.format("([^%s]+)", sep)
+    str:gsub(pattern, function(c) fields[#fields+1] = c end)
+    return fields
+end
+
 -- get all lines from a file, returns an empty
 -- list/table if the file does not exist
 local function lines_from(file)
@@ -90,6 +91,21 @@ while i <= #arg do
             luaVersion = "LuaU";
         elseif curr == "--pretty" then
             prettyPrint = true;
+        elseif curr == "--saveerrors" then
+            -- Override error callback
+            Prometheus.Logger.errorCallback =  function(...)
+                print(Prometheus.colors(Prometheus.Config.NameUpper .. ": " .. ..., "red"))
+                
+                local args = {...};
+                local message = table.concat(args, " ");
+                
+                local fileName = sourceFile:sub(-4) == ".lua" and sourceFile:sub(0, -5) .. ".error.txt" or sourceFile .. ".error.txt";
+                local handle = io.open(fileName, "w");
+                handle:write(message);
+                handle:close();
+
+                os.exit(1);
+            end;
         else
             Prometheus.Logger:warn(string.format("The option \"%s\" is not valid and therefore ignored", curr));
         end

src/logger.lua

@@ -49,7 +49,7 @@ function logger:warn(...)
 	end
 end
 
-logger.errorCallback =  function(...)
+logger.errorCallback = function(...)
 	print(colors(config.NameUpper .. ": " .. ..., "red"))
 	error(...);
 end;

src/presets.lua

@@ -34,6 +34,12 @@ return {
         Seed = 0;
         -- Obfuscation steps
         Steps = {
+            {
+                Name = "WatermarkCheck";
+                Settings = {
+                    Content = "This Script was obfuscated using the Weak Preset of Prometheus Obfuscator by Levno_710";
+                }
+            },
             {
                 Name = "Vmify";
                 Settings = {
@@ -68,6 +74,12 @@ return {
         Seed = 0;
         -- Obfuscation steps
         Steps = {
+            {
+                Name = "WatermarkCheck";
+                Settings = {
+                    Content = "This Script was obfuscated using the Medium Preset of Prometheus Obfuscator by Levno_710";
+                }
+            },
             {
                 Name = "EncryptStrings";
                 Settings = {
@@ -123,6 +135,12 @@ return {
         Seed = 0;
         -- Obfuscation steps
         Steps = {
+            {
+                Name = "WatermarkCheck";
+                Settings = {
+                    Content = "This Script was obfuscated using the Strong Preset of Prometheus Obfuscator by Levno_710";
+                }
+            },
             {
                 Name = "Vmify";
                 Settings = {

src/prometheus/steps.lua

@@ -1,11 +1,12 @@
 return {
-	WrapInFunction = require("prometheus.steps.WrapInFunction");
-	SplitStrings   = require("prometheus.steps.SplitStrings");
-	Vmify          = require("prometheus.steps.Vmify");
-	ConstantArray  = require("prometheus.steps.ConstantArray");
-	ProxifyLocals  = require("prometheus.steps.ProxifyLocals");
-	AntiTamper  = require("prometheus.steps.AntiTamper");
-	EncryptStrings = require("prometheus.steps.EncryptStrings");
+	WrapInFunction       = require("prometheus.steps.WrapInFunction");
+	SplitStrings         = require("prometheus.steps.SplitStrings");
+	Vmify                = require("prometheus.steps.Vmify");
+	ConstantArray        = require("prometheus.steps.ConstantArray");
+	ProxifyLocals  			 = require("prometheus.steps.ProxifyLocals");
+	AntiTamper  				 = require("prometheus.steps.AntiTamper");
+	EncryptStrings 			 = require("prometheus.steps.EncryptStrings");
 	NumbersToExpressions = require("prometheus.steps.NumbersToExpressions");
-	AddVararg 	= require("prometheus.steps.AddVararg");
+	AddVararg 					 = require("prometheus.steps.AddVararg");
+	WatermarkCheck		   = require("prometheus.steps.WatermarkCheck");
 }

src/prometheus/steps/Watermark.lua

@@ -0,0 +1,61 @@
+-- This Script is Part of the Prometheus Obfuscator by Levno_710
+--
+-- Watermark.lua
+--
+-- This Script provides a Step that will add a watermark to the script
+
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
+
+local Watermark = Step:extend();
+Watermark.Description = "This Step will add a watermark to the script";
+Watermark.Name = "Watermark";
+
+Watermark.SettingsDescriptor = {
+  Content = {
+    name = "Content",
+    description = "The Content of the Watermark",
+    type = "string",
+    default = "This Script is Part of the Prometheus Obfuscator by Levno_710",
+  },
+  CustomVariable = {
+    name = "Custom Variable",
+    description = "The Variable that will be used for the Watermark",
+    type = "string",
+    default = "_WATERMARK",
+  }
+}
+
+function Watermark:init(settings)
+	
+end
+
+function Watermark:apply(ast)
+  local body = ast.body;
+  if string.len(self.Content) > 0 then
+    local scope, variable = ast.globalScope:resolve(self.CustomVariable);
+    local watermark = Ast.AssignmentVariable(ast.globalScope, variable);
+
+    local functionScope = Scope:new(body.scope);
+    functionScope:addReferenceToHigherScope(ast.globalScope, variable);
+    
+    local arg = functionScope:addVariable();
+    local statement = Ast.PassSelfFunctionCallStatement(Ast.StringExpression(self.Content), "gsub", {
+      Ast.StringExpression(".+"),
+      Ast.FunctionLiteralExpression({
+        Ast.VariableExpression(functionScope, arg)
+      }, Ast.Block({
+        Ast.AssignmentStatement({
+          watermark
+        }, {
+          Ast.VariableExpression(functionScope, arg)
+        })
+      }, functionScope))
+    });
+
+    table.insert(ast.body.statements, 1, statement)
+  end
+end
+
+return Watermark;

src/prometheus/steps/WatermarkCheck.lua

@@ -0,0 +1,50 @@
+-- This Script is Part of the Prometheus Obfuscator by Levno_710
+--
+-- WatermarkCheck.lua
+--
+-- This Script provides a Step that will add a watermark to the script
+
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
+local Watermark = require("prometheus.steps.Watermark");
+
+local WatermarkCheck = Step:extend();
+WatermarkCheck.Description = "This Step will add a watermark to the script";
+WatermarkCheck.Name = "WatermarkCheck";
+
+WatermarkCheck.SettingsDescriptor = {
+  Content = {
+    name = "Content",
+    description = "The Content of the WatermarkCheck",
+    type = "string",
+    default = "This Script is Part of the Prometheus Obfuscator by Levno_710",
+  },
+}
+
+local function callNameGenerator(generatorFunction, ...)
+	if(type(generatorFunction) == "table") then
+		generatorFunction = generatorFunction.generateName;
+	end
+	return generatorFunction(...);
+end
+
+function WatermarkCheck:init(settings)
+
+end
+
+function WatermarkCheck:apply(ast, pipeline)
+  self.CustomVariable = "_" .. callNameGenerator(pipeline.namegenerator, math.random(10000000000, 100000000000));
+  pipeline:addStep(Watermark:new(self));
+
+  local body = ast.body;
+  local watermarkExpression = Ast.StringExpression(self.Content);
+  local scope, variable = ast.globalScope:resolve(self.CustomVariable);
+  local watermark = Ast.VariableExpression(ast.globalScope, variable);
+  local notEqualsExpression = Ast.NotEqualsExpression(watermark, watermarkExpression);
+  local ifBody = Ast.Block({Ast.ReturnStatement({})}, Scope:new(ast.body.scope));
+
+  table.insert(body.statements, 1, Ast.IfStatement(notEqualsExpression, ifBody, {}, nil));
+end
+
+return WatermarkCheck;