jetty 11

NationalSecurityAgency · Sep 9, 2023 · 8dab475 · 8dab475
1 parent 2d36dd7
commit 8dab475
Show file tree

Hide file tree

Showing 72 changed files with 404 additions and 384 deletions.
diff --git a/README.md b/README.md
@@ -291,15 +291,15 @@ recommend using the sample keystore in production environments.  To use your own
 Standalone
 
 ```
-./emissary server -p 8443 --ssl
+./emissary server -p 8443 --ssl --disableSniHostCheck
 ```
 
 Clustered
 ```
-./emissary server -p 8443 --ssl --mode cluster
-./emissary server -p 9443 --ssl --mode cluster
+./emissary server -p 8443 --ssl --disableSniHostCheck --mode cluster
+./emissary server -p 9443 --ssl --disableSniHostCheck --mode cluster
 mkdir ~/Desktop/feed1
-./emissary feed -p 7443 --ssl -i ~/Desktop/feed1/
+./emissary feed -p 7443 --ssl --disableSniHostCheck -i ~/Desktop/feed1/
 ````
 
 ## Contact Us

diff --git a/pom.xml b/pom.xml
@@ -65,20 +65,20 @@
     <dep.jackson.version>2.13.4</dep.jackson.version>
     <dep.jakarta.activation-api.version>1.2.2</dep.jakarta.activation-api.version>
     <dep.jakarta.servlet-api.version>4.0.3</dep.jakarta.servlet-api.version>
-    <dep.jakarta.xml.bind-api.version>2.3.3</dep.jakarta.xml.bind-api.version>
-    <dep.javax.annotation-api.version>1.3.2</dep.javax.annotation-api.version>
+    <dep.jakarta.xml.bind-api.version>3.0.1</dep.jakarta.xml.bind-api.version>
+    <dep.jaxb.runtime.version>3.0.1</dep.jaxb.runtime.version>
     <dep.jdom2.version>2.0.6.1</dep.jdom2.version>
-    <dep.jersey.version>2.35</dep.jersey.version>
-    <dep.jetty.version>9.4.51.v20230217</dep.jetty.version>
+    <dep.jersey.version>3.1.3</dep.jersey.version>
+    <dep.jetty.version>11.0.16</dep.jetty.version>
     <dep.junit-jupiter.version>5.8.2</dep.junit-jupiter.version>
     <!-- junit-vintage, hamcrest and jersey disagree, but this works for everyone -->
     <dep.junit.version>4.13.2</dep.junit.version>
-    <dep.logback.version>1.2.11</dep.logback.version>
+    <dep.logback.version>1.4.11</dep.logback.version>
     <!-- seems to have an impact with java 11 integration, update with caution -->
     <dep.maven-surefire-plugin.version>3.1.0</dep.maven-surefire-plugin.version>
     <dep.mockito.version>5.4.0</dep.mockito.version>
     <dep.picocli.version>4.7.4</dep.picocli.version>
-    <dep.slf4j.version>1.7.36</dep.slf4j.version>
+    <dep.slf4j.version>2.0.7</dep.slf4j.version>
     <dep.spullara.mustache.compiler.version>0.9.10</dep.spullara.mustache.compiler.version>
     <dep.spymemcached.version>2.12.3</dep.spymemcached.version>
     <dep.versions.maven.plugin.version>2.14.2</dep.versions.maven.plugin.version>
@@ -207,11 +207,6 @@
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>${dep.jakarta.xml.bind-api.version}</version>
       </dependency>
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>${dep.javax.annotation-api.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.spy</groupId>
         <artifactId>spymemcached</artifactId>
@@ -253,66 +248,9 @@
         <version>${dep.httpcore.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.jersey.containers</groupId>
-        <artifactId>jersey-container-jetty-http</artifactId>
-        <version>${dep.jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.containers</groupId>
-        <artifactId>jersey-container-servlet-core</artifactId>
-        <version>${dep.jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.core</groupId>
-        <artifactId>jersey-common</artifactId>
-        <version>${dep.jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.core</groupId>
-        <artifactId>jersey-server</artifactId>
-        <version>${dep.jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.ext</groupId>
-        <artifactId>jersey-mvc</artifactId>
-        <version>${dep.jersey.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.ext</groupId>
-        <artifactId>jersey-mvc-mustache</artifactId>
-        <version>${dep.jersey.version}</version>
-        <exclusions>
-          <exclusion>
-            <!-- need to exclude servlet-api 2.4 from this -->
-            <groupId>com.github.spullara.mustache.java</groupId>
-            <artifactId>compiler</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.inject</groupId>
-        <artifactId>jersey-hk2</artifactId>
-        <version>${dep.jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.media</groupId>
-        <artifactId>jersey-media-json-jackson</artifactId>
-        <version>${dep.jersey.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.media</groupId>
-        <artifactId>jersey-media-multipart</artifactId>
-        <version>${dep.jersey.version}</version>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-runtime</artifactId>
+        <version>${dep.jaxb.runtime.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>
@@ -361,6 +299,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey</groupId>
+        <artifactId>jersey-bom</artifactId>
+        <version>${dep.jersey.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -373,18 +318,6 @@
         <version>${dep.bcprov-jdk15on.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-        <artifactId>jersey-test-framework-provider-jetty</artifactId>
-        <version>${dep.jersey.version}</version>
-        <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
@@ -396,6 +329,12 @@
         <artifactId>junit-vintage-engine</artifactId>
         <version>${dep.junit-jupiter.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
@@ -476,6 +415,10 @@
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>net.logstash.logback</groupId>
       <artifactId>logstash-logback-encoder</artifactId>
@@ -525,12 +468,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -544,6 +481,10 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-jetty-http</artifactId>
@@ -998,6 +939,25 @@
           <artifactId>duplicate-finder-maven-plugin</artifactId>
           <version>1.5.1</version>
           <configuration>
+            <exceptions>
+              <exception>
+                <conflictingDependencies>
+                  <dependency>
+                    <groupId>org.glassfish.jersey.containers</groupId>
+                    <artifactId>jersey-container-jetty-http</artifactId>
+                    <version>${dep.jersey.version}</version>
+                  </dependency>
+                  <dependency>
+                    <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+                    <artifactId>jersey-test-framework-provider-jetty</artifactId>
+                    <version>${dep.jersey.version}</version>
+                  </dependency>
+                </conflictingDependencies>
+                <resources>
+                  <resource>org/glassfish/jersey/jetty/internal/localization.properties</resource>
+                </resources>
+              </exception>
+            </exceptions>
             <printEqualFiles>false</printEqualFiles>
             <failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
             <failBuildInCaseOfEqualContentConflict>false</failBuildInCaseOfEqualContentConflict>

diff --git a/src/main/java/emissary/client/EmissaryClient.java b/src/main/java/emissary/client/EmissaryClient.java
@@ -4,6 +4,7 @@
 import emissary.config.Configurator;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.hc.client5.http.auth.AuthCache;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
@@ -38,7 +39,6 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
-import javax.ws.rs.core.MediaType;
 
 /**
  * Base class of all the actions that use HttpClient.

diff --git a/src/main/java/emissary/client/EmissaryResponse.java b/src/main/java/emissary/client/EmissaryResponse.java
@@ -3,6 +3,7 @@
 import emissary.client.response.BaseEntity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.Header;
@@ -15,7 +16,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import javax.ws.rs.core.MediaType;
 
 public class EmissaryResponse {
 

diff --git a/src/main/java/emissary/client/response/Agent.java b/src/main/java/emissary/client/response/Agent.java
@@ -1,12 +1,12 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class Agent implements Comparable<Agent>, Serializable {

diff --git a/src/main/java/emissary/client/response/AgentList.java b/src/main/java/emissary/client/response/AgentList.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class AgentList implements Serializable {

diff --git a/src/main/java/emissary/client/response/AgentsResponseEntity.java b/src/main/java/emissary/client/response/AgentsResponseEntity.java
@@ -1,15 +1,16 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "agents")
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/src/main/java/emissary/client/response/BaseResponseEntity.java b/src/main/java/emissary/client/response/BaseResponseEntity.java
@@ -1,14 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessOrder;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorOrder;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAccessOrder;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorOrder;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)

diff --git a/src/main/java/emissary/client/response/Config.java b/src/main/java/emissary/client/response/Config.java
@@ -2,11 +2,12 @@
 
 import emissary.config.ConfigEntry;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+
 import java.io.Serializable;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class Config implements Serializable {

diff --git a/src/main/java/emissary/client/response/ConfigList.java b/src/main/java/emissary/client/response/ConfigList.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class ConfigList implements Serializable {

diff --git a/src/main/java/emissary/client/response/ConfigsResponseEntity.java b/src/main/java/emissary/client/response/ConfigsResponseEntity.java
@@ -1,13 +1,12 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 @XmlRootElement(name = "configs")
 @XmlAccessorType(XmlAccessType.NONE)
 public class ConfigsResponseEntity extends BaseResponseEntity {