improve skull checking

ds58 · Oct 5, 2019 · ab6d41c · ab6d41c
1 parent e2bf8e2
commit ab6d41c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_SkullOwner.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_SkullOwner.java
@@ -7,9 +7,13 @@
 import com.ruinscraft.panilla.api.nbt.NbtDataType;
 
 import java.util.Base64;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class NbtCheck_SkullOwner extends NbtCheck {
 
+    private static final Pattern URL_MATCHER = Pattern.compile("url");
+
     public NbtCheck_SkullOwner() {
         super("SkullOwner", PStrictness.AVERAGE);
     }
@@ -30,28 +34,37 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IPanilla pani
 
                         if (entry.hasKey("Value")) {
                             String b64 = entry.getString("Value");
+                            String decoded;
 
                             try {
-                                String decoded = new String(Base64.getDecoder().decode(b64));
-                                decoded = decoded.trim()
-                                        .replace(" ", "")
-                                        .replace("\"", "");
-
-                                // example: {textures:{SKIN:{url:https://education.minecraft.net/wp-content/uploads/deezcord.png}}}
-                                String url = decoded.substring(21);
-
-                                if (url.startsWith("http")) {
-                                    if (url.startsWith("http://textures.minecraft.net")
-                                            || url.startsWith("https://textures.minecraft.net")) {
-                                        return true;
-                                    } else {
-                                        return false;
-                                    }
-                                }
+                                decoded = new String(Base64.getDecoder().decode(b64));
                             } catch (IllegalArgumentException e) {
                                 panilla.getPlatform().getLogger().info("Invalid head texture");
                                 return false;
                             }
+
+                            // all lowercase, no parentheses or spaces
+                            decoded = decoded.trim()
+                                    .replace(" ", "")
+                                    .replace("\"", "")
+                                    .toLowerCase();
+
+                            Matcher matcher = URL_MATCHER.matcher(decoded);
+
+                            // example: {textures:{SKIN:{url:https://education.minecraft.net/wp-content/uploads/deezcord.png}}}
+                            // may contain multiple url tags
+                            while (matcher.find()) {
+                                String url = decoded.substring(matcher.end() + 1);
+
+                                if (url.startsWith("http://textures.minecraft.net") ||
+                                        url.startsWith("https://textures.minecraft.net")) {
+                                    continue;
+                                } else {
+                                    return false;
+                                }
+                            }
+
+                            return true;
                         }
                     }
                 }

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 allprojects {
     group = 'com.ruinscraft'
-    version = '1.3.7'
+    version = '1.3.8'
 }
 
 subprojects {