prepare for release 1.8.3

igniterealtime · Sep 20, 2024 · 95ecfa7 · 95ecfa7
1 parent 4a4c636
commit 95ecfa7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 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_8_1\plugins\pade" /q /s
-del "D:\Openfire\openfire_4_8_1\plugins\pade.jar" 
-del /q "D:\Openfire\openfire_4_8_1\logs\*.*"
-copy pade.jar D:\Openfire\openfire_4_8_1\plugins\pade.jar
+rd "D:\Openfire\openfire_4_9_0\plugins\pade" /q /s
+del "D:\Openfire\openfire_4_9_0\plugins\pade.jar" 
+del /q "D:\Openfire\openfire_4_9_0\logs\*.*"
+copy pade.jar D:\Openfire\openfire_4_9_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,7 +44,7 @@ <h1>
 Pade Changelog
 </h1>
 
-<p><b>1.8.3</b> -- <i>(tbd)</i></p>
+<p><b>1.8.3</b> -- <i>September 20, 2024</i></p>
  <ul>
      <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/476">Issue #476 - Compatibility issue with Openfire 4.9.0.</a></li>
  </ul>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.8.1</version>
+        <version>4.9.0</version>
     </parent>
 
     <groupId>org.igniterealtime.openfire</groupId>

diff --git a/src/i18n/pade_i18n.properties b/src/i18n/pade_i18n.properties
@@ -593,7 +593,7 @@ config.freeswitch.gateways.name=Gateways
 config.freeswitch.gateways.description=Gateways
 
 config.converse.settings.branding=Branding
-config.converse.settings.description=Use this form to enable and configure the options/settings in /options/branding.js for branding Converse for this domain
+config.converse.settings.description=Pade will disable support for CSP (Content-Security-Policy) headers. Use this form to enable and configure the options/settings in /options/branding.js for branding Converse for this domain.
 config.converse.connectivity.description=The public web application is currently being served at
 config.converse.settings.name=Enable/Disable Setting
 config.converse.settings.value=Value

diff --git a/src/java/uk/ifsoft/openfire/plugins/pade/PadePlugin.java b/src/java/uk/ifsoft/openfire/plugins/pade/PadePlugin.java
@@ -71,6 +71,7 @@ public class PadePlugin implements Plugin, MUCEventListener
     private String server;
 	private HashMap<String, Object> requests = new HashMap<>();
     private MastodonIQHandler mastodonIQHandler;	
+	private boolean isCSPEnabled = true;
 
     /**
      * Initializes the plugin.
@@ -90,7 +91,9 @@ public void initializePlugin( final PluginManager manager, final File pluginDire
         interceptor = new WebPushInterceptor();
         InterceptorManager.getInstance().addInterceptor( interceptor );
         OfflineMessageStrategy.addListener( interceptor );
-
+
+		isCSPEnabled = HttpBindManager.HTTP_BIND_CONTENT_SECURITY_POLICY_ENABLED.getValue();
+		HttpBindManager.HTTP_BIND_CONTENT_SECURITY_POLICY_ENABLED.setValue( false );
 
         try
         {
@@ -224,6 +227,8 @@ private String requestToJson(Object request, String username)
     public void destroyPlugin()
     {		
         Log.info("stop pade server");
+
+		HttpBindManager.HTTP_BIND_CONTENT_SECURITY_POLICY_ENABLED.setValue( isCSPEnabled );		
 
         if (ofMeetPlugin != null) ofMeetPlugin.destroyPlugin();