Basic upload checks

Author: AverageTurtle

src/main/java/sam/packer/PackerConfig.java

@@ -8,6 +8,7 @@ public class PackerConfig {
     private static final Path CONFIG_PATH = Path.of("config", "packer.properties");
     public static String server_address = "localhost";
     public static int port = 8081;
+    public static int max_upload_bytes = 15000000;
 
     public static void load() {
         File configFile = CONFIG_PATH.toFile();
@@ -16,8 +17,9 @@ public static void load() {
         if (configFile.exists()) {
             try (InputStream is = new FileInputStream(configFile)) {
                 props.load(is);
-                server_address = props.getProperty("server-address", "localhost");
-                port = Integer.parseInt(props.getProperty("port", "8081"));
+                server_address = props.getProperty("server-address", server_address);
+                port = Integer.parseInt(props.getProperty("port", String.valueOf(port)));
+                max_upload_bytes = Integer.parseInt(props.getProperty("max-upload-bytes", String.valueOf(max_upload_bytes)));
             } catch (IOException e) {
                 Packer.LOGGER.error("Failed to load config: {}", e.getMessage());
             }
@@ -31,6 +33,7 @@ public static void save() {
             Properties props = new Properties();
             props.setProperty("server-address", server_address);
             props.setProperty("port", String.valueOf(port));
+            props.setProperty("max_upload_bytes", String.valueOf(max_upload_bytes));
             props.store(os, "Packer Configuration\nSet server-address to your Public IP or Domain.\n");
         } catch (IOException e) {
             Packer.LOGGER.error("Failed to save config: {}", e.getMessage());

src/main/java/sam/packer/PackerManager.java

@@ -32,6 +32,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -47,21 +48,37 @@ public enum AssetType {
             public String subdir() {
                 return "textures";
             }
+
+            @Override
+            public boolean is_valid_extension(String extension) {
+                return extension.equals("png") || extension.equals("mcmeta");
+            }
         },
         model{
             @Override
             public String subdir() {
                 return "models";
             }
+
+            @Override
+            public boolean is_valid_extension(String extension) {
+                return extension.equals("json");
+            }
         },
         item_definition {
             @Override
             public String subdir() {
                 return "items";
             }
+
+            @Override
+            public boolean is_valid_extension(String extension) {
+                return extension.equals("json");
+            }
         };
 
         public abstract String subdir();
+        public abstract boolean is_valid_extension(String extension);
 
         public static AssetType from_string(String type) {
             switch (type) {
@@ -123,6 +140,14 @@ public PackerManager(DedicatedServer server) {
     }
 
     public void upload_file(UUID uploader, AssetType type, String name, byte[] contents) throws IOException {
+        // Check contents
+        if(contents.length > PackerConfig.max_upload_bytes) throw new IOException("File too big. Limit: "+PackerConfig.max_upload_bytes+" Bytes");
+
+        var split_name = name.split("\\.");
+        var ext = split_name[split_name.length-1];
+        if(!type.is_valid_extension(ext)) throw new IOException("Invalid extension for upload type!");
+
+        // Preform upload
         Path user_path = assets_path.resolve(uploader.toString());
         if(!Files.exists(user_path)) { Files.createDirectory(user_path); }
         Path asset_path = user_path.resolve(type.subdir());
@@ -173,8 +198,6 @@ public void rezip_pack() throws IOException{
 
         String url = "http://"+PackerConfig.server_address + ":" + PackerConfig.port + "/api/pack.zip";
         String hash = getSHA1(zip_path.toFile());
-        Packer.LOGGER.info(url);
-        Packer.LOGGER.info(hash);
         packinfo = new MinecraftServer.ServerResourcePackInfo(UUID.randomUUID(), url,
                 hash, true, Component.literal("Please accept the Packer resource pack!."));
     }
@@ -285,7 +308,7 @@ public static void register_command(CommandDispatcher<CommandSourceStack> dispat
                         return 0;
                     }
                     stack.set(DataComponents.ITEM_MODEL, stack.getItem().components().get(DataComponents.ITEM_MODEL));
-                    
+
                     return 1;
                 }));
         node.then(model_node);