fix websockets issue

igniterealtime · Mar 17, 2024 · 82dbfec · 82dbfec
1 parent b72eac6
commit 82dbfec
Show file tree

Hide file tree

Showing 53 changed files with 228 additions and 6,523 deletions.
diff --git a/build.cmd b/build.cmd
@@ -2,10 +2,10 @@ call mvn clean package -Dmaven.test.skip=true
 
 cd target
 rename pade-openfire-plugin-assembly.jar pade.jar
-rd "D:\Openfire\openfire_4_7_5\plugins\pade" /q /s
-del "D:\Openfire\openfire_4_7_5\plugins\pade.jar" 
-del /q "D:\Openfire\openfire_4_7_5\logs\*.*"
-copy pade.jar D:\Openfire\openfire_4_7_5\plugins\pade.jar
+rd "D:\Openfire\openfire_4_8_0\plugins\pade" /q /s
+del "D:\Openfire\openfire_4_8_0\plugins\pade.jar" 
+del /q "D:\Openfire\openfire_4_8_0\logs\*.*"
+copy pade.jar D:\Openfire\openfire_4_8_0\plugins\pade.jar
 
 rd "D:\Projects\openfire-cluster\node1\plugins\pade" /q /s
 del "D:\Projects\openfire-cluster\node1\plugins\pade.jar" 

diff --git a/changelog.html b/changelog.html
@@ -44,12 +44,12 @@ <h1>
 Pade Changelog
 </h1>
 
-<p><b>1.8.0</b> -- <i>March 31, 2024</i></p> 
+<p><b>1.8.0</b> -- <i>March 31, 2024</i></p>
  <ul>
-	<li></li>
- </ul> 
- 
-<p><b>1.7.9</b> -- <i>March 16, 2024</i></p> 
+	<li>Marking that this version (and implicitly, future versions) are now compatible with Openfire 4.8.0+</li>
+ </ul>
+
+<p><b>1.7.9</b> -- <i>December 31, 2023</i></p> 
  <ul>
 	<li>Update to latest Pade client code</li>
      <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/pull/465">Issue #465 - fix firefox's unsupported codec error</a></li>	

diff --git a/plugin.xml b/plugin.xml
@@ -5,10 +5,9 @@
     <description>${project.description}</description>
     <author>Ignite Realtime</author>
     <version>${project.version}</version>
-    <date>16/03/2024</date>
-	<priorToServerVersion>4.8.0</priorToServerVersion>		
-    <minServerVersion>4.7.0</minServerVersion>
-    <minJavaVersion>1.8</minJavaVersion>   
+    <date>31/03/2024</date>	
+    <minServerVersion>4.8.0</minServerVersion>
+    <minJavaVersion>1.11</minJavaVersion>   
     <adminconsole>
         <tab id="tab-ofmeet" name="${plugin.title}" url="ofmeet-summary.jsp" description="${plugin.description}">
             <sidebar id="siderbar-ofmeet"             name="${plugin.jitsi.title}">

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.7.0</version>
+        <version>4.8.1</version>
     </parent>
 
     <groupId>org.igniterealtime.openfire</groupId>
@@ -104,10 +104,17 @@
     </build>
 
     <dependencies>   
+        <dependency>
+            <groupId>org.igniterealtime.openfire</groupId>
+            <artifactId>xmppserver</artifactId>
+            <version>${openfire.version}</version>
+            <scope>provided</scope>
+        </dependency>	
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcmail-jdk15on</artifactId>
             <version>${bouncycastle.version}</version>
+            <scope>provided</scope>				
         </dependency>	
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -136,32 +143,7 @@
             <groupId>javax.sip</groupId>
             <artifactId>jain-sip-ri</artifactId>
             <version>1.3.0-91</version>			
-        </dependency>		
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>1.19.4</version>
-        </dependency>
+        </dependency>			
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
@@ -260,7 +242,7 @@
         <dependency>
             <groupId>org.bitbucket.b_c</groupId>
             <artifactId>jose4j</artifactId>
-            <version>0.9.4</version>
+            <version>0.9.3</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/fluent-hc -->
@@ -284,14 +266,6 @@
             <artifactId>picocontainer</artifactId>
             <version>1.2</version>
         </dependency>
-
-
-        <!-- https://mvnrepository.com/artifact/org.eclipse.jetty.fcgi/fcgi-server -->
-        <dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-server</artifactId>
-            <version>9.4.12.v20180830</version>
-        </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.j256.two-factor-auth/two-factor-auth -->
         <dependency>
@@ -403,13 +377,40 @@
             <version>3.2.1.Final</version>
         </dependency> 
 
-		<!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-util -->
+		<dependency>
+			<groupId>org.eclipse.jetty.websocket</groupId>
+			<artifactId>websocket-jetty-client</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>	
+
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>9.4.35.v20201120</version>
+			<artifactId>jetty-io</artifactId>
+			<version>${jetty.version}</version>
+            <scope>provided</scope>			
 		</dependency>
 
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-http</artifactId>
+			<version>${jetty.version}</version>
+            <scope>provided</scope>			
+		</dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-jetty-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>provided</scope>				
+        </dependency>		
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty.version}</version>
+            <scope>provided</scope>			
+		</dependency>		
+
 		<dependency>
 			<groupId>com.yubico</groupId>
 			<artifactId>webauthn-server-core</artifactId>
@@ -429,6 +430,7 @@
             <artifactId>web-push</artifactId>
             <version>5.1.1</version>
         </dependency>
+
     </dependencies>
 
     <repositories>

diff --git a/src/java/org/ifsoft/download/Servlet.java b/src/java/org/ifsoft/download/Servlet.java
@@ -62,14 +62,13 @@ private void writeHeader(String urlString, HttpServletResponse response)
                 response.setHeader("Content-Type", "text/html");
 
             response.setHeader("Connection", "close");
-
-            HttpBindManager boshManager = HttpBindManager.getInstance();
-
-            response.setHeader("Access-Control-Allow-Origin", boshManager.getCORSAllowOrigin());
-            response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT + ", Authorization");
-            response.setHeader("Access-Control-Allow-Credentials", "true");
-            response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
-
+
+			HttpBindManager boshManager = HttpBindManager.getInstance();
+			response.setHeader("Access-Control-Allow-Methods", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getValue()));
+			response.setHeader("Access-Control-Allow-Headers", String.join(",", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getValue() + ", Authorization"));
+			response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getValue().toSeconds()));
+			response.setHeader("Access-Control-Allow-Origin", String.valueOf(HttpBindManager.HTTP_BIND_ALLOWED_ORIGINS.getDefaultValue()));
+			response.setHeader("Access-Control-Allow-Credentials", "true");			
         }
         catch(Exception e)
         {

diff --git a/src/java/org/ifsoft/meet/Email.java b/src/java/org/ifsoft/meet/Email.java
diff --git a/src/java/org/ifsoft/meet/Friend.java b/src/java/org/ifsoft/meet/Friend.java