Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-01 07:57:31 +02:00
Code Issues Projects Releases Wiki Activity

updated patches

Browse Source
This commit is contained in:
LinsaFTW 2021-09-30 17:39:13 -03:00
parent cd5ef657f9
commit 5c7b3a9176
9 changed files with 56 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Waterfall-Proxy-Patches/0005-Make-PlayerHandshakeEvent-cancellable.patch
View File

@ -1,4 +1,4 @@
From 42608d211e93b47f5a72640f63178c815b429ab6 Mon Sep 17 00:00:00 2001
From bbdbe9a57a15f0d72cfca33949147e0256044299 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 17:57:23 +0800
Subject: [PATCH] Make PlayerHandshakeEvent cancellable
@ -35,10 +35,10 @@ index 2f7b38d9..e29b0ed3 100644
/**
* Connection attempting to login.
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index b7ecd828..49ba34db 100644
index 0fd58e83..2af68601 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -320,7 +320,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -321,7 +321,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -52,5 +52,5 @@ index b7ecd828..49ba34db 100644
switch ( handshake.getRequestedProtocol() )
{
--
2.31.1.windows.1
2.32.0.windows.1

10
Waterfall-Proxy-Patches/0009-Close-connections-Don-t-flush-if-not-necessary.patch
View File

@ -1,14 +1,14 @@
From cf8b96298bc7e02d04b30aa1dca04968bda068d8 Mon Sep 17 00:00:00 2001
From 377cba38cd24e2e64a89104547befaf18cdbbd8b Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:06:17 +0800
Subject: [PATCH] Close connections & Don't flush if not necessary
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 0647a774..37784acd 100644
index 2af68601..3b1f3d99 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -192,6 +192,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -193,6 +193,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
ServerPing legacy = result.getResponse();
@ -22,7 +22,7 @@ index 0647a774..37784acd 100644
String kickMessage;
if ( v1_5 )
@@ -257,6 +264,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -258,6 +265,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void done(ProxyPingEvent pingResult, Throwable error)
{
@ -38,7 +38,7 @@ index 0647a774..37784acd 100644
Gson gson = BungeeCord.getInstance().gson;
unsafe.sendPacket( new StatusResponse( gson.toJson( pingResult.getResponse() ) ) );
if ( bungee.getConnectionThrottle() != null )
@@ -286,11 +302,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -287,11 +303,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PingPacket ping) throws Exception
{

15
Waterfall-Proxy-Patches/0012-Change-state-to-encrypt-only-if-onlineMode-is-true.patch
View File

@ -1,27 +1,22 @@
From bb419bd35b5e513be0ca20cda4c97bcaa23f0cd7 Mon Sep 17 00:00:00 2001
From d0df3e9283244e4124ea3abb0c210743e9a5b39f Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:25:03 +0800
Subject: [PATCH] Change state to encrypt only if onlineMode is true
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 37784acd..1811084a 100644
index 3b1f3d99..503ee86a 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -426,11 +426,12 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( onlineMode )
@@ -428,6 +428,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
thisState = State.ENCRYPT;
unsafe().sendPacket( request = EncryptionUtil.encryptRequest() );
+ // FlameCord - Change state to encrypt only if onlineMode is true
+ thisState = State.ENCRYPT;
} else
{
finish();
}
- thisState = State.ENCRYPT;
}
};
thisState = State.FINISHING;
--
2.32.0.windows.1

30
Waterfall-Proxy-Patches/0013-Don-t-allow-name-containing-dot.patch
View File

@ -1,25 +1,23 @@
From 9754f77c4142bebe9425d493b6826503dd9060f9 Mon Sep 17 00:00:00 2001
From 17b968a7aa4e4afec3eff6e09f150ede548aff6a Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:25:51 +0800
Subject: [PATCH] Don't allow name containing dot
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 1811084a..1925188f 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -387,7 +387,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( thisState == State.USERNAME, "Not expecting USERNAME" );
this.loginRequest = loginRequest;
- if ( getName().contains( " " ) )
+ // FlameCord - Use name
+ final String name = getName();
+
+ if ( name.contains( " " ) || name.contains( "." ) )
diff --git a/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java b/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
index d1cd1090..44cb1ce6 100644
--- a/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
+++ b/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
@@ -21,7 +21,8 @@ public final class AllowedCharacters
} else
{
disconnect( bungee.getTranslation( "name_invalid" ) );
return;
// Don't allow spaces, Yaml config doesn't support them
- return isChatAllowedCharacter( c ) && c != ' ';
+ // FlameCord - Don't allow dots
+ return isChatAllowedCharacter( c ) && c != ' ' && c != '.';
}
}
--
2.32.0.windows.1

6
Waterfall-Proxy-Patches/0015-Allow-custom-uuids-even-if-onlineMode-is-true.patch
View File

@ -1,14 +1,14 @@
From ac987c138b977c2029dc845bbec5f9a1b70dd746 Mon Sep 17 00:00:00 2001
From 7dec0219892d80bac509c0c6a919b8bbbe691ef6 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:35:33 +0800
Subject: [PATCH] Allow custom uuids even if onlineMode is true
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 1925188f..554526a3 100644
index 503ee86a..5927d57d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -680,7 +680,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -678,7 +678,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void setUniqueId(UUID uuid)
{
Preconditions.checkState( thisState == State.USERNAME, "Can only set uuid while state is username" );

13
Waterfall-Proxy-Patches/0016-Finish-early-to-avoid-multiple-incoming-packets.patch
View File

@ -1,11 +1,11 @@
From f8d0abde43d1fa6abc45631b372e5a71d1af2f48 Mon Sep 17 00:00:00 2001
From 2bf254d23544622bf9a32880bace6d821e42477f Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:36:08 +0800
Subject: [PATCH] Finish early to avoid multiple incoming packets
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 554526a3..e643d8a7 100644
index 5927d57d..4316da26 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -447,6 +447,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -27,15 +27,6 @@ index 554526a3..e643d8a7 100644
if ( isOnlineMode() )
{
// Check for multiple connections
@@ -587,8 +592,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
userCon.connect( server, null, true, ServerConnectEvent.Reason.JOIN_PROXY );
-
- thisState = State.FINISHED;
}
}
} );
--
2.32.0.windows.1

10
Waterfall-Proxy-Patches/0019-FlameCord-General-Patch.patch
View File

@ -1,4 +1,4 @@
From 1f6d89b080f89d2a235554957815deb3047dab05 Mon Sep 17 00:00:00 2001
From c0015af5ddf9eb2e081949e90a908ba36acf27ba Mon Sep 17 00:00:00 2001
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
Date: Mon, 12 Oct 2020 15:40:53 -0300
Subject: [PATCH] FlameCord General Patch
@ -191,7 +191,7 @@ index 00000000..a323598e
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 778fe4a1..9c45f305 100644
index 136da2a8..4991c0a1 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -9,6 +9,9 @@ import com.google.common.collect.Sets;
@ -319,7 +319,7 @@ index db79b58a..a847c049 100644
b.connect().addListener( listener );
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index dc5b64b7..e88ec72a 100644
index 98b46cc2..d5e4dcb6 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -14,6 +14,8 @@ import java.util.logging.Level;
@ -331,7 +331,7 @@ index dc5b64b7..e88ec72a 100644
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -150,7 +152,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -151,7 +153,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( packet.packet == null )
{
@ -353,7 +353,7 @@ index 6df3f3dd..264c22e8 100644
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index 3bbc1510..4c53e02c 100644
index c0e4791f..28543346 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -1,6 +1,8 @@

28
Waterfall-Proxy-Patches/0024-Firewall-System.patch
View File

@ -1,4 +1,4 @@
From 7a80f39c65fcf3ef6569fbb5ee96715708875ca7 Mon Sep 17 00:00:00 2001
From 26fb15428c81e5532a5b61b15f2ddf6b0a690539 Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 22:54:44 -0300
Subject: [PATCH] Firewall System
@ -317,10 +317,10 @@ index ccab6800..d57a0516 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index e88ec72a..a720a0c3 100644
index d5e4dcb6..7bdddfa5 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -152,6 +152,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -153,6 +153,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( packet.packet == null )
{
@ -330,7 +330,7 @@ index e88ec72a..a720a0c3 100644
throw new QuietException( "Unexpected packet received during server login process!\n" + BufUtil.dump(packet.buf, 16) );
}
}
@@ -379,6 +382,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -380,6 +383,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
break;
default:
@ -340,22 +340,22 @@ index e88ec72a..a720a0c3 100644
throw new QuietException( "Cannot request protocol " + handshake.getRequestedProtocol() );
}
}
@@ -392,6 +398,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
// FlameCord - Use name
final String name = getName();
+ // FlameCord start - Firewall and close if username is blocked
@@ -394,6 +400,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
disconnect( bungee.getTranslation( "name_invalid" ) );
return;
}
+
+ // FlameCord - Firewall and close if username is blocked
+ if ( FlameCord.getInstance().getFirewallManager().isFirewalled( name ) )
+ {
+ FlameCord.getInstance().getFirewallManager().addFirewalled( ch.getRemoteAddress() );
+ ch.close();
+ return;
+ }
+ // FlameCord end
+
if ( name.contains( " " ) || name.contains( "." ) )
{
disconnect( bungee.getTranslation( "name_invalid" ) );
this.loginRequest = loginRequest;
int limit = BungeeCord.getInstance().config.getPlayerLimit();
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
index 264c22e8..2101cbc4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
@ -442,5 +442,5 @@ index b3bdfd05..49d53f17 100644
throw new IllegalStateException( "Invalid data request packet" );
}
--
2.33.0.windows.2
2.32.0.windows.1

8
Waterfall-Proxy-Patches/0025-FlameCord-logger-options.patch
View File

@ -1,4 +1,4 @@
From 6eaee9fe8f737a2550080e90c282d77f0e4b49f4 Mon Sep 17 00:00:00 2001
From ea567bac560207c0a619d621b0ee7dced802e022 Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 23:51:51 -0300
Subject: [PATCH] FlameCord logger options
@ -38,10 +38,10 @@ index 8bb61ac1..aafd99d8 100644
this.firewallNotify = setIfUnexistant("firewall.notify", this.firewallNotify, configuration);
this.firewallSeconds = setIfUnexistant("firewall.seconds", this.firewallSeconds, configuration);
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 83d074be..9805cff1 100644
index 7bdddfa5..37317a47 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -353,7 +353,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -354,7 +354,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
case 1:
// Ping
@ -51,7 +51,7 @@ index 83d074be..9805cff1 100644
{
bungee.getLogger().log( Level.INFO, "{0} has pinged", this );
}
@@ -362,7 +363,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -363,7 +364,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login