Packet safety in extensions

sirjonasxx · Dec 27, 2022 · f10b847 · f10b847
1 parent 76ce696
commit f10b847
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java
@@ -200,11 +200,18 @@ public void flagsRequest() {
 
                     @Override
                     public void sendMessage(HMessage.Direction direction, HPacket packet) {
+                        boolean success;
                         if (direction == HMessage.Direction.TOCLIENT) {
-                            hConnection.sendToClient(packet);
+                            success = hConnection.sendToClient(packet);
                         }
                         else {
-                            hConnection.sendToServer(packet);
+                            success = hConnection.sendToServer(packet);
+                        }
+
+                        if (!success && hConnection.isPacketSendingAllowed(direction, packet) && !hConnection.isPacketSendingSafe(direction, packet)) {
+                            extension.getExtensionObservable().fireEvent(extensionListener ->
+                                    extensionListener.log(String.format("Extension %s attempted to send an unsafe packet, but had no permission",
+                                            extension.getTitle())));
                         }
                     }
 

diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java
@@ -9,7 +9,7 @@ public abstract class ExtensionListener {
     protected void manipulatedPacket(HMessage hMessage) {}
     protected void flagsRequest() {}
     protected void sendMessage(HMessage.Direction direction, HPacket packet) {}
-    protected void log(String text) {}
+    public void log(String text) {}
     protected void hasClosed() {}
 
     protected void packetToStringRequest(HPacket packet) {}

diff --git a/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java
@@ -75,7 +75,7 @@ protected void onParentSet() {
 
         extensionHandler.getObservable().addListener(e -> e.getExtensionObservable().addListener(new ExtensionListener() {
             @Override
-            protected void log(String text) {
+            public void log(String text) {
                 extensionLogger.log(text);
             }
         }));