PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replaced EvaluatorFilter with custom regex-based filter and removed non-dependency

Browse source
This commit is contained in:
Jason_DiDonato@yahoo.com 2021-07-02 07:30:29 -04:00
parent abf7135e64
commit a6b09faa84
3 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.sbt
View file

@ -79,8 +79,7 @@ lazy val psforeverSettings = Seq(
"io.circe" %% "circe-generic" % "0.14.1", "io.circe" %% "circe-generic" % "0.14.1",
"io.circe" %% "circe-parser" % "0.14.1", "io.circe" %% "circe-parser" % "0.14.1",
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.3", "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.3",
"org.bouncycastle" % "bcprov-jdk15on" % "1.69", "org.bouncycastle" % "bcprov-jdk15on" % "1.69"
"org.codehaus.janino" % "janino" % "3.1.4"
), ),
// TODO(chord): remove exclusion when SessionActor is refactored: https://github.com/psforever/PSF-LoginServer/issues/279 // TODO(chord): remove exclusion when SessionActor is refactored: https://github.com/psforever/PSF-LoginServer/issues/279
coverageExcludedPackages := "net\\.psforever\\.actors\\.session\\.SessionActor.*" coverageExcludedPackages := "net\\.psforever\\.actors\\.session\\.SessionActor.*"

28
config/logback.xml
View file

@ -20,17 +20,9 @@
<encoder> <encoder>
<pattern>%date{ISO8601} %5level %logger{35} - %msg%n</pattern> <pattern>%date{ISO8601} %5level %logger{35} - %msg%n</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.core.filter.EvaluatorFilter"> <filter class="net.psforever.filter.MsgRegexFilter">
<evaluator> <!-- occurs during latency or relogging complications; the messages are useless -->
<matcher> <regex>Unexpected packet type EncryptedPacket</regex>
<Name>encrypted</Name>
<!-- occurs during latency or relogging complications; the messages are useless -->
<regex>Unexpected packet type EncryptedPacket</regex>
</matcher>
<expression>encrypted.matches(formattedMessage)</expression>
</evaluator>
<OnMatch>DENY</OnMatch>
<OnMismatch>NEUTRAL</OnMismatch>
</filter> </filter>
<filter class="net.psforever.filters.LoggerPrefixFilter"> <filter class="net.psforever.filters.LoggerPrefixFilter">
<!-- <!--
@ -103,17 +95,9 @@
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level> <level>WARN</level>
</filter> </filter>
<filter class="ch.qos.logback.core.filter.EvaluatorFilter"> <filter class="net.psforever.filters.MsgRegexFilter">
<evaluator> <!-- occurs during logging or relogging complications; the messages are useless -->
<matcher> <regex>Unexpected packet type EncryptedPacket</regex>
<Name>encrypted</Name>
<!-- occurs during logging or relogging complications; the messages are useless -->
<regex>Unexpected packet type EncryptedPacket</regex>
</matcher>
<expression>encrypted.matches(formattedMessage)</expression>
</evaluator>
<OnMatch>DENY</OnMatch>
<OnMismatch>NEUTRAL</OnMismatch>
</filter> </filter>
</appender> </appender>

29
server/src/main/java/net/psforever/filters/MsgRegexFilter.java Normal file
View file

@ -0,0 +1,29 @@
package net.psforever.filters;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
/**
* Disrupts a variety of messages that, when formatted, match against the configured regular expression.
* A replacement for the `EvaluatorFilter`.
*/
public class MsgRegexFilter extends Filter<ILoggingEvent> {
private String regex;
@Override
public FilterReply decide(ILoggingEvent event) {
if (isStarted() && event.getFormattedMessage().matches(regex)) {
return FilterReply.DENY;
} else {
return FilterReply.NEUTRAL;
}
}
@Override
public void start() {
if (this.regex != null) {
super.start();
}
}
}