Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-04-12 06:46:07 +02:00
Code Issues Projects Releases Wiki Activity

Update logger order

Browse Source
This commit is contained in:
linsaftw 2021-04-30 22:59:29 -03:00
parent fd686d3b35
commit 135369e4b4
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Waterfall-Proxy-Patches/0023-FlameCord-General-Patch.patch
View File

@ -1,4 +1,4 @@
From 1d3bfc78ceef4d1ab011e0ec2923a3133f22133c Mon Sep 17 00:00:00 2001 From b13fd1a5fea303546f2c3ae160889d8cf7c88667 Mon Sep 17 00:00:00 2001
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com> From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
Date: Mon, 12 Oct 2020 15:40:53 -0300 Date: Mon, 12 Oct 2020 15:40:53 -0300
Subject: [PATCH] FlameCord General Patch Subject: [PATCH] FlameCord General Patch
@ -748,7 +748,7 @@ index 6cd71071..24195ed1 100644
} }
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 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 b8e50855..d3a89e79 100644 index b8e50855..e4208b59 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/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 @@ @@ -1,6 +1,8 @@
@ -780,20 +780,21 @@ index b8e50855..d3a89e79 100644
{ {
ProxyServer.getInstance().getLogger().log( Level.INFO, "{0} has disconnected", handler ); ProxyServer.getInstance().getLogger().log( Level.INFO, "{0} has disconnected", handler );
} }
@@ -136,7 +140,10 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter @@ -138,6 +142,12 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
{
if ( ctx.channel().isActive() )
{ {
- boolean logExceptions = !( handler instanceof PingHandler ); boolean logExceptions = !( handler instanceof PingHandler );
+ // FlameCord - Use flamecord + // FlameCord - Use flamecord
+ final FlameCord flameCord = FlameCord.getInstance(); + final FlameCord flameCord = FlameCord.getInstance();
+
+ // FlameCord - Log exceptions based on FlameCord + // FlameCord - Log exceptions based on FlameCord
+ boolean logExceptions = flameCord.getFlameCordConfiguration().isLoggerExceptions(); + logExceptions = flameCord.getFlameCordConfiguration().isLoggerExceptions();
+
if ( logExceptions ) if ( logExceptions )
{ {
if ( cause instanceof ReadTimeoutException )
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 4996a7b4..1680ce96 100644 index 4996a7b4..d9d00fa5 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
@ -809,8 +810,9 @@ index 4996a7b4..1680ce96 100644
// FlameCord - Close on exception caught // FlameCord - Close on exception caught
@Override @Override
public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception { public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
- cause.printStackTrace();
+ if (FlameCord.getInstance().getFlameCordConfiguration().isLoggerExceptions()) { + if (FlameCord.getInstance().getFlameCordConfiguration().isLoggerExceptions()) {
cause.printStackTrace(); + cause.printStackTrace();
+ } + }
ctx.close(); ctx.close();

23
Waterfall-Proxy-Patches/0026-Firewall-System.patch
View File

@ -1,6 +1,6 @@
From e6ce50df78087e26000d0d99f2f5a51b7334b93c Mon Sep 17 00:00:00 2001 From 9e823cf6478f0b35c293a90ca846f00ba51142da Mon Sep 17 00:00:00 2001
From: linsaftw <linsaftw@users.noreply.github.com> From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:23:36 -0300 Date: Fri, 30 Apr 2021 22:54:44 -0300
Subject: [PATCH] Firewall System Subject: [PATCH] Firewall System
@ -304,7 +304,7 @@ index bf6f8538..fa0b59c2 100644
// FlameCord - Collect ips from servers // FlameCord - Collect ips from servers
final Collection<String> whitelistedAddresses = new HashSet<>(); final Collection<String> whitelistedAddresses = new HashSet<>();
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 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 d3a89e79..60c9ddcd 100644 index e4208b59..3b5bb7db 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -3,6 +3,7 @@ package net.md_5.bungee.netty; @@ -3,6 +3,7 @@ package net.md_5.bungee.netty;
@ -323,12 +323,12 @@ index d3a89e79..60c9ddcd 100644
import java.util.logging.Level; import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.connection.CancelSendSignal; import net.md_5.bungee.connection.CancelSendSignal;
@@ -143,7 +145,21 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter @@ -148,6 +150,23 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
// FlameCord - Use flamecord
final FlameCord flameCord = FlameCord.getInstance();
// FlameCord - Log exceptions based on FlameCord // FlameCord - Log exceptions based on FlameCord
- boolean logExceptions = flameCord.getFlameCordConfiguration().isLoggerExceptions(); logExceptions = flameCord.getFlameCordConfiguration().isLoggerExceptions();
+ boolean logExceptions = flameCord.getFlameCordConfiguration().isLoggerExceptions() && !(cause instanceof FirewallException);
+ // FlameCord - Don't log firewall exceptions
+ logExceptions = cause instanceof FirewallException ? false : logExceptions;
+ +
+ // FlameCord - Firewall system + // FlameCord - Firewall system
+ if (cause instanceof DecoderException || cause instanceof IllegalStateException || cause instanceof BadPacketException) { + if (cause instanceof DecoderException || cause instanceof IllegalStateException || cause instanceof BadPacketException) {
@ -343,11 +343,12 @@ index d3a89e79..60c9ddcd 100644
+ if (cause instanceof FirewallException) { + if (cause instanceof FirewallException) {
+ flameCord.getFirewallManager().logBlocked(ctx.channel().remoteAddress()); + flameCord.getFirewallManager().logBlocked(ctx.channel().remoteAddress());
+ } + }
+
if ( logExceptions ) if ( logExceptions )
{ {
if ( cause instanceof ReadTimeoutException )
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 1680ce96..5ddc84a3 100644 index d9d00fa5..fa6ab3e9 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -3,6 +3,7 @@ package net.md_5.bungee.netty; @@ -3,6 +3,7 @@ package net.md_5.bungee.netty;