[addition] fix a bug with renaming strings. Added encode strings, but it will only encode one string per line this will be fixed soon

Author: Madmegsox1

Output.py

@@ -1 +1 @@
-Example,w3cBfsFHVWpvzEtdqCEHLX
+Example,w3FfEMSoZGDSAcEhfDZozB

assets/Classes.csv

@@ -1 +1 @@
-test,w3VbHCrluAxxlunUtKpNqz
+test,w3zcvDodboCrfsjNQephoV

assets/Vars.csv

@@ -17,13 +17,15 @@ insert_obfStrings = true
     obfString_amount = 5
 
 # Encoder Settings
-encode_imports = true
 encoded_list_garbage_length = 20
 encoder_type = bin
     binary_splitter = %
 # bin = binary
 # hex = hexadecimal
 # base64 = base64
 encode_strings = true
+encode_imports = true
+encode_code = false
+
 
 map_path = assets

assets/config.cfg

@@ -2,7 +2,7 @@
 
 class Example():
     def __init__(self):
-        print("test")
+        print("#test#") # test
         print(random.seed(7))
 
 test = Example()

assets/test3.py

@@ -0,0 +1,52 @@
+package org.madmeg.api.obfuscator;
+
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+/**
+ * @author Madmegsox1
+ * @since 24/12/2021
+ */
+
+public final class EncodingUtils {
+    public static String stringToHex(String toConvert){
+        return String.format("%040x", new BigInteger(1, toConvert.getBytes(StandardCharsets.UTF_8)));
+    }
+
+    public static String stringToBase64(String toConvert){
+        try {
+            return Base64.getEncoder()
+                    .encodeToString(toConvert.getBytes(StandardCharsets.UTF_8.toString()));
+        } catch(UnsupportedEncodingException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    public static String stringToBinary(String input) {
+        StringBuilder result = new StringBuilder();
+        char[] chars = input.toCharArray();
+        for (char aChar : chars) {
+            result.append(
+                    String.format("%8s", Integer.toBinaryString(aChar))
+                            .replaceAll(" ", "0")
+            );
+        }
+        return result.toString();
+    }
+
+    public static String prettyBinary(String binary, int blockSize, String separator) {
+
+        List<String> result = new ArrayList<>();
+        int index = 0;
+        while (index < binary.length()) {
+            result.add(binary.substring(index, Math.min(index + blockSize, binary.length())));
+            index += blockSize;
+        }
+
+        return String.join(separator, result);
+    }
+}

src/main/java/org/madmeg/api/obfuscator/EncodingUtils.java

@@ -0,0 +1,65 @@
+package org.madmeg.api.obfuscator;
+
+/**
+ * @author Madmegsox1
+ * @since 29/12/2021
+ *
+ * bunch of shit code but idk
+ */
+
+public final class FindString {
+    private final String line;
+    private String foundLine;
+    private int start;
+    private final boolean keepChar;
+
+    public FindString(String line, boolean keepChar){
+        this.line = line;
+        this.start = -1;
+        this.keepChar = keepChar;
+        this.foundLine = find();
+    }
+
+    private String find(){
+        if(!line.contains("\"") && !line.contains("'"))return "";
+        boolean open = false;
+        boolean open2 = false;
+
+        final StringBuilder toReturn = new StringBuilder();
+        for(int i = 0; i < line.length(); i++){
+            final char val = line.charAt(i);
+            if(val == '"' && !open2){
+                open = !open;
+                if(!keepChar) {
+                    continue;
+                }else if(!open){
+                    toReturn.append('"');
+                }
+            }
+            if(val == '\'' && !open){
+                open2 = !open2;
+                if(!keepChar) {
+                    continue;
+                }else if(!open2){
+                    toReturn.append("'");
+                }
+            }
+
+            if(open || open2){
+                if(start == -1){
+                    start = i;
+                }
+                toReturn.append(val);
+            }
+        }
+        return toReturn.toString();
+    }
+
+    public String getFoundLine() {
+        return foundLine;
+    }
+
+    public int getStart() {
+        return start;
+    }
+}

src/main/java/org/madmeg/api/obfuscator/FindString.java

@@ -21,7 +21,6 @@ public void runTasks(){
 
     @Override
     public void poolTasks(){
-
         if(Core.CONFIG.isRemoveComments()){
             this.queueTask(new RemoveComments(Loader.FILE));
         }
@@ -37,15 +36,14 @@ public void poolTasks(){
         if(Core.CONFIG.isClassNames()){
             this.queueTask(new RenameClass(Loader.FILE));
         }
-
-        if(Core.CONFIG.isEncodeStrings()){
-
-        }
         if(Core.CONFIG.isInsertGarbage()){
             this.queueTask(new AddGarbage(Loader.FILE));
         }
-        if(Core.CONFIG.isInsertObfStrings()){
-
+        if(Core.CONFIG.isEncodeStrings()){
+            this.queueTask(new EncodeString(Loader.FILE));
+        }
+        if(Core.CONFIG.isEncodeCode()){
+            //this.queueTask(new EncodeCode(Loader.FILE));
         }
 
         // TODO add save obf file

src/main/java/org/madmeg/api/obfuscator/tasks/TaskFactory.java

@@ -18,7 +18,6 @@ public final class Config {
     private int garbageAmount;
     private int garbageLength;
     private boolean insertObfStrings;
-    private int obfStringAmount;
     private boolean removeComments;
 
 
@@ -27,6 +26,7 @@ public final class Config {
     private String encoderType;
     private String binarySplitter;
     private boolean encodeStrings;
+    private boolean encodeCode;
     private String mapPath;
 
     public Config(){}
@@ -133,14 +133,6 @@ public void setGarbageAmount(int garbageAmount) {
         this.garbageAmount = garbageAmount;
     }
 
-    public boolean isInsertObfStrings() {
-        return insertObfStrings;
-    }
-
-    public void setInsertObfStrings(boolean insertObfStrings) {
-        this.insertObfStrings = insertObfStrings;
-    }
-
     /**
      * @return the number of lines taken up by garbage {@link org.madmeg.impl.tasks.AddGarbage}
      */
@@ -155,14 +147,6 @@ public void setGarbageLength(int garbageLength) {
         this.garbageLength = garbageLength;
     }
 
-    public int getObfStringAmount() {
-        return obfStringAmount;
-    }
-
-    public void setObfStringAmount(int obfStringAmount) {
-        this.obfStringAmount = obfStringAmount;
-    }
-
     /**
      * @return if the obfuscator should remove comments {@link org.madmeg.impl.tasks.RemoveComments}
      */
@@ -239,6 +223,14 @@ public void setEncodeStrings(boolean encodeStrings) {
         this.encodeStrings = encodeStrings;
     }
 
+    public boolean isEncodeCode() {
+        return encodeCode;
+    }
+
+    public void setEncodeCode(boolean encodeCode) {
+        this.encodeCode = encodeCode;
+    }
+
     public String getMapPath() {
         return mapPath;
     }

src/main/java/org/madmeg/impl/config/Config.java

@@ -55,14 +55,13 @@ public void load(File file) {
                     case "insert_garbage" -> config.setInsertGarbage(isTrue(data[1]));
                     case "garbage_amount" -> config.setGarbageAmount(Integer.parseInt(data[1]));
                     case "garbage_length" -> config.setGarbageLength(Integer.parseInt(data[1]));
-                    case "insert_obfStrings" -> config.setInsertObfStrings(isTrue(data[1]));
-                    case "obfString_amount" -> config.setObfStringAmount(Integer.parseInt(data[1]));
                     case "remove_comments" -> config.setRemoveComments(isTrue(data[1]));
                     case "encode_imports" -> config.setEncodeImports(isTrue(data[1]));
                     case "encoded_list_garbage_length" -> config.setEncodedListGarbageLength(Integer.parseInt(data[1]));
                     case "encoder_type" -> config.setEncoderType(data[1]);
                     case "binary_splitter" -> config.setBinarySplitter(data[1]);
                     case "encode_strings" ->  config.setEncodeStrings(isTrue(data[1]));
+                    case "encode_code" -> config.setEncodeCode(isTrue(data[1]));
                     case "map_path" -> config.setMapPath(data[1]);
                 }
             }