From ef7f4871b82e6148062f00023bbad05dddeea795 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 14 Dec 2020 14:30:39 -0500
Subject: [PATCH] Remove dependency on the java.desktop module

The Favicon.create(BufferedImage) method has been removed. In its place we have Favicon.create(Path) (carried over from the 1.x.x series) and Favicon.create(byte[]) (brand new).
---
 .../com/velocitypowered/api/util/Favicon.java |  32 +++++------------
 .../api/util/FaviconChecker.java              |  34 ++++++++++++++++++
 .../api/util/FaviconCheckerTest.java          |  33 +++++++++++++++++
 .../api/util/test_icon_dimensions_correct.png | Bin 0 -> 1805 bytes
 .../api/util/test_icon_dimensions_wrong.png   | Bin 0 -> 4655 bytes
 .../test_icon_dimensions_wrong_format.jpg     | Bin 0 -> 2949 bytes
 .../com/velocitypowered/proxy/Velocity.java   |   4 ---
 7 files changed, 75 insertions(+), 28 deletions(-)
 create mode 100644 api/src/main/java/com/velocitypowered/api/util/FaviconChecker.java
 create mode 100644 api/src/test/java/com/velocitypowered/api/util/FaviconCheckerTest.java
 create mode 100644 api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_correct.png
 create mode 100644 api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_wrong.png
 create mode 100644 api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_wrong_format.jpg

diff --git a/api/src/main/java/com/velocitypowered/api/util/Favicon.java b/api/src/main/java/com/velocitypowered/api/util/Favicon.java
index a3ce28164..9ee159991 100644
--- a/api/src/main/java/com/velocitypowered/api/util/Favicon.java
+++ b/api/src/main/java/com/velocitypowered/api/util/Favicon.java
@@ -1,15 +1,11 @@
 package com.velocitypowered.api.util;
 
 import com.google.common.base.Preconditions;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Base64;
 import java.util.Objects;
-import javax.imageio.ImageIO;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -65,23 +61,17 @@ public final class Favicon {
   }
 
   /**
-   * Creates a new {@code Favicon} from the specified {@code image}.
+   * Creates a new {@code Favicon} from the specified {@code buffer}.
    *
-   * @param image the image to use for the favicon
+   * @param buffer the buffer to use for the favicon
    * @return the created {@link Favicon} instance
+   * @throws IOException if the file could not be read from the path
    */
-  public static Favicon create(BufferedImage image) {
-    Preconditions.checkNotNull(image, "image");
-    Preconditions.checkArgument(image.getWidth() == 64 && image.getHeight() == 64,
-        "Image is not 64x64 (found %sx%s)", image.getWidth(),image.getHeight());
-    ByteArrayOutputStream os = new ByteArrayOutputStream();
-    try {
-      ImageIO.write(image, "PNG", os);
-    } catch (IOException e) {
-      throw new AssertionError(e);
+  public static Favicon create(byte[] buffer) throws IOException {
+    if (!FaviconChecker.check(buffer)) {
+      throw new IllegalArgumentException("Image is not a PNG file or does not have 64x64 dimensions");
     }
-    return new Favicon(
-        "data:image/png;base64," + Base64.getEncoder().encodeToString(os.toByteArray()));
+    return new Favicon("data:image/png;base64," + Base64.getEncoder().encodeToString(buffer));
   }
 
   /**
@@ -92,12 +82,6 @@ public final class Favicon {
    * @throws IOException if the file could not be read from the path
    */
   public static Favicon create(Path path) throws IOException {
-    try (InputStream stream = Files.newInputStream(path)) {
-      BufferedImage image = ImageIO.read(stream);
-      if (image == null) {
-        throw new IOException("Unable to read the image.");
-      }
-      return create(image);
-    }
+    return create(Files.readAllBytes(path));
   }
 }
diff --git a/api/src/main/java/com/velocitypowered/api/util/FaviconChecker.java b/api/src/main/java/com/velocitypowered/api/util/FaviconChecker.java
new file mode 100644
index 000000000..4dcd5a374
--- /dev/null
+++ b/api/src/main/java/com/velocitypowered/api/util/FaviconChecker.java
@@ -0,0 +1,34 @@
+package com.velocitypowered.api.util;
+
+import java.nio.ByteBuffer;
+
+class FaviconChecker {
+  private static final byte[] PNG_MAGIC = new byte[] {
+      (byte) 137, 80, 78, 71, 13, 10, 26, 10
+  };
+  private static final byte[] IHDR_NAME = new byte[] {
+      73, 72, 68, 82
+  };
+
+  public static boolean check(byte[] data) {
+    ByteBuffer buf = ByteBuffer.wrap(data);
+
+    for (byte value : PNG_MAGIC) {
+      if (buf.get() != value) {
+        return false;
+      }
+    }
+
+    buf.position(buf.position() + 4);
+    for (byte value : IHDR_NAME) {
+      if (buf.get() != value) {
+        return false;
+      }
+    }
+
+    int width = buf.getInt();
+    int height = buf.getInt();
+
+    return width == 64 && height == 64;
+  }
+}
diff --git a/api/src/test/java/com/velocitypowered/api/util/FaviconCheckerTest.java b/api/src/test/java/com/velocitypowered/api/util/FaviconCheckerTest.java
new file mode 100644
index 000000000..b61b19323
--- /dev/null
+++ b/api/src/test/java/com/velocitypowered/api/util/FaviconCheckerTest.java
@@ -0,0 +1,33 @@
+package com.velocitypowered.api.util;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.google.common.io.Resources;
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+
+public class FaviconCheckerTest {
+
+  @Test
+  void handlesProperlyFormattedFavicon() throws IOException {
+    assertTrue(FaviconChecker.check(readFile("test_icon_dimensions_correct.png")),
+        "Correctly formatted favicon is not valid");
+  }
+
+  @Test
+  void handlesBadDimensionFavicon() throws IOException {
+    assertFalse(FaviconChecker.check(readFile("test_icon_dimensions_wrong.png")),
+        "Incorrect dimension favicon is valid?");
+  }
+
+  @Test
+  void handlesBadFormatFavicon() throws IOException {
+    assertFalse(FaviconChecker.check(readFile("test_icon_dimensions_wrong_format.jpg")),
+        "Incorrect format favicon is valid?");
+  }
+
+  private static byte[] readFile(String path) throws IOException {
+    return Resources.toByteArray(FaviconCheckerTest.class.getResource(path));
+  }
+}
diff --git a/api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_correct.png b/api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_correct.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20eabf2f38b1adfcda25a7425d9136f1e12e37d
GIT binary patch
literal 1805
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

literal 0
HcmV?d00001

diff --git a/api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_wrong.png b/api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_wrong.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3f0357b51fa6297aee948a0abbeaf29e8b6d2b1
GIT binary patch
literal 4655
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

literal 0
HcmV?d00001

diff --git a/api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_wrong_format.jpg b/api/src/test/resources/com/velocitypowered/api/util/test_icon_dimensions_wrong_format.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b86dbfcdc41959c1a8aecbde2cff2e6401b77f2d
GIT binary patch
literal 2949
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
W+tFyBN&dDWd%X6N>vQ?S?tcQgF!Z_r

literal 0
HcmV?d00001

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/Velocity.java b/proxy/src/main/java/com/velocitypowered/proxy/Velocity.java
index ed8094cbe..85811abfd 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/Velocity.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/Velocity.java
@@ -11,10 +11,6 @@ public class Velocity {
   private static final Logger logger = LogManager.getLogger(Velocity.class);
 
   static {
-    // We use BufferedImage for favicons, and on macOS this puts the Java application in the dock.
-    // How inconvenient. Force AWT to work with its head chopped off.
-    System.setProperty("java.awt.headless", "true");
-
     // By default, Netty allocates 16MiB arenas for the PooledByteBufAllocator. This is too much
     // memory for Minecraft, which imposes a maximum packet size of 2MiB! We'll use 4MiB as a more
     // sane default.