Merge branch 'master' into patch-1

Author: terminalsin

.github/workflows/maven.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'adopt'
         #cache: maven
     - name: Build with Gradle

.gitignore

@@ -86,3 +86,9 @@ hs_err_pid*
 */.DS_Store
 */mappings/
 dev.skidfuscator.obfuscator/calculations.txt
+
+dev.skidfuscator.obfuscator/src/test/resources/test.jar.compressed
+
+dev.skidfuscator.obfuscator/src/test/resources/test.jar.compressed.json
+
+dev.skidfuscator.obfuscator/src/test/resources/test.jar.compressed.skid

dev.skidfuscator.annotations/src/main/java/dev/skidfuscator/annotations/Exclude.java

@@ -8,4 +8,5 @@
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})
 @Retention(RetentionPolicy.CLASS)
 public @interface Exclude {
+
 }

dev.skidfuscator.annotations/src/main/java/dev/skidfuscator/annotations/NativeObfuscation.java

@@ -0,0 +1,12 @@
+package dev.skidfuscator.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+@Retention(CLASS)
+@Target(METHOD)
+public @interface NativeObfuscation {
+}

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/SkidfuscatorMain.java

@@ -1,5 +1,6 @@
 package dev.skidfuscator.obfuscator;
 
+import dev.skidfuscator.obfuscator.command.HelpCommand;
 import dev.skidfuscator.obfuscator.command.ObfuscateCommand;
 import lombok.SneakyThrows;
 import org.jline.reader.EndOfFileException;
@@ -49,10 +50,14 @@ public static void main(String[] args) {
                             null,
                             null,
                             null,
+                            null,
                             new File(System.getProperty("java.home"), "lib/rt.jar"),
                             false,
                             false,
                             false,
+                            false,
+                            false,
+                            false,
                             false
                     );
 
@@ -62,7 +67,8 @@ public static void main(String[] args) {
             }
 
         } else {
-            new CommandLine(new ObfuscateCommand())
+            new CommandLine(new HelpCommand())
+                    .addSubcommand("obfuscate", new ObfuscateCommand())
                     .execute(args);
         }
     }

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/HelpCommand.java

@@ -0,0 +1,19 @@
+package dev.skidfuscator.obfuscator.command;
+
+import picocli.CommandLine;
+
+import java.util.concurrent.Callable;
+
+@CommandLine.Command(
+        aliases = "help",
+        mixinStandardHelpOptions = true,
+        version = "help 1.0.0",
+        description = "Shows all the options"
+)
+public class HelpCommand implements Callable<Integer> {
+    @Override
+    public Integer call() throws Exception {
+        System.out.println("Please run 'java -jar skidfuscator.jar obfuscate <input jar> [options here]' instead!");
+        return 0;
+    }
+}

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java

@@ -1,5 +1,6 @@
 package dev.skidfuscator.obfuscator.command;
 
+import dev.skidfuscator.migration.ExemptToConfigMigration;
 import dev.skidfuscator.obfuscator.Skidfuscator;
 import dev.skidfuscator.obfuscator.SkidfuscatorSession;
 import dev.skidfuscator.obfuscator.util.ConsoleColors;
@@ -55,6 +56,12 @@ public class ObfuscateCommand implements Callable<Integer> {
     )
     private File output;
 
+    @CommandLine.Option(
+            names = {"-cfg", "--config"},
+            description = "Path to the config file"
+    )
+    private File config;
+
     @CommandLine.Option(
             names = {"-ph", "--phantom"},
             description = "Declare if phantom computation should be used"
@@ -73,6 +80,12 @@ public class ObfuscateCommand implements Callable<Integer> {
     )
     private boolean notrack;
 
+    @CommandLine.Option(
+            names = {"-re", "--renamer"},
+            description = "Enables renamer for the obfuscation"
+    )
+    private boolean renamer;
+
     @Override
     public Integer call()  {
         /* Total number of processors or cores available to the JVM */
@@ -127,7 +140,7 @@ public Integer call()  {
                 "                               │ "              + topMemory +            " │",
                 "                               └───────────────────────────────────────────┘",
                 "",
-                "                      Author: Ghast     Version: 2.0.5     Today: "
+                "                      Author: Ghast     Version: 2.0.6     Today: "
                         + DateFormat.getDateTimeInstance().format(new Date(Instant.now().toEpochMilli())),
                 ""
         };
@@ -154,6 +167,28 @@ public Integer call()  {
             );
         }
 
+        if (exempt != null) {
+            final File converted = new File(exempt.getAbsolutePath()
+                    .substring(0, exempt.getAbsolutePath().lastIndexOf("/")) + "/config.hocon");
+            final String warning = "\n" + ConsoleColors.YELLOW
+                    + "██╗    ██╗ █████╗ ██████╗ ███╗   ██╗██╗███╗   ██╗ ██████╗ \n"
+                    + "██║    ██║██╔══██╗██╔══██╗████╗  ██║██║████╗  ██║██╔════╝ \n"
+                    + "██║ █╗ ██║███████║██████╔╝██╔██╗ ██║██║██╔██╗ ██║██║  ███╗\n"
+                    + "██║███╗██║██╔══██║██╔══██╗██║╚██╗██║██║██║╚██╗██║██║   ██║\n"
+                    + "╚███╔███╔╝██║  ██║██║  ██║██║ ╚████║██║██║ ╚████║╚██████╔╝\n"
+                    + " ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═╝╚═╝  ╚═══╝ ╚═════╝ \n"
+                    + "\n"
+                    + "⚠️  Warning! Skidfuscator has deprecated the exempt file!\n"
+                    + ConsoleColors.RESET
+                    + "\n  Launching migrator service..."
+                    + "\n  Config will be found at " + converted
+                    + "\n";
+            Skidfuscator.LOGGER.post(warning);
+            new ExemptToConfigMigration().migrate(exempt, converted);
+
+            config = converted;
+        }
+
         final File[] libs;
         if (libFolder != null) {
             libs = libFolder.listFiles();
@@ -170,6 +205,8 @@ public Integer call()  {
                 .phantom(phantom)
                 .jmod(MiscUtil.getJavaVersion() > 8)
                 .fuckit(fuckit)
+                .config(config)
+                .renamer(renamer)
                 .analytics(!notrack)
                 .build();
 

dev.skidfuscator.commons/build.gradle

@@ -7,6 +7,7 @@ repositories {
 }
 
 dependencies {
+    api 'com.typesafe:config:1.4.2'
     compileOnly 'org.projectlombok:lombok:1.18.24'
 
     api project(":annotations")

dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultConfig.java

@@ -0,0 +1,57 @@
+package dev.skidfuscator.config;
+
+import com.typesafe.config.Config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class DefaultConfig {
+    protected final String path;
+    protected final Config config;
+    protected final Map<String, Object> cache;
+
+    public DefaultConfig(Config config, String path) {
+        this.path = path.equals("") ? path : path + ".";
+        this.config = config;
+        this.cache = new HashMap<>();
+    }
+
+    public List<String> getExemptions() {
+        return getStringList(path + "exempt", new ArrayList<>());
+    }
+
+    public boolean getBoolean(String path, final boolean dflt) {
+        return get(path, dflt, config::getBoolean);
+    }
+
+    public List<String> getStringList(String path, final List<String> dflt) {
+        return get(path, dflt, config::getStringList);
+    }
+
+    public <T extends Enum<T>> T getEnum(String path, final Enum<T> dflt) {
+        return (T) get(path, dflt, e -> config.getEnum(dflt.getDeclaringClass(), e));
+    }
+
+    public <T> T get(String path, final T dflt, final Function<String, T> supplier) {
+        path = this.path + path;
+        Object var = cache.get(path);
+
+        if (var == null) {
+            if (config.hasPath(path)) {
+                var = supplier.apply(path);
+            } else {
+                var = dflt;
+            }
+
+            cache.put(path, var);
+        }
+
+        assert dflt.getClass().isAssignableFrom(var.getClass()) : "Value loaded at path is not a type assigned!";
+
+        return (T) var;
+    }
+}

dev.skidfuscator.commons/src/main/java/dev/skidfuscator/config/DefaultSkidConfig.java

@@ -0,0 +1,24 @@
+package dev.skidfuscator.config;
+
+import com.typesafe.config.Config;
+
+import java.io.File;
+import java.util.Collections;
+
+public class DefaultSkidConfig extends DefaultConfig {
+    public DefaultSkidConfig(Config config, String path) {
+        super(config, path);
+    }
+
+    public boolean isDriver() {
+        return this.getBoolean("driver", true);
+    }
+
+    public File[] getLibs() {
+        return this.getStringList("libraries", Collections.emptyList())
+                .stream()
+                .map(File::new)
+                .distinct()
+                .toArray(File[]::new);
+    }
+}