Merge branch 'sirjonasxx:master' into master

G-Earth/pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <javafx.version>1.8</javafx.version>
-        <jettyVersion>9.4.43.v20210629</jettyVersion>
+        <jettyVersion>9.4.48.v20220622</jettyVersion>
     </properties>
 
     <parent>

G-Earth/src/main/java/gearth/GEarth.java

@@ -14,6 +14,7 @@ import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.Alert;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
@@ -161,4 +162,8 @@ public class GEarth extends Application {
     public static Theme getTheme() {
         return observableTheme.getObject();
     }
+
+    public static void setAlertOwner(Alert alert) {
+        alert.initOwner(main.stage);
+    }
 }

G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java

@@ -2,85 +2,133 @@ package gearth.services.extension_handler.extensions.implementations.network;
 
 import gearth.protocol.HPacket;
 import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer;
+import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerFactory;
 import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver;
 import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator;
 
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 
 /**
+ * Represents an {@link ExtensionProducer} that implements a server to which
+ * remotely-ran extensions can connect.
+ *
+ * @see ExtensionProducerFactory#getAll() for instance creation.
+ *
  * Created by Jonas on 21/06/18.
  */
-public class NetworkExtensionsProducer implements ExtensionProducer {
+public final class NetworkExtensionsProducer implements ExtensionProducer {
 
+    /**
+     * Initial port server tries to listen at, if {@link ServerSocket} creation fails,
+     * it tries next port.
+     */
+    private static final int PORT_ONSET = 9092;
+
+    /**
+     * Represents the number of bytes per boolean encoded in an incoming packet.
+     */
+    private static final int BOOLEAN_SIZE = 1;
+
+    /**
+     * Represents the maximum number of bytes per string encoded in an incoming packet.
+     */
+    private static final int MAX_STRING_SIZE = Character.BYTES * 4_000;
+
+    /**
+     * Length is encoded as an {@link Integer} and header id as an {@link Short}.
+     */
+    private static final int PACKET_HEADER_SIZE = Integer.BYTES + Short.BYTES;
+
+    /**
+     * Represents the maximum number of bytes in the body of an incoming packet.
+     * <p>
+     * Used as a form of validation for packets, prevents other Apps that connect
+     * with the server from sending unexpected data and inexplicably causing huge byte array allocations.
+     * <p>
+     * Since the server only accepts {@link NetworkExtensionInfo.INCOMING_MESSAGES_IDS#EXTENSIONINFO} packets,
+     * this value is calculated based on that packet.
+     */
+    private static final int MAX_PACKET_BODY_SIZE = (MAX_STRING_SIZE * 6) + (BOOLEAN_SIZE * 4);
+
+    /**
+     * The port at which the {@link #serverSocket} is listening for incoming connections.
+     */
     public static int extensionPort = -1;
 
-
     private ServerSocket serverSocket;
 
     @Override
     public void startProducing(ExtensionProducerObserver observer) {
-//        serverSocket = new ServerSocket(0);
-        int port = 9092;
-        boolean serverSetup = false;
-        while (!serverSetup) {
-            serverSetup = createServer(port);
-            port++;
-        }
 
+        /*
+        Initialise the serverSocket at the argued port.
+         */
+        int port = PORT_ONSET;
+        while (!createServer(port))
+            ++port;
 
+        /*
+        Start connection listener thread.
+         */
         new Thread(() -> {
+
             try {
+
                 while (!serverSocket.isClosed()) {
-                    Socket extensionSocket = serverSocket.accept();
+
+                    // accept a new connection
+                    final Socket extensionSocket = serverSocket.accept();
                     extensionSocket.setTcpNoDelay(true);
 
+                    /*
+                    Start client session handler thread.
+                     */
                     new Thread(() -> {
+
                         try {
+
+                            // write INFOREQUEST packet to client
                             synchronized (extensionSocket) {
                                 extensionSocket.getOutputStream().write((new HPacket(NetworkExtensionInfo.OUTGOING_MESSAGES_IDS.INFOREQUEST)).toBytes());
                             }
 
-                            InputStream inputStream = extensionSocket.getInputStream();
+                            final DataInputStream dIn = new DataInputStream(extensionSocket.getInputStream());
-                            DataInputStream dIn = new DataInputStream(inputStream);
 
+                            // listen to incoming data from client
                             while (!extensionSocket.isClosed()) {
 
-                                int length = dIn.readInt();
+                                final int bodyLength = dIn.readInt() - Short.BYTES;
-                                byte[] headerandbody = new byte[length + 4];
+                                final short headerId = dIn.readShort();
 
-                                int amountRead = 0;
+                                if (headerId == NetworkExtensionInfo.INCOMING_MESSAGES_IDS.EXTENSIONINFO) {
-                                while (amountRead < length) {
+
-                                    amountRead += dIn.read(headerandbody, 4 + amountRead, Math.min(dIn.available(), length - amountRead));
+                                    if (bodyLength > MAX_PACKET_BODY_SIZE) {
+                                        System.err.printf("Incoming packet(h=%d, l=%d) exceeds max packet body size %d.\n", headerId, bodyLength, MAX_PACKET_BODY_SIZE);
+                                        break;
                                     }
 
-                                HPacket packet = new HPacket(headerandbody);
+                                    final HPacket packet = readPacket(dIn, bodyLength, headerId);
-                                packet.fixLength();
 
-                                if (packet.headerId() == NetworkExtensionInfo.INCOMING_MESSAGES_IDS.EXTENSIONINFO) {
+                                    final NetworkExtension gEarthExtension = new NetworkExtension(packet, extensionSocket);
-                                    NetworkExtension gEarthExtension = new NetworkExtension(
-                                            packet,
-                                            extensionSocket
-                                    );
 
-                                    if (Authenticator.evaluate(gEarthExtension)) {
+                                    if (Authenticator.evaluate(gEarthExtension))
                                         observer.onExtensionProduced(gEarthExtension);
-                                    }
+                                    else
-                                    else {
                                         gEarthExtension.close();
-                                    }
 
                                     break;
                                 }
                             }
-
+                        } catch (IOException ignored) {
-                        } catch (IOException ignored) {}
+                        }
                     }).start();
                 }
-            } catch (IOException e) {e.printStackTrace();}
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }).start();
     }
 
@@ -94,6 +142,25 @@ public class NetworkExtensionsProducer implements ExtensionProducer {
         }
     }
 
+    private HPacket readPacket(DataInputStream dIn, int amountToRead, short id) throws IOException {
+        final byte[] headerAndBody = new byte[amountToRead + PACKET_HEADER_SIZE];
+
+        int amountRead = 0;
+        while (amountRead < amountToRead)
+            amountRead += dIn.read(headerAndBody,  amountRead + PACKET_HEADER_SIZE, Math.min(dIn.available(), amountToRead - amountRead));
+
+        final HPacket packet = new HPacket(headerAndBody);
+        packet.fixLength();
+        packet.replaceShort(4, id); // add header id
+
+        return packet;
+    }
+
+    /**
+     * Retrieves the {@link ServerSocket#getLocalPort()} of {@link #serverSocket}.
+     *
+     * @return the port number to which {@link #serverSocket} is listening or -1 if the socket is not bound yet.
+     */
     public int getPort() {
         return serverSocket.getLocalPort();
     }

G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java

@@ -49,6 +49,7 @@ public class TitleBarController {
     }
 
     public static TitleBarController create(Alert alert) throws IOException {
+        GEarth.setAlertOwner(alert);
 
         FXMLLoader loader = new FXMLLoader(TitleBarController.class.getResource("Titlebar.fxml"));
         Parent titleBar = loader.load();