Merge pull request #76 from mmuruev/feature/upgrade-versions

Author: bpossolo

README.md

@@ -15,6 +15,11 @@ Maven
 </dependency>
 ```
 
+Gradle(Kotlin)
+```
+implementation("com.github.ua-parser:uap-java:1.5.3")
+```
+
 SBT
 ```
 "com.github.ua-parser" % "uap-java" % "1.5.3"

pom.xml

@@ -87,10 +87,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.10.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>
@@ -104,7 +104,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -118,9 +118,9 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.1</version>
             <configuration>
-              <source>1.7</source>
+              <source>1.8</source>
             </configuration>
             <executions>
               <execution>
@@ -135,7 +135,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -160,12 +160,12 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
-      <version>4.1</version>
+      <version>4.4</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/ua_parser/Parser.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
@@ -32,6 +33,8 @@
 public class Parser {
 
   private static final String REGEX_YAML_PATH = "/ua_parser/regexes.yaml";
+
+  public static final int CODE_POINT_LIMIT = 3455764;
   private UserAgentParser uaParser;
   private OSParser osParser;
   private DeviceParser deviceParser;
@@ -41,8 +44,18 @@ public class Parser {
    * @throws RuntimeException if there's a problem reading the file from the classpath
    */
   public Parser() {
+    this(getDefaultLoaderOptions());
+  }
+
+  /**
+   * Creates a parser using the regular expression yaml file bundled in the jar.
+   *
+   * @param loaderOptions configuration for loading parser safe limits.
+   * @throws RuntimeException if there's a problem reading the file from the classpath.
+   */
+  public Parser(LoaderOptions loaderOptions) {
     try (InputStream is = Parser.class.getResourceAsStream(REGEX_YAML_PATH)) {
-      initialize(is);
+      initialize(is, loaderOptions);
     } catch (IOException e) {
       throw new RuntimeException("failed to initialize parser from regexes.yaml bundled in jar", e);
     }
@@ -54,7 +67,16 @@ public Parser() {
    * @param regexYaml the yaml file containing the regular expressions
    */
   public Parser(InputStream regexYaml) {
-    initialize(regexYaml);
+    this(regexYaml, getDefaultLoaderOptions());
+  }
+  /**
+   * Creates a parser using the supplied regular expression yaml file.
+   * It is the responsibility of the caller to close the InputStream after construction.
+   * @param regexYaml the yaml file containing the regular expressions
+   * @param loaderOptions configuration for loading parser safe limits.
+   */
+  public Parser(InputStream regexYaml, LoaderOptions loaderOptions) {
+    initialize(regexYaml, loaderOptions);
   }
 
   public Client parse(String agentString) {
@@ -76,9 +98,15 @@ public OS parseOS(String agentString) {
     return osParser.parse(agentString);
   }
 
-  private void initialize(InputStream regexYaml) {
-    Yaml yaml = new Yaml(new SafeConstructor());
-    
+  public static LoaderOptions getDefaultLoaderOptions(){
+    LoaderOptions options = new LoaderOptions();
+    options.setCodePointLimit(CODE_POINT_LIMIT);
+    return options;
+  }
+
+  private void initialize(InputStream regexYaml, LoaderOptions loaderOptions) {
+    Yaml yaml = new Yaml(new SafeConstructor(loaderOptions));
+
     @SuppressWarnings("unchecked")
     Map<String,List<Map<String,String>>> regexConfig = (Map<String,List<Map<String,String>>>) yaml.load(regexYaml);
 

src/test/java/ua_parser/ParserTest.java

@@ -35,7 +35,7 @@
  */
 public class ParserTest {
   final String TEST_RESOURCE_PATH = "/ua_parser/";
-  Yaml yaml = new Yaml();
+  Yaml yaml = new Yaml(Parser.getDefaultLoaderOptions());;
   Parser parser;
 
   @Before