nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 00:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Packet safety in extensions

Browse Source
This commit is contained in:
sirjonasxx 2022-12-27 23:54:59 +01:00
parent 76ce696186
commit f10b847830
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java
View File

@ -200,11 +200,18 @@ public class ExtensionHandler {
@Override @Override
public void sendMessage(HMessage.Direction direction, HPacket packet) { public void sendMessage(HMessage.Direction direction, HPacket packet) {
boolean success;
if (direction == HMessage.Direction.TOCLIENT) { if (direction == HMessage.Direction.TOCLIENT) {
hConnection.sendToClient(packet); success = hConnection.sendToClient(packet);
} }
else { 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())));
} }
} }

2
G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java
View File

@ -9,7 +9,7 @@ public abstract class ExtensionListener {
protected void manipulatedPacket(HMessage hMessage) {} protected void manipulatedPacket(HMessage hMessage) {}
protected void flagsRequest() {} protected void flagsRequest() {}
protected void sendMessage(HMessage.Direction direction, HPacket packet) {} protected void sendMessage(HMessage.Direction direction, HPacket packet) {}
protected void log(String text) {} public void log(String text) {}
protected void hasClosed() {} protected void hasClosed() {}
protected void packetToStringRequest(HPacket packet) {} protected void packetToStringRequest(HPacket packet) {}

2
G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionsController.java
View File

@ -75,7 +75,7 @@ public class ExtensionsController extends SubForm {
extensionHandler.getObservable().addListener(e -> e.getExtensionObservable().addListener(new ExtensionListener() { extensionHandler.getObservable().addListener(e -> e.getExtensionObservable().addListener(new ExtensionListener() {
@Override @Override
protected void log(String text) { public void log(String text) {
extensionLogger.log(text); extensionLogger.log(text);
} }
})); }));