library updates

server/pom.xml

@@ -602,10 +602,15 @@
             <artifactId>commons-net</artifactId>
             <version>3.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.1</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -625,7 +630,7 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
-            <version>1.5.6</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -675,12 +680,12 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.57</version>
+            <version>1.58</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.57</version>
+            <version>1.58</version>
         </dependency>
         <dependency>
             <groupId>javax.xml</groupId>
@@ -730,12 +735,12 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>webjars-locator-core</artifactId>
-            <version>0.32</version>
+            <version>0.33</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.5.3</version>
+            <version>2.5.5</version>
         </dependency>
 
 
@@ -765,7 +770,7 @@
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <artifactId>dgrid</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>

server/src/main/java/password/pwm/util/AlertHandler.java

@@ -22,7 +22,7 @@
 
 package password.pwm.util;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import password.pwm.AppProperty;
 import password.pwm.PwmApplication;
 import password.pwm.PwmConstants;

server/src/main/java/password/pwm/util/java/StringUtil.java

@@ -24,8 +24,8 @@ package password.pwm.util.java;
 
 import net.iharder.Base64;
 import org.apache.commons.codec.binary.Base32;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import password.pwm.PwmConstants;
 import password.pwm.util.logging.PwmLogger;
 

server/src/main/java/password/pwm/util/logging/PwmLogEvent.java

@@ -23,6 +23,7 @@
 package password.pwm.util.logging;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
 import password.pwm.bean.SessionLabel;
 import password.pwm.util.java.JsonUtil;
 import password.pwm.util.java.StringUtil;
@@ -33,20 +34,11 @@ import java.io.Serializable;
 import java.io.StringWriter;
 import java.time.Instant;
 
+@Getter
 public class PwmLogEvent implements Serializable, Comparable {
-// -------------------------- ENUMERATIONS --------------------------
 
-    private static final String VERSION = "1";
+    private static final int MAX_MESSAGE_LENGTH = 1_000_000;
 
-    private static final String KEY_VERSION = "v";
-    private static final String KEY_LEVEL = "l";
-    private static final String KEY_TOPIC = "t";
-    private static final String KEY_MESSAGE = "m";
-    private static final String KEY_SOURCE = "s";
-    private static final String KEY_ACTOR = "a";
-    private static final String KEY_LABEL = "b";
-    private static final String KEY_THROWABLE = "e";
-    private static final String KEY_DATE = "d";
 
     // ------------------------------ FIELDS ------------------------------
 
@@ -102,6 +94,10 @@ public class PwmLogEvent implements Serializable, Comparable {
             throw new IllegalArgumentException("level may not be null");
         }
 
+        if (message != null && message.length() > MAX_MESSAGE_LENGTH) {
+            throw new IllegalStateException("log message length is too long (" + message.length() + " chars)");
+        }
+
         this.date = date;
         this.topic = topic;
         this.message = message;
@@ -177,48 +173,6 @@ public class PwmLogEvent implements Serializable, Comparable {
     }
 
 
-// --------------------- GETTER / SETTER METHODS ---------------------
-
-    public String getActor()
-    {
-        return actor;
-    }
-
-    public Instant getDate()
-    {
-        return date;
-    }
-
-    public PwmLogLevel getLevel()
-    {
-        return level;
-    }
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    public String getSource()
-    {
-        return source;
-    }
-
-    public Throwable getThrowable()
-    {
-        return throwable;
-    }
-
-    public String getTopic()
-    {
-        return topic;
-    }
-
-    public String getLabel()
-    {
-        return label;
-    }
-
     public String getTopTopic()
     {
         if (topic == null) {
@@ -229,7 +183,7 @@ public class PwmLogEvent implements Serializable, Comparable {
         return lastDot != -1 ? topic.substring(lastDot + 1, topic.length()) : topic;
     }
 
-    public String getEnhancedMessage()
+    String getEnhancedMessage()
     {
         final StringBuilder output = new StringBuilder();
         output.append(getDebugLabel());
@@ -267,30 +221,10 @@ public class PwmLogEvent implements Serializable, Comparable {
         return this.getDate().compareTo(((PwmLogEvent) o).getDate());
     }
 
-    public String toEncodedString()
+    String toEncodedString()
             throws IOException
     {
         return JsonUtil.serialize(this);
-        /*
-        final Map<String, String> tempMap = new HashMap<>();
-        tempMap.put(KEY_VERSION, VERSION);
-        tempMap.put(KEY_TOPIC, topic);
-        tempMap.put(KEY_MESSAGE, message);
-        tempMap.put(KEY_SOURCE, source);
-        tempMap.put(KEY_ACTOR, actor);
-        tempMap.put(KEY_LEVEL, level.toString());
-        tempMap.put(KEY_DATE, String.valueOf(date.getTime()));
-
-        if (label != null) {
-            tempMap.put(KEY_LABEL, label);
-        }
-
-        if (throwable != null) {
-            tempMap.put(KEY_THROWABLE, Base64.encodeObject(throwable, Base64.NO_OPTIONS));
-        }
-
-        return JsonUtil.serializeMap(tempMap);
-        */
     }
 
     private String getDebugLabel()