Inputs checks Backport to 1.19.4

common/src/main/java/com/adamcalculator/dynamicpack/DynamicPackModBase.java

@@ -3,6 +3,7 @@
 import com.adamcalculator.dynamicpack.pack.Pack;
 import com.adamcalculator.dynamicpack.pack.Remote;
 import com.adamcalculator.dynamicpack.util.AFiles;
+import com.adamcalculator.dynamicpack.util.FailedOpenPackFileSystemException;
 import com.adamcalculator.dynamicpack.util.Out;
 import org.json.JSONObject;
 
@@ -19,6 +20,7 @@ public abstract class DynamicPackModBase {
 	public static final String MINECRAFT_META = "pack.mcmeta";
 
 	public static DynamicPackModBase INSTANCE;
+	protected static int manuallySyncThreadCounter = 0;
 
 	private boolean isPacksScanning = false;
 	private List<Pack> packs = new ArrayList<>();
@@ -40,8 +42,13 @@ public void init(File gameDir) {
 		startSyncThread();
 	}
 
+	/**
+	 * ONLY FOR FIRST INIT RUN! FOR MANUALLY USE startManuallySync!!!!!
+	 */
 	public abstract void startSyncThread();
 
+	public abstract void startManuallySync();
+
 	public void rescanPacks() {
 		if (isPacksScanning) {
 			Out.warn("rescanPacks already in scanning!");
@@ -55,18 +62,22 @@ public void rescanPacks() {
 				PackUtil.openPackFileSystem(packFile, path -> {
 					Path dynamicPackPath = path.resolve(CLIENT_FILE);
 					if (Files.exists(dynamicPackPath)) {
-						Out.println(" + Pack " + packFile.getName() + " supported by mod!");
+						Out.println("+ Pack " + packFile.getName() + " supported by mod!");
                         try {
                             processPack(packFile, PackUtil.readJson(dynamicPackPath));
                         } catch (IOException e) {
                             throw new RuntimeException(e);
                         }
                     } else {
-						Out.println(" - Pack " + packFile.getName() + " not supported by mod.");
+						Out.println("- Pack " + packFile.getName() + " not supported by mod.");
 					}
                 });
 			} catch (Exception e) {
-				Out.error("Error while processing pack: " + packFile, e);
+				if (e instanceof FailedOpenPackFileSystemException) {
+					Out.warn("Error while processing pack " + packFile.getName() + ": " + e.getMessage());
+				} else {
+					Out.error("Error while processing pack: " + packFile.getName(), e);
+				}
 			}
 		}
 		isPacksScanning = false;
@@ -99,7 +110,7 @@ public boolean isNameIsDynamic(String name) {
 	}
 
 	public Pack getDynamicPackByMinecraftName(String name) {
-		for (Pack pack : packs) {
+		for (Pack pack : getPacks()) {
 			if (("file/" + pack.getName()).equals(name)) {
 				return pack;
 			}

common/src/main/java/com/adamcalculator/dynamicpack/InputValidator.java

@@ -0,0 +1,24 @@
+package com.adamcalculator.dynamicpack;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class InputValidator {
+    private static final Pattern CONTENT_ID_PATTERN = Pattern.compile("^[a-z0-9_:-]{2,128}$");
+
+    public static boolean isContentIdValid(String input) {
+        if (input == null) {
+            return false;
+        }
+        Matcher matcher = CONTENT_ID_PATTERN.matcher(input);
+        return matcher.matches();
+    }
+
+    public static boolean isPackNameValid(String input) {
+        if (input == null) {
+            return false;
+        }
+
+        return input.trim().length() < 64 && !input.trim().isEmpty() && !input.contains("\n") && !input.contains("\r") && !input.contains("\b");
+    }
+}

common/src/main/java/com/adamcalculator/dynamicpack/Mod.java

@@ -101,7 +101,7 @@ public static boolean isHTTPTrafficAllowed() {
 
     // DebugScreen allowed
     public static boolean isDebugScreenAllowed() {
-        return true;
+        return false;
     }
 
     public static void debugNetwork() {

common/src/main/java/com/adamcalculator/dynamicpack/PackUtil.java

@@ -1,5 +1,6 @@
 package com.adamcalculator.dynamicpack;
 
+import com.adamcalculator.dynamicpack.util.FailedOpenPackFileSystemException;
 import org.json.JSONObject;
 
 import java.io.File;
@@ -56,7 +57,7 @@ public static void openPackFileSystem(File pack, Consumer<Path> consumer) throws
             }
 
         } else {
-            throw new RuntimeException("Failed to open pack file system");
+            throw new FailedOpenPackFileSystemException("Failed to open pack file system");
         }
     }
 

common/src/main/java/com/adamcalculator/dynamicpack/pack/DynamicRepoRemote.java

@@ -1,18 +1,19 @@
 package com.adamcalculator.dynamicpack.pack;
 
 import com.adamcalculator.dynamicpack.DynamicPackModBase;
+import com.adamcalculator.dynamicpack.InputValidator;
 import com.adamcalculator.dynamicpack.Mod;
 import com.adamcalculator.dynamicpack.PackUtil;
 import com.adamcalculator.dynamicpack.sync.PackSyncProgress;
 import com.adamcalculator.dynamicpack.util.AFiles;
 import com.adamcalculator.dynamicpack.util.FileDownloadConsumer;
 import com.adamcalculator.dynamicpack.util.Out;
 import com.adamcalculator.dynamicpack.util.Urls;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.rmi.RemoteException;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.function.LongConsumer;
@@ -24,7 +25,7 @@ public class DynamicRepoRemote extends Remote {
 
 
     private Pack parent;
-
+    private JSONObject cachedCurrentJson;
     protected String url;
     protected String buildUrl;
     protected String packUrl;
@@ -37,8 +38,9 @@ public class DynamicRepoRemote extends Remote {
     public DynamicRepoRemote() {
     }
 
-    public void init(Pack pack, JSONObject remote) {
+    public void init(Pack pack, JSONObject remote, JSONObject current) {
         this.parent = pack;
+        this.cachedCurrentJson = current;
         this.url = remote.getString("url");
         this.buildUrl = url + "/" + REPO_BUILD;
         this.packUrl = url + "/" + REPO_JSON;
@@ -62,12 +64,50 @@ public void init(Pack pack, JSONObject remote) {
     @Override
     public boolean checkUpdateAvailable() throws IOException {
         String content = Urls.parseContent(buildUrl, 64).trim();
-        return parent.getCurrentBuild() != Long.parseLong(content);
+        return getCurrentBuild() != Long.parseLong(content);
+    }
+
+    public long getCurrentBuild() {
+        return cachedCurrentJson.optLong("build", -1);
+    }
+
+
+    // currently not using. but in feature this may be used in settings screen to Enable/disable contents
+    public void updateCurrentKnownContents(JSONArray repoContents) {
+        if (cachedCurrentJson.has("known_contents")) {
+            cachedCurrentJson.remove("known_contents");
+        }
+        JSONObject newKnown = new JSONObject();
+        cachedCurrentJson.put("known_contents", newKnown);
+        for (Object _repoContent : repoContents) {
+            JSONObject repoContent = (JSONObject) _repoContent;
+            String id = repoContent.getString("id");
+            boolean required = repoContent.optBoolean("required", false);
+            JSONObject jsonObject = new JSONObject()
+                    .put("hash", repoContent.getString("hash"));
+            if (required) {
+                jsonObject.put("required", true);
+            }
+            newKnown.put(id, jsonObject);
+        }
+    }
+
+    public String getCurrentPackContentHash(String id) {
+        if (cachedCurrentJson.has("known_contents")) {
+            try {
+                return cachedCurrentJson.getJSONObject("known_contents").getJSONObject(id).getString("hash");
+
+            } catch (Exception e) {
+                // if hash not found
+                return null;
+            }
+        }
+        return null;
     }
 
 
     @Override
-    public boolean sync(PackSyncProgress progress) throws IOException, NoSuchAlgorithmException {
+    public boolean sync(PackSyncProgress progress, boolean manually) throws IOException, NoSuchAlgorithmException {
         PackUtil.openPackFileSystem(parent.getLocation(), path -> {
             try {
                 sync0(progress, path);
@@ -105,11 +145,8 @@ public void onUpdate(FileDownloadConsumer it) {
         }
 
         String remoteName = repoJson.getString("name");
-        if (remoteName.isBlank()) {
-            throw new RuntimeException("Name of remote pack can't be blank");
-        }
-        if (remoteName.trim().length() > 50) {
-            throw new RuntimeException("Length of name pack can't > 50");
+        if (!InputValidator.isPackNameValid(remoteName)) {
+            throw new RuntimeException("Remote name of pack not valid.");
         }
 
 
@@ -123,6 +160,7 @@ public void onUpdate(FileDownloadConsumer it) {
             throw e;
         }
         parent.getPackJson().getJSONObject("current").put("build", repoJson.getLong("build"));
+        parent.updateJsonLatestUpdate();
 
         AFiles.nioWriteText(path.resolve(DynamicPackModBase.CLIENT_FILE), parent.getPackJson().toString(2));
     }

common/src/main/java/com/adamcalculator/dynamicpack/pack/DynamicRepoSyncProcessV1.java

@@ -1,26 +1,20 @@
 package com.adamcalculator.dynamicpack.pack;
 
 import com.adamcalculator.dynamicpack.DynamicPackModBase;
-import com.adamcalculator.dynamicpack.IDValidator;
+import com.adamcalculator.dynamicpack.InputValidator;
 import com.adamcalculator.dynamicpack.Mod;
 import com.adamcalculator.dynamicpack.PackUtil;
 import com.adamcalculator.dynamicpack.sync.PackSyncProgress;
 import com.adamcalculator.dynamicpack.sync.state.StateFileDeleted;
-import com.adamcalculator.dynamicpack.util.AFiles;
-import com.adamcalculator.dynamicpack.util.FileDownloadConsumer;
-import com.adamcalculator.dynamicpack.util.Hashes;
-import com.adamcalculator.dynamicpack.util.Urls;
+import com.adamcalculator.dynamicpack.util.*;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class DynamicRepoSyncProcessV1 {
     private final DynamicRepoRemote remote;
@@ -54,18 +48,31 @@ public void run() throws IOException {
             progress.textLog("File deleted from resource-pack: " + s);
             AFiles.nioSmartDelete(path);
         }
+
+        try {
+            remote.updateCurrentKnownContents(repoJson.getJSONArray("contents"));
+        } catch (Exception e) {
+            Out.error("Error while update known_packs. Not fatal", e);
+        }
     }
 
     public void close() throws IOException {
     }
 
     private void processContent(JSONObject jsonContent) throws IOException {
         String id = jsonContent.getString("id");
-        if (!IDValidator.isValid(id)) {
+        if (!InputValidator.isContentIdValid(id)) {
             throw new RuntimeException("Id of content is not valid.");
         }
 
         String contentRemoteHash = jsonContent.getString("hash");
+        String localCache = remote.getCurrentPackContentHash(id);
+        if (Objects.equals(localCache, contentRemoteHash)) {
+            progress.textLog("Content '" + id + "' local hash is equal with remote...");
+        } else {
+            progress.textLog("Content '" + id + "' local hash different with remote or null.");
+        }
+
         String url = jsonContent.getString("url");
         String urlCompressed = jsonContent.optString("url_compressed", null);
         boolean compressSupported = urlCompressed != null;
@@ -180,12 +187,16 @@ private List<JSONObject> calcActiveContents() {
         while (i < contents.length()) {
             JSONObject content = contents.getJSONObject(i);
             String id = content.getString("id");
+
+            if (!InputValidator.isContentIdValid(id)) {
+                throw new RuntimeException("Id of content is not valid.");
+            }
+
             if (remote.isContentActive(id) || content.optBoolean("required", false)) {
                 activeContents.add(content);
             }
             i++;
         }
-
         return activeContents;
     }
 }