fixes igniterealtime#33: update API to be compatible with Openfire 4.8

Author: guusdk

changelog.html

@@ -41,8 +41,10 @@
 
 <h1>HTTP File Upload Plugin Changelog</h1>
 
-<p><b>1.1.4</b> -- (tbd)</p>
+<p><b>1.2.0</b> -- (tbd)</p>
 <ul>
+    <li>Now requires Openfire 4.7.0 or later</li>
+    <li><a href="https://github.com/igniterealtime/openfire-httpFileUpload-plugin/issues/33">Issue #33:</a> Fix API incompatiblities with upcoming Openfire 4.8.</li>
     <li>Updated to HttpFileUploadComponent v1.4.0, which resolves:</li>
     <ul>
         <li>Updated Guava library to 30.0-jre to address known vulnerabilities with earlier versions.</li>

pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.3.0</version>
+        <version>4.7.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>httpfileupload</artifactId>
     <name>HTTP File Upload Plugin</name>
     <description>Allows clients to share files, as described in the XEP-0363 'HTTP File Upload' specification.</description>
-    <version>1.1.4-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <distributionManagement>
         <!-- Repository in which we deploy this project, when desired. -->

src/java/org/igniterealtime/openfire/plugins/httpfileupload/CORSServlet.java

@@ -20,11 +20,11 @@ protected void service( HttpServletRequest request, HttpServletResponse response
         final HttpBindManager boshManager = HttpBindManager.getInstance();
 
         // add CORS headers for all HTTP responses (errors, etc.)
-        if (boshManager.isCORSEnabled())
+        if (HttpBindManager.HTTP_BIND_CORS_ENABLED.getValue())
         {
             if (boshManager.isAllOriginsAllowed()) {
                 // Set the Access-Control-Allow-Origin header to * to allow all Origin to do the CORS
-                response.setHeader( "Access-Control-Allow-Origin", HttpBindManager.HTTP_BIND_CORS_ALLOW_ORIGIN_DEFAULT);
+                response.setHeader( "Access-Control-Allow-Origin", HttpBindManager.HTTP_BIND_CORS_ALLOW_ORIGIN_ALL);
             } else {
                 // Get the Origin header from the request and check if it is in the allowed Origin Map.
                 // If it is allowed write it back to the Access-Control-Allow-Origin header of the respond.
@@ -33,9 +33,9 @@ protected void service( HttpServletRequest request, HttpServletResponse response
                     response.setHeader("Access-Control-Allow-Origin", origin);
                 }
             }
-            response.setHeader("Access-Control-Allow-Methods", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS_DEFAULT);
-            response.setHeader("Access-Control-Allow-Headers", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS_DEFAULT);
-            response.setHeader("Access-Control-Max-Age", HttpBindManager.HTTP_BIND_CORS_MAX_AGE_DEFAULT);
+            response.setHeader("Access-Control-Allow-Methods", String.join(", ", HttpBindManager.HTTP_BIND_CORS_ALLOW_METHODS.getDefaultValue()));
+            response.setHeader("Access-Control-Allow-Headers", String.join(", ", HttpBindManager.HTTP_BIND_CORS_ALLOW_HEADERS.getDefaultValue()));
+            response.setHeader("Access-Control-Max-Age", String.valueOf(HttpBindManager.HTTP_BIND_CORS_MAX_AGE.getDefaultValue().getSeconds())); // // TODO: replace with 'toSeconds()' after dropping support for Java 8.
         }
         super.service(request, response);
     }

src/java/org/igniterealtime/openfire/plugins/httpfileupload/HttpFileUploadPlugin.java

@@ -55,7 +55,7 @@ public void initializePlugin( PluginManager manager, File pluginDirectory )
         {
             SlotManager.getInstance().setWebProtocol( JiveGlobals.getProperty( "plugin.httpfileupload.announcedWebProtocol", "https" ) );
             SlotManager.getInstance().setWebHost( JiveGlobals.getProperty( "plugin.httpfileupload.announcedWebHost", XMPPServer.getInstance().getServerInfo().getHostname() ) );
-            SlotManager.getInstance().setWebPort( JiveGlobals.getIntProperty( "plugin.httpfileupload.announcedWebPort", HttpBindManager.getInstance().getHttpBindSecurePort() ) );
+            SlotManager.getInstance().setWebPort( JiveGlobals.getIntProperty( "plugin.httpfileupload.announcedWebPort", HttpBindManager.HTTP_BIND_SECURE_PORT.getValue() ) );
             SlotManager.getInstance().setWebContextRoot( JiveGlobals.getProperty( "plugin.httpfileupload.announcedWebContextRoot", "/httpfileupload" ) );
             SlotManager.getInstance().setMaxFileSize( JiveGlobals.getLongProperty( "plugin.httpfileupload.maxFileSize", SlotManager.DEFAULT_MAX_FILE_SIZE ) );
 
@@ -177,7 +177,7 @@ public final void setProperty( String property )
 
         if ( "plugin.httpfileupload.announcedWebPort".equals( property ) )
         {
-            SlotManager.getInstance().setWebPort( JiveGlobals.getIntProperty( "plugin.httpfileupload.announcedWebPort", HttpBindManager.getInstance().getHttpBindSecurePort() ) );
+            SlotManager.getInstance().setWebPort( JiveGlobals.getIntProperty( "plugin.httpfileupload.announcedWebPort", HttpBindManager.HTTP_BIND_SECURE_PORT.getValue() ) );
         }
     }
 
@@ -203,7 +203,7 @@ public final void deleteProperty( String property )
 
         if ( "plugin.httpfileupload.announcedWebPort".equals( property ) )
         {
-            SlotManager.getInstance().setWebPort( HttpBindManager.getInstance().getHttpBindSecurePort() );
+            SlotManager.getInstance().setWebPort( HttpBindManager.HTTP_BIND_SECURE_PORT.getValue() );
         }
     }
 }