Alpha v0.1.6

levno-710 · web-flow · commit 7342a187208c · 2022-01-15T13:17:06.000+01:00
diff --git a/doc/steps/splitstrings.md b/doc/steps/splitstrings.md
@@ -6,14 +6,14 @@ description: This Step splits Strings to a specific or random length
 
 ### Settings
 
-| Name                      | type   | description                                                                                                                                                                             | Values                      |
-| ------------------------- | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------- |
-| Treshold                  | number | The relative amount of nodes that will be affected                                                                                                                                      | 0 <= x <= 1                 |
-| MinLength                 | number | The minimal length for the chunks in that the Strings are splitted                                                                                                                      | x > 0                       |
-| MaxLength                 | number | The maximal length for the chunks in that the Strings are splitted                                                                                                                      | x >= MinLength              |
-| ConcatenationType         | enum   | The Functions used for Concatenation. Note that when using coustom, the String Array will also be Shuffled                                                                              | "strcat", "table", "custom" |
-| CustomFunctionType        | enum   | <p>The Type of Function code injection This Option only applies when coustom Concatenation is selected.<br>Note that when chosing inline, the code size may increase significantly!</p> | "global", "local", "inline" |
-| CustomLocalFunctionsCount | number | The number of local functions per scope. This option only applies when CoustomFunctionType = local                                                                                      | x > 0                       |
+| Name                      | type   | description                                                                                                                                                                            | Values                      |
+| ------------------------- | ------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------- |
+| Treshold                  | number | The relative amount of nodes that will be affected                                                                                                                                     | 0 <= x <= 1                 |
+| MinLength                 | number | The minimal length for the chunks in that the Strings are splitted                                                                                                                     | x > 0                       |
+| MaxLength                 | number | The maximal length for the chunks in that the Strings are splitted                                                                                                                     | x >= MinLength              |
+| ConcatenationType         | enum   | The Functions used for Concatenation. Note that when using custom, the String Array will also be Shuffled                                                                              | "strcat", "table", "custom" |
+| CustomFunctionType        | enum   | <p>The Type of Function code injection This Option only applies when custom Concatenation is selected.<br>Note that when chosing inline, the code size may increase significantly!</p> | "global", "local", "inline" |
+| CustomLocalFunctionsCount | number | The number of local functions per scope. This option only applies when CustomFunctionType = local                                                                                      | x > 0                       |
 
 ### Example
 
diff --git a/doc/steps/vmify.md b/doc/steps/vmify.md
@@ -1,7 +1,7 @@
 ---
 description: >-
-  This Step will Compile your script into a fully-coustom (not a half coustom
-  like other lua obfuscators) Bytecode Format and emit a vm for executing it.
+  This Step will Compile your script into a fully-custom (not a half custom like
+  other lua obfuscators) Bytecode Format and emit a vm for executing it.
 ---
 
 # Vmify
diff --git a/src/cli.lua b/src/cli.lua
@@ -13,6 +13,12 @@ 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
+
 -- see if the file exists
 local function file_exists(file)
     local f = io.open(file, "rb")
diff --git a/src/highlightlua.lua b/src/highlightlua.lua
@@ -2,10 +2,10 @@
 --
 -- This Script provides a simple Method for Syntax Highlighting of Lua code
 
-local Tokenizer = require("obfuscator.tokenizer");
+local Tokenizer = require("prometheus.tokenizer");
 local colors    = require("colors");
 local TokenKind = Tokenizer.TokenKind;
-local lookupify = require("obfuscator.util").lookupify;
+local lookupify = require("prometheus.util").lookupify;
 
 return function(code, luaVersion)
     local out = "";
diff --git a/src/obfuscator/namegenerators.lua b/src/obfuscator/namegenerators.lua
diff --git a/src/obfuscator/steps.lua b/src/obfuscator/steps.lua
diff --git a/src/prometheus.lua b/src/prometheus.lua
@@ -13,11 +13,13 @@ local oldPkgPath = package.path;
 package.path = script_path() .. "?.lua;" .. package.path;
 
 -- Require Prometheus Submodules
-local Pipeline  = require("obfuscator.pipeline");
+local Pipeline  = require("prometheus.pipeline");
 local highlight = require("highlightlua");
 local colors    = require("colors");
 local Logger    = require("logger");
-local Presets   = require("presets")
+local Presets   = require("presets");
+local Config    = require("config");
+local util      = require("prometheus.util");
 
 -- Restore package.path
 package.path = oldPkgPath;
@@ -26,6 +28,7 @@ package.path = oldPkgPath;
 return {
     Pipeline  = Pipeline;
     colors    = colors;
+    Config    = util.readonly(Config); -- Readonly
     Logger    = Logger;
     highlight = highlight;
     Presets   = Presets;
diff --git a/src/prometheus/ast.lua b/src/prometheus/ast.lua
diff --git a/src/prometheus/bit.lua b/src/prometheus/bit.lua
diff --git a/src/prometheus/compiler_secure/bytecode.lua b/src/prometheus/compiler_secure/bytecode.lua
@@ -4,18 +4,18 @@
 -- This Script contains the Bytecode library for Compiling to Prometheus Bytecode
 
 -- For Lua5.1 Compatibility
-local bit32 = require("bit") or require("obfuscator.bit").bit32;
+local bit32 = require("bit") or require("prometheus.bit").bit32;
 local logger = require("logger");
-local util = require("obfuscator.util");
-local vmstrings = require("obfuscator.compiler_secure.vmstrings");
-local Parser = require("obfuscator.parser");
-local enums = require("obfuscator.enums");
+local util = require("prometheus.util");
+local vmstrings = require("prometheus.compiler_secure.vmstrings");
+local Parser = require("prometheus.parser");
+local enums = require("prometheus.enums");
 
 local LuaVersion = enums.LuaVersion;
 local BIT_MAX_8  = 255;
 local BIT_MAX_16 = 65535;
 
-local InstructionKind = require("obfuscator.compiler_secure.instructionkind");
+local InstructionKind = require("prometheus.compiler_secure.instructionkind");
 
 local Bytecode = {
 	InstructionKind = InstructionKind
diff --git a/src/prometheus/compiler_secure/compiler.lua b/src/prometheus/compiler_secure/compiler.lua
@@ -1,8 +1,8 @@
 local Compiler = {};
 
-local IR = require("obfuscator.compiler_secure.ir");
-local Bytecode = require("obfuscator.compiler_secure.bytecode");
-local Ast = require("obfuscator.ast");
+local IR = require("prometheus.compiler_secure.ir");
+local Bytecode = require("prometheus.compiler_secure.bytecode");
+local Ast = require("prometheus.ast");
 local logger = require("logger");
 local AstKind = Ast.AstKind;
 
diff --git a/src/prometheus/compiler_secure/instructionkind.lua b/src/prometheus/compiler_secure/instructionkind.lua
diff --git a/src/prometheus/compiler_secure/ir.lua b/src/prometheus/compiler_secure/ir.lua
@@ -4,9 +4,9 @@
 -- This Script contains the IR library for Compiling to Prometheus Bytecode
 
 local logger = require("logger");
-local util = require("obfuscator.util");
+local util = require("prometheus.util");
 
-local Bytecode = require("obfuscator.compiler_secure.bytecode");
+local Bytecode = require("prometheus.compiler_secure.bytecode");
 local InstructionKind = Bytecode.InstructionKind
 
 local function Instruction(tb)
diff --git a/src/prometheus/compiler_secure/vmstrings.lua b/src/prometheus/compiler_secure/vmstrings.lua
@@ -3,8 +3,8 @@
 -- vmstrings.lua
 -- This Script contains Constant Strings used in the Bytecode vm
 
-local InstructionKind = require("obfuscator.compiler_secure.instructionkind");
-local util = require("obfuscator.util");
+local InstructionKind = require("prometheus.compiler_secure.instructionkind");
+local util = require("prometheus.util");
 
 -- Inline Replacements needed:
 -- CONST_INSTRUCTION_KEY_1 = The first 8 bit of the Xor key for the instructions
diff --git a/src/prometheus/enums.lua b/src/prometheus/enums.lua
@@ -5,7 +5,7 @@
 
 local Enums = {};
 
-local chararray = require("obfuscator.util").chararray;
+local chararray = require("prometheus.util").chararray;
 
 Enums.LuaVersion = {
 	LuaU  = "LuaU" ,
diff --git a/src/prometheus/namegenerators.lua b/src/prometheus/namegenerators.lua
@@ -0,0 +1,6 @@
+return {
+	Mangled = require("prometheus.namegenerators.mangled");
+	MangledShuffled = require("prometheus.namegenerators.mangled_shuffled");
+	Il = require("prometheus.namegenerators.Il");
+	Number = require("prometheus.namegenerators.number");
+}
diff --git a/src/prometheus/namegenerators/Il.lua b/src/prometheus/namegenerators/Il.lua
@@ -8,7 +8,7 @@ local MIN_CHARACTERS = 5;
 local MAX_INITIAL_CHARACTERS = 10;
 
 
-local util = require("obfuscator.util");
+local util = require("prometheus.util");
 local chararray = util.chararray;
 
 local offset = 0;
diff --git a/src/prometheus/namegenerators/mangled.lua b/src/prometheus/namegenerators/mangled.lua
@@ -5,7 +5,7 @@
 -- This Script provides a function for generation of mangled names
 
 
-local util = require("obfuscator.util");
+local util = require("prometheus.util");
 local chararray = util.chararray;
 
 local idGen = 0
diff --git a/src/prometheus/namegenerators/mangled_shuffled.lua b/src/prometheus/namegenerators/mangled_shuffled.lua
@@ -5,7 +5,7 @@
 -- This Script provides a function for generation of mangled names with shuffled character order
 
 
-local util = require("obfuscator.util");
+local util = require("prometheus.util");
 local chararray = util.chararray;
 
 local VarDigits = chararray("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_");
diff --git a/src/prometheus/namegenerators/number.lua b/src/prometheus/namegenerators/number.lua
diff --git a/src/prometheus/parser.lua b/src/prometheus/parser.lua
@@ -11,11 +11,11 @@
 -- luaVersion : The LuaVersion of the Script - Currently Supported : Lua51 and LuaU
 -- 
 
-local Tokenizer = require("obfuscator.tokenizer");
-local Enums = require("obfuscator.enums");
-local util = require("obfuscator.util");
-local Ast = require("obfuscator.ast");
-local Scope = require("obfuscator.scope");
+local Tokenizer = require("prometheus.tokenizer");
+local Enums = require("prometheus.enums");
+local util = require("prometheus.util");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
 local logger = require("logger");
 
 local AstKind = Ast.AstKind;
diff --git a/src/prometheus/pipeline.lua b/src/prometheus/pipeline.lua
@@ -6,16 +6,16 @@
 -- These Modules can simply be added to the pipeline
 
 local config = require("config");
-local Ast    = require("obfuscator.ast");
-local Enums  = require("obfuscator.enums");
-local util = require("obfuscator.util");
-local Parser = require("obfuscator.parser");
-local Unparser = require("obfuscator.unparser");
+local Ast    = require("prometheus.ast");
+local Enums  = require("prometheus.enums");
+local util = require("prometheus.util");
+local Parser = require("prometheus.parser");
+local Unparser = require("prometheus.unparser");
 local logger = require("logger");
 
-local NameGenerators = require("obfuscator.namegenerators");
+local NameGenerators = require("prometheus.namegenerators");
 
-local Steps = require("obfuscator.steps");
+local Steps = require("prometheus.steps");
 
 local lookupify = util.lookupify;
 local LuaVersion = Enums.LuaVersion;
diff --git a/src/prometheus/randomLiterals.lua b/src/prometheus/randomLiterals.lua
@@ -2,8 +2,8 @@
 --
 -- Library for Creating Random Literals
 
-local Ast = require("obfuscator.ast");
-local RandomStrings = require("obfuscator.randomStrings");
+local Ast = require("prometheus.ast");
+local RandomStrings = require("prometheus.randomStrings");
 
 local RandomLiterals = {};
 
diff --git a/src/prometheus/randomStrings.lua b/src/prometheus/randomStrings.lua
@@ -1,4 +1,4 @@
-local Ast = require("obfuscator.ast");
+local Ast = require("prometheus.ast");
 
 local dictionary = {
 	"getfenv",
diff --git a/src/prometheus/scope.lua b/src/prometheus/scope.lua
diff --git a/src/prometheus/step.lua b/src/prometheus/step.lua
@@ -5,7 +5,7 @@
 -- This file Provides the base class for Obfuscation Steps
 
 local logger = require("logger");
-local util = require("obfuscator.util");
+local util = require("prometheus.util");
 
 local lookupify = util.lookupify;
 
diff --git a/src/prometheus/steps.lua b/src/prometheus/steps.lua
@@ -0,0 +1,8 @@
+return {
+	WrapInFunction = require("prometheus.steps.WrapInFunction");
+	SplitStrings   = require("prometheus.steps.SplitStrings");
+	LocalsToTable  = require("prometheus.steps.LocalsToTable");
+	Vmify          = require("prometheus.steps.Vmify");
+	ConstantArray  = require("prometheus.steps.ConstantArray");
+	ProxifyLocals  = require("prometheus.steps.ProxifyLocals");
+}
diff --git a/src/prometheus/steps/ConstantArray.lua b/src/prometheus/steps/ConstantArray.lua
@@ -7,13 +7,13 @@
 -- TODO: Wrapper Functions
 -- TODO: Proxy Object for indexing: e.g: ARR[X] becomes ARR + X
 
-local Step = require("obfuscator.step");
-local Ast = require("obfuscator.ast");
-local Scope = require("obfuscator.scope");
-local visitast = require("obfuscator.visitast");
-local util     = require("obfuscator.util")
-local Parser   = require("obfuscator.parser");
-local enums = require("obfuscator.enums")
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
+local visitast = require("prometheus.visitast");
+local util     = require("prometheus.util")
+local Parser   = require("prometheus.parser");
+local enums = require("prometheus.enums")
 
 local LuaVersion = enums.LuaVersion;
 local AstKind = Ast.AstKind;
diff --git a/src/prometheus/steps/LocalsToTable.lua b/src/prometheus/steps/LocalsToTable.lua
@@ -4,11 +4,11 @@
 --
 -- This Script provides a Obfuscation Step for converting Local Variables to a table access
 -- This Step can and often will cause garbage collection Problems
-local Step = require("obfuscator.step");
-local Ast = require("obfuscator.ast");
-local Scope = require("obfuscator.scope");
-local visitAst = require("obfuscator.visitast");
-local util = require("obfuscator.util");
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
+local visitAst = require("prometheus.visitast");
+local util = require("prometheus.util");
 local logger = require("logger")
 
 local AstKind = Ast.AstKind;
diff --git a/src/prometheus/steps/ProxifyLocals.lua b/src/prometheus/steps/ProxifyLocals.lua
@@ -4,11 +4,11 @@
 --
 -- This Script provides a Obfuscation Step for putting all Locals into Proxy Objects
 
-local Step = require("obfuscator.step");
-local Ast = require("obfuscator.ast");
-local Scope = require("obfuscator.scope");
-local visitast = require("obfuscator.visitast");
-local RandomLiterals = require("obfuscator.randomLiterals")
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
+local visitast = require("prometheus.visitast");
+local RandomLiterals = require("prometheus.randomLiterals")
 
 local AstKind = Ast.AstKind;
 
diff --git a/src/prometheus/steps/SplitStrings.lua b/src/prometheus/steps/SplitStrings.lua
@@ -4,12 +4,12 @@
 --
 -- This Script provides a Simple Obfuscation Step for splitting Strings
 
-local Step = require("obfuscator.step");
-local Ast = require("obfuscator.ast");
-local visitAst = require("obfuscator.visitast");
-local Parser = require("obfuscator.parser");
-local util = require("obfuscator.util");
-local enums = require("obfuscator.enums")
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local visitAst = require("prometheus.visitast");
+local Parser = require("prometheus.parser");
+local util = require("prometheus.util");
+local enums = require("prometheus.enums")
 
 local LuaVersion = enums.LuaVersion;
 
diff --git a/src/prometheus/steps/Vmify.lua b/src/prometheus/steps/Vmify.lua
@@ -2,14 +2,14 @@
 --
 -- Vmify.lua
 --
--- This Script provides a Complex Obfuscation Step that will compile the entire Script to  a fully coustom bytecode that does not share it's instructions
+-- This Script provides a Complex Obfuscation Step that will compile the entire Script to  a fully custom bytecode that does not share it's instructions
 -- with lua, making it much harder to crack than other lua obfuscators
 
-local Step = require("obfuscator.step");
-local SecureCompiler = require("obfuscator.compiler_secure.compiler");
+local Step = require("prometheus.step");
+local SecureCompiler = require("prometheus.compiler_secure.compiler");
 
 local Vmify = Step:extend();
-Vmify.Description = "This Step will Compile your script into a fully-coustom (not a half coustom like other lua obfuscators) Bytecode Format and emit a vm for executing it.";
+Vmify.Description = "This Step will Compile your script into a fully-custom (not a half custom like other lua obfuscators) Bytecode Format and emit a vm for executing it.";
 Vmify.Name = "Vmify";
 
 Vmify.SettingsDescriptor = {
diff --git a/src/prometheus/steps/WrapInFunction.lua b/src/prometheus/steps/WrapInFunction.lua
@@ -4,9 +4,9 @@
 --
 -- This Script provides a Simple Obfuscation Step that wraps the entire Script into a function
 
-local Step = require("obfuscator.step");
-local Ast = require("obfuscator.ast");
-local Scope = require("obfuscator.scope");
+local Step = require("prometheus.step");
+local Ast = require("prometheus.ast");
+local Scope = require("prometheus.scope");
 
 local WrapInFunction = Step:extend();
 WrapInFunction.Description = "This Step Wraps the Entire Script into a Function";
diff --git a/src/prometheus/tokenizer.lua b/src/prometheus/tokenizer.lua
@@ -4,8 +4,8 @@
 -- Overview:
 -- This Script provides a class for lexical Analysis of lua code.
 -- This Tokenizer is Capable of tokenizing LuaU and Lua5.1
-local Enums = require("obfuscator.enums");
-local util = require("obfuscator.util");
+local Enums = require("prometheus.enums");
+local util = require("prometheus.util");
 local logger = require("logger");
 local config = require("config");
 
diff --git a/src/prometheus/unparser.lua b/src/prometheus/unparser.lua
diff --git a/src/prometheus/util.lua b/src/prometheus/util.lua
diff --git a/src/prometheus/visitast.lua b/src/prometheus/visitast.lua
diff --git a/tests.lua b/tests.lua
