🔍 Modlog

config.example.yml

@@ -111,4 +111,16 @@ haste:
 
 web:
   # The secret to use when authenticating with the site/wrapper
-  secret_key:
+  secret_key:
+
+# The redis server to connect to. If you don't specify a redis server then the bot will not log messages for modlog
+redis:
+  host: '127.0.0.1'
+  port: 6379
+  password: ''
+
+# If this is specified all sub fields are required to have encryption
+encryption_key:
+  key: 'AES key, 256 bit recommended'
+  iv: '64 bit iv key'
+  mac: '128 bit mac key'

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <build.number>DEV</build.number>
-        <jda.version>4.0.0_39</jda.version>
+        <jda.version>4.1.1_154</jda.version>
         <lavaplayer.version>1.3.47</lavaplayer.version>
         <lavalink.client.version>f9ab37f</lavalink.client.version>
         <kotlin.version>1.3.72</kotlin.version>
@@ -297,6 +297,11 @@
             <artifactId>emoji-java</artifactId>
             <version>4.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.65</version>
+        </dependency>
 
         <!-- Web -->
         <dependency>
@@ -348,6 +353,13 @@
             <artifactId>mongodb-driver-sync</artifactId>
             <version>3.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.2.0</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
@@ -425,6 +437,18 @@
             <version>64.2</version>
         </dependency>
 
+        <!-- Benchmark -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>1.19</version>
+        </dependency>
+
     </dependencies>
 
 </project>

src/benchmark/java/org/cascadebot/cascadebot/CascadeBenchmark.java

@@ -0,0 +1,17 @@
+package org.cascadebot.cascadebot;
+
+import org.openjdk.jmh.runner.RunnerException;
+
+import java.io.IOException;
+
+public class CascadeBenchmark {
+
+    public static void main(String... args) {
+        try {
+            org.openjdk.jmh.Main.main(args);
+        } catch (RunnerException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

src/benchmark/java/org/cascadebot/cascadebot/CryptUtilsBenchmark.java

@@ -0,0 +1,65 @@
+package org.cascadebot.cascadebot;
+
+import org.cascadebot.cascadebot.utils.CryptUtils;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.ShortBufferException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+@State(Scope.Benchmark)
+public class CryptUtilsBenchmark {
+
+    int hmacI = 0;
+    int normalI = 0;
+
+    List<String> testStrings = new ArrayList<>();
+
+    @Setup
+    public void setup() {
+        Random random = new Random();
+        for (int i = 0; i < 400; i++) {
+            byte[] bytes = new byte[random.nextInt(2000)];
+            random.nextBytes(bytes);
+            testStrings.add(new String(bytes));
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void runHmacBenchmark() throws NoSuchPaddingException, BadPaddingException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, IllegalBlockSizeException, ShortBufferException, InvalidKeyException {
+        byte[] key = "eThWmZq4t7wbzbCbFbJbNcRfUjXn2r5u".getBytes();
+        byte[] hashKey = "bJaNdRfU".getBytes();
+        byte[] iv = "u8x/A?D*G-KaPdSg".getBytes();
+        String testString = testStrings.get(hmacI % 400);
+        CryptUtils.encryptString(key, iv, hashKey, testString);
+        hmacI++;
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void runNormalBenchmark() throws NoSuchPaddingException, InvalidKeyException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException, ShortBufferException {
+        byte[] key = "eThWmZq4t7wbzbCbFbJbNcRfUjXn2r5u".getBytes();
+        byte[] iv = "u8x/A?D*G-KaPdSg".getBytes();
+        String testString = testStrings.get(normalI % 400);
+        CryptUtils.encryptString(key, iv, testString);
+        normalI++;
+    }
+
+}

src/main/java/org/cascadebot/cascadebot/CascadeBot.java

@@ -10,6 +10,8 @@
 import ch.qos.logback.contrib.json.classic.JsonLayout;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
+import club.minnced.discord.webhook.WebhookClient;
+import club.minnced.discord.webhook.WebhookClientBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.sedmelluq.discord.lavaplayer.jdaudp.NativeAudioSendFactory;
@@ -35,18 +37,23 @@
 import org.cascadebot.cascadebot.events.CommandListener;
 import org.cascadebot.cascadebot.events.GeneralEventListener;
 import org.cascadebot.cascadebot.events.JDAEventMetricsListener;
+import org.cascadebot.cascadebot.events.MessageEventListener;
+import org.cascadebot.cascadebot.events.ModlogEventListener;
 import org.cascadebot.cascadebot.events.VoiceEventListener;
 import org.cascadebot.cascadebot.metrics.Metrics;
 import org.cascadebot.cascadebot.moderation.ModerationManager;
 import org.cascadebot.cascadebot.music.MusicHandler;
 import org.cascadebot.cascadebot.permissions.PermissionsManager;
+import org.cascadebot.cascadebot.runnables.MessageReceivedRunnable;
 import org.cascadebot.cascadebot.tasks.Task;
 import org.cascadebot.cascadebot.utils.EventWaiter;
 import org.cascadebot.cascadebot.utils.LogbackUtils;
 import org.cascadebot.shared.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 
 import javax.annotation.Nonnull;
 import javax.security.auth.login.LoginException;
@@ -74,6 +81,9 @@ public class CascadeBot {
     private OkHttpClient httpClient;
     private MusicHandler musicHandler;
     private EventWaiter eventWaiter;
+    private Jedis redisClient;
+
+    private MessageReceivedRunnable messageReceivedRunnable;
 
     public static void main(String[] args) {
         try (Scanner scanner = new Scanner(CascadeBot.class.getResourceAsStream("/version.txt"))) {
@@ -142,6 +152,20 @@ private void init() {
             return;
         }
 
+        if (Config.INS.getRedisHost() != null) {
+            redisClient = new Jedis(Config.INS.getRedisHost(), Config.INS.getRedisPort());
+            if (Config.INS.getRedisPassword() != null) {
+                redisClient.auth(Config.INS.getRedisPassword());
+            }
+            try {
+                redisClient.ping("Hello!");
+                LOGGER.info("Redis connected!");
+            } catch (JedisConnectionException e) {
+                LOGGER.warn("Failed to connect to redis", e);
+                redisClient = null;
+            }
+        }
+
         // Sends a message to break up the status log flow to see what events apply to each bot run
         Config.INS.getEventWebhook().send(
                 UnicodeConstants.ZERO_WIDTH_SPACE + "\n" +
@@ -158,6 +182,9 @@ private void init() {
             builder.setPrettyPrinting();
         }
 
+        messageReceivedRunnable = new MessageReceivedRunnable();
+        new Thread(messageReceivedRunnable, "messageHandleThread").start();
+
         if (Config.INS.getConnectionString() != null) {
             databaseManager = new DatabaseManager(Config.INS.getConnectionString());
         } else {
@@ -182,6 +209,7 @@ private void init() {
                     .addEventListeners(new ButtonEventListener())
                     .addEventListeners(new VoiceEventListener())
                     .addEventListeners(new JDAEventMetricsListener())
+                    .addEventListeners(new ModlogEventListener())
                     .addEventListeners(eventWaiter)
                     .setToken(Config.INS.getBotToken())
                     .setShardsTotal(-1)
@@ -202,6 +230,10 @@ private void init() {
                 defaultShardManagerBuilder.setAudioSendFactory(new NativeAudioSendFactory());
             }
 
+            if (redisClient != null) {
+                defaultShardManagerBuilder.addEventListeners(new MessageEventListener());
+            }
+
             shardManager = defaultShardManagerBuilder.build();
         } catch (LoginException e) {
             LOGGER.error("Error building JDA", e);
@@ -318,4 +350,11 @@ public long getUptime() {
         return System.currentTimeMillis() - startupTime;
     }
 
+    public Jedis getRedisClient() {
+        return redisClient;
+    }
+
+    public MessageReceivedRunnable getMessageReceivedRunnable() {
+        return messageReceivedRunnable;
+    }
 }