From 96bea07ad260b45c4da8b91d8302d40c94ff537c Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 8 Aug 2019 17:42:40 +0200 Subject: [PATCH] Fix merge errors --- src/main/java/fr/xephi/authme/AuthMe.java | 2 +- .../authme/initialization/OnStartupTasks.java | 2 +- .../authme/output/ConsoleFilterTest.java | 77 ------ .../xephi/authme/output/Log4JFilterTest.java | 230 ------------------ 4 files changed, 2 insertions(+), 309 deletions(-) delete mode 100644 src/test/java/fr/xephi/authme/output/ConsoleFilterTest.java delete mode 100644 src/test/java/fr/xephi/authme/output/Log4JFilterTest.java diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 0da11ec6a..76ce55140 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -219,7 +219,7 @@ public class AuthMe extends JavaPlugin { ConsoleLoggerFactory.reloadSettings(settings); logger = ConsoleLoggerFactory.get(AuthMe.class); OnStartupTasks onStartupTasks = injector.newInstance(OnStartupTasks.class); - onStartupTasks.setupConsoleFilter(settings, getLogger()); + onStartupTasks.setupConsoleFilter(getLogger()); // Set all service fields on the AuthMe class instantiateServices(injector); diff --git a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java index 114a25120..0ffdba58f 100644 --- a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java +++ b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java @@ -66,7 +66,7 @@ public class OnStartupTasks { * * @param logger the plugin logger */ - public void setupConsoleFilter(Settings settings, Logger logger) { + public void setupConsoleFilter(Logger logger) { // Try to set the log4j filter try { Class.forName("org.apache.logging.log4j.core.filter.AbstractFilter"); diff --git a/src/test/java/fr/xephi/authme/output/ConsoleFilterTest.java b/src/test/java/fr/xephi/authme/output/ConsoleFilterTest.java deleted file mode 100644 index 8975068f6..000000000 --- a/src/test/java/fr/xephi/authme/output/ConsoleFilterTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package fr.xephi.authme.output; - -import org.junit.Test; -import org.mockito.Mockito; - -import java.util.logging.LogRecord; - -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -/** - * Test for {@link ConsoleFilter}. - */ -public class ConsoleFilterTest { - - private final ConsoleFilter filter = new ConsoleFilter(); - - private static final String SENSITIVE_COMMAND = "User issued server command: /login test test"; - private static final String NORMAL_COMMAND = "User issued server command: /motd 2"; - - - @Test - public void shouldReplaceSensitiveRecord() { - // given - LogRecord record = createRecord(SENSITIVE_COMMAND); - - // when - boolean result = filter.isLoggable(record); - - // then - assertThat(result, equalTo(true)); - verify(record).setMessage("User issued an AuthMe command"); - } - - @Test - public void shouldNotFilterRegularCommand() { - // given - LogRecord record = createRecord(NORMAL_COMMAND); - - // when - boolean result = filter.isLoggable(record); - - // then - assertThat(result, equalTo(true)); - verify(record, never()).setMessage("User issued an AuthMe command"); - } - - @Test - public void shouldManageRecordWithNullMessage() { - // given - LogRecord record = createRecord(null); - - // when - boolean result = filter.isLoggable(record); - - // then - assertThat(result, equalTo(true)); - verify(record, never()).setMessage("User issued an AuthMe command"); - } - - - /** - * Creates a mock of {@link LogRecord} and sets it to return the given message. - * - * @param message The message to set. - * - * @return Mock of LogRecord - */ - private static LogRecord createRecord(String message) { - LogRecord record = Mockito.mock(LogRecord.class); - when(record.getMessage()).thenReturn(message); - return record; - } -} diff --git a/src/test/java/fr/xephi/authme/output/Log4JFilterTest.java b/src/test/java/fr/xephi/authme/output/Log4JFilterTest.java deleted file mode 100644 index b9977de8e..000000000 --- a/src/test/java/fr/xephi/authme/output/Log4JFilterTest.java +++ /dev/null @@ -1,230 +0,0 @@ -package fr.xephi.authme.output; - -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.when; - -import org.apache.logging.log4j.core.Filter.Result; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.message.Message; -import org.junit.Test; -import org.mockito.Mockito; - -/** - * Test for {@link Log4JFilter}. - */ -public class Log4JFilterTest { - - private final Log4JFilter log4JFilter = new Log4JFilter(); - - private static final String SENSITIVE_COMMAND = "User issued server command: /login pass pass"; - private static final String NORMAL_COMMAND = "User issued server command: /help"; - private static final String OTHER_COMMAND = "Starting the server... Write /l for logs"; - - // --------- - // Test the filter(LogEvent) method - // --------- - @Test - public void shouldFilterSensitiveLogEvent() { - // given - Message message = mockMessage(SENSITIVE_COMMAND); - LogEvent event = Mockito.mock(LogEvent.class); - when(event.getMessage()).thenReturn(message); - - // when - Result result = log4JFilter.filter(event); - - // then - assertThat(result, equalTo(Result.DENY)); - } - - @Test - public void shouldNotFilterIrrelevantLogEvent() { - // given - Message message = mockMessage(NORMAL_COMMAND); - LogEvent event = Mockito.mock(LogEvent.class); - when(event.getMessage()).thenReturn(message); - - // when - Result result = log4JFilter.filter(event); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterNonCommandLogEvent() { - // given - Message message = mockMessage(OTHER_COMMAND); - LogEvent event = Mockito.mock(LogEvent.class); - when(event.getMessage()).thenReturn(message); - - // when - Result result = log4JFilter.filter(event); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterLogEventWithNullMessage() { - // given - Message message = mockMessage(null); - LogEvent event = Mockito.mock(LogEvent.class); - when(event.getMessage()).thenReturn(message); - - // when - Result result = log4JFilter.filter(event); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterWhenLogEventIsNull() { - // given / when - Result result = log4JFilter.filter(null); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - // ---------- - // Test filter(Logger, Level, Marker, String, Object...) - // ---------- - @Test - public void shouldFilterSensitiveStringMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, SENSITIVE_COMMAND); - - // then - assertThat(result, equalTo(Result.DENY)); - } - - @Test - public void shouldNotFilterNormalStringMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, NORMAL_COMMAND); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterNonCommandStringMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, OTHER_COMMAND); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldReturnNeutralForNullMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, null); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - // -------- - // Test filter(Logger, Level, Marker, Object, Throwable) - // -------- - @Test - public void shouldFilterSensitiveObjectMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, SENSITIVE_COMMAND, new Exception()); - - // then - assertThat(result, equalTo(Result.DENY)); - } - - @Test - public void shouldNotFilterNullObjectParam() { - // given / when - Result result = log4JFilter.filter(null, null, null, (Object) null, new Exception()); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterIrrelevantMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, OTHER_COMMAND, new Exception()); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterNonSensitiveCommand() { - // given / when - Result result = log4JFilter.filter(null, null, null, NORMAL_COMMAND, new Exception()); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - // -------- - // Test filter(Logger, Level, Marker, Message, Throwable) - // -------- - @Test - public void shouldFilterSensitiveMessage() { - // given - Message message = mockMessage(SENSITIVE_COMMAND); - - // when - Result result = log4JFilter.filter(null, null, null, message, new Exception()); - - // then - assertThat(result, equalTo(Result.DENY)); - } - - @Test - public void shouldNotFilterNonSensitiveMessage() { - // given - Message message = mockMessage(NORMAL_COMMAND); - - // when - Result result = log4JFilter.filter(null, null, null, message, new Exception()); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterNonCommandMessage() { - // given - Message message = mockMessage(OTHER_COMMAND); - - // when - Result result = log4JFilter.filter(null, null, null, message, new Exception()); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - @Test - public void shouldNotFilterNullMessage() { - // given / when - Result result = log4JFilter.filter(null, null, null, null, new Exception()); - - // then - assertThat(result, equalTo(Result.NEUTRAL)); - } - - /** - * Mocks a {@link Message} object and makes it return the given formatted message. - * - * @param formattedMessage the formatted message the mock should return - * @return Message mock - */ - private static Message mockMessage(String formattedMessage) { - Message message = Mockito.mock(Message.class); - when(message.getFormattedMessage()).thenReturn(formattedMessage); - return message; - } - -}