Openfire (master)

• 

  Guus der Kinderen 07 Jul 2021 96aa7f6e0258d2804f5e74d0b28e597c38301cad

  OF-2244: Provide database structure for persisted stanza element
  The solution for OF-2244 is based on storing the stanza in a database table (ofRoster). This commit introduces the database structure in the installation and upgrade scripts to hold this data.

  • distribution/src/database/openfire_db2.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/openfire_hsqldb.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/openfire_mysql.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/openfire_oracle.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/openfire_postgresql.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/openfire_sqlserver.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/openfire_sybase.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_db2.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_hsqldb.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_mysql.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_oracle.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_postgresql.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_sqlserver.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • distribution/src/database/upgrade/33/openfire_sybase.sql (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
  • xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java (version 96aa7f6e0258d2804f5e74d0b28e597c38301cad)
• 

  Guus der Kinderen 07 Jul 2021 d1245c8f8db3a22966ef2d738f98057592259b36

  OF-2269: Add async facility to SAXReaderUtil

  • xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version d1245c8f8db3a22966ef2d738f98057592259b36)
• 

  Dave Cridland <dave@forwardhealth.co> 07 Jul 2021 df1fc2f8c741dbdf9b6f1e86741199b12c5184b5

  Allow RosterItem to store and retrieve Presence stanzas
  This extends the RosterItem to store a Presence stanza for the
  case of new subscription requests.
  
  This is serialized and stored in the database as usual.
  
  There are getters and setters for the stored stanza, but also a
  utility getter which can create a dummy stanza as needed.

  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version df1fc2f8c741dbdf9b6f1e86741199b12c5184b5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItem.java (version df1fc2f8c741dbdf9b6f1e86741199b12c5184b5)
• 

  Guus der Kinderen 07 Jul 2021 8bffa2103fb6e9138727512c913166e1bb734da1

  OF-2269: Add test that verifies exception handling

  • xmppserver/src/test/java/org/jivesoftware/util/SAXReaderUtilTest.java (version 8bffa2103fb6e9138727512c913166e1bb734da1)
• 

  Dave Cridland <dave@forwardhealth.co> 07 Jul 2021 10c07cab7522c281ac1004caa51faf3a4f608488

  Allow XML elements to be serialized
  I've done this by imbuing ExternalizableUtil with the ability to
  serialize and parse XML. This then allows lower-level strategies
  to be entirely unaware of the nature of the string.
  
  Higher-level code can then serialize XML, and trivially manage
  serializing Stanzas.

  • xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java (version 10c07cab7522c281ac1004caa51faf3a4f608488)
• 

  Dave Cridland <dave@forwardhealth.co> 07 Jul 2021 ef94fd74f385a6bd8c3d484a4a15485573219884

  Actually remember the presence stanza need setting!

  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version ef94fd74f385a6bd8c3d484a4a15485573219884)
• 

  Guus der Kinderen 07 Jul 2021 46a6d411a101639616f647fae91369f01848379d

  OF-2244: Guard against NullPointerExceptions

  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version 46a6d411a101639616f647fae91369f01848379d)
  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItem.java (version 46a6d411a101639616f647fae91369f01848379d)
• 

  Guus der Kinderen 07 Jul 2021 fd4efdf4385b4f50b15b9f96c649695076e3edc3

  OF-2269: Improve error message.

  • xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version fd4efdf4385b4f50b15b9f96c649695076e3edc3)
• 

  Dave Cridland <dave@forwardhealth.co> 07 Jul 2021 4bfdaf6cd689ed542e7fe91c24f138a59e559b56

  Store and retrieve subscription request stanzas
  This change means that subscription requests are stored and
  resent verbatim on login.

  • xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java (version 4bfdaf6cd689ed542e7fe91c24f138a59e559b56)
  • xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java (version 4bfdaf6cd689ed542e7fe91c24f138a59e559b56)
• 

  Guus der Kinderen 07 Jul 2021 1cd0d3a8fd9737fb4798c31d4b9b051c9d7ee5af

  OF-2269: Have uniform API to create a suitable SAXReader instance
  SAXReader instances, used to parse XML, are created all over the place. They need a bit of specific configuration to circumvent vulnerabilities. Often, their lifecycle needs to be maintained, as their creation is resource intensive. All of this should be put in one central utility, instead of live as re-invented wheel fragments all over the place.

  • xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version 1cd0d3a8fd9737fb4798c31d4b9b051c9d7ee5af)
  • xmppserver/src/test/java/org/jivesoftware/util/SAXReaderUtilTest.java (version 1cd0d3a8fd9737fb4798c31d4b9b051c9d7ee5af)
• 

  Guus der Kinderen 07 Jul 2021 89833d0569873d167dfd11d7d84a4a12cab05d74

  OF-2269: Add javadoc for exceptions thrown.

  • xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version 89833d0569873d167dfd11d7d84a4a12cab05d74)
• 

  Guus der Kinderen 07 Jul 2021 5ee847b1434521c4f699b47c734b46ef54d7384f

  OF-2269: Caught InterruptExceptions shouldn't be hidden
  The rewrite of SAXReader utilization introduces a new source of potential InterruptExceptions. This occurs when 'someone' wants to the thread to stop execution. By catching this as a regular exception, the code at hand will handle that scenario as appropriate, but will also hide the fact that 'someone' wants to stop the thread from its own invocator. To let the caller know that someone wants to stop the thread from execution, the interrupt flag should be set. See https://programming.guide/java/handling-interrupted-exceptions.html for more rationale.

  • xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheConfigurator.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdVCardProvider.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListProvider.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/update/PluginDownloadManager.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
  • xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java (version 5ee847b1434521c4f699b47c734b46ef54d7384f)
• 

  Guus der Kinderen 07 Jul 2021 b1ae978bdc0d75391bd967e139762decb6aa9c7c

  OF-2269: Rewire SAXReader creation
  This commit replaces individual snippets that create/use a SAXReader instance with one that's provided by the new utility implementation.
  
  I'm aware that this undoes a bit of the change that was implemented as part of OF-2259. As part of those changes, the same SAXReader instance was used to parse all data for a collection of items (instead of recreating a new parser for each item). In the changes I'm making here, this is replaced by scheduling a task in an ExecutorService for each item, blocking for it to be processed by a reusable parser, before moving to the next item. Although more involved, this should still perform a lot better than recreating a parser for each item.

  • xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheConfigurator.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdVCardProvider.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListProvider.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
  • xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java (version b1ae978bdc0d75391bd967e139762decb6aa9c7c)
• 

  Guus der Kinderen 07 Jul 2021 308cbfdcd30156999e1aca80ee79fc39da35f085

  OF-2244: Store stanza in database
  This commit ensures that the stanza of a presence subscribe request is actually stored in the database (as opposed to only be added in memory, without that change being pushed to the database.
  
  Additionally, the stanza should:
  - only be present in the roster item for the receiving entity
  - be removed from the database after the request has been rejected or accepted (to not fill up the database with stale data)

  • xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java (version 308cbfdcd30156999e1aca80ee79fc39da35f085)
• 

  Guus der Kinderen 07 Jul 2021 f2899c0c91d9bc54b00c66965be35487865d7458

  OF-2244: Fix database insertion of new stanza

  • xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version f2899c0c91d9bc54b00c66965be35487865d7458)