Openfire (master)

• 

  daryl herzmann <akrherz@iastate.edu> 23 Jun 2020 a886ff2f0d06efddcbf09f7b0dd8da306b2e50c4

  Merge pull request #1662 from guusdk/OF-1989_inmemory-pubsub-fixes
  Many pubsub fixes
• 

  Guus der Kinderen 23 Jun 2020 c7cffb0b2640c3439e454099af29f40d9da9c67d

  OF-2040: Remove entity capabilities as soon as a new 'ver' arrives.
  Prior to this change, the 'old' entity capabilities for a user were retained as long as it took to resolve the updated 'ver' value. This leads to timing-sensitive bugs, where Openfire, briefly, exposes the 'wrong' capabilities.
  
  This commit removes the old capabilities immediately, storing them (temporarily) to be able to diff them with the update (which is used in the new event listeners).

  • xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java (version c7cffb0b2640c3439e454099af29f40d9da9c67d)
• 

  Guus der Kinderen 23 Jun 2020 a15e6a6553c439172d41b6cb87fcdb1b1265d34b

  Re-enabling SINT tests now that CAPS improvements have been applied.

  • .github/workflows/continuous-integration-workflow.yml (version a15e6a6553c439172d41b6cb87fcdb1b1265d34b)
  • runIntegrationTests (version a15e6a6553c439172d41b6cb87fcdb1b1265d34b)
• 

  Guus der Kinderen 23 Jun 2020 2acdba3f7a626fdfdf2dccbd3a3ef3fbd4905804

  OF-2039: Trigger pubsub notifications on CAPS change

  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java (version 2acdba3f7a626fdfdf2dccbd3a3ef3fbd4905804)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version 2acdba3f7a626fdfdf2dccbd3a3ef3fbd4905804)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version 2acdba3f7a626fdfdf2dccbd3a3ef3fbd4905804)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java (version 2acdba3f7a626fdfdf2dccbd3a3ef3fbd4905804)
• 

  Guus der Kinderen 23 Jun 2020 538590da7608a7f03b9ad913ee40824c318c8fff

  OF-2040: Add deltas to event listeners for CAPS

  • xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilities.java (version 538590da7608a7f03b9ad913ee40824c318c8fff)
  • xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesListener.java (version 538590da7608a7f03b9ad913ee40824c318c8fff)
  • xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java (version 538590da7608a7f03b9ad913ee40824c318c8fff)
  • xmppserver/src/test/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesListenerTest.java (version 538590da7608a7f03b9ad913ee40824c318c8fff)
• 

  Guus der Kinderen 23 Jun 2020 5931b38dc2067f146bab8d051e37f3dc00b93e81

  OF-2040: Have event listeners for CAPS

  • xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesListener.java (version 5931b38dc2067f146bab8d051e37f3dc00b93e81)
  • xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java (version 5931b38dc2067f146bab8d051e37f3dc00b93e81)
  • xmppserver/src/test/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesListenerTest.java (version 5931b38dc2067f146bab8d051e37f3dc00b93e81)
• 

  Guus der Kinderen 23 Jun 2020 ef5291cb0efc2f74bd59ef52f530dcb4324c28f7

  OF-1985: Fix for potential empty pubsub node parent.

  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java (version ef5291cb0efc2f74bd59ef52f530dcb4324c28f7)
• 

  Guus der Kinderen 22 Jun 2020 d56dd63fd38df479b1dae8ee51ab96f7db3e0e46

  OF-1985: Pubsub type-safety improvements
  Switched from Strings to JIDs for user permissios of the PubSub module, and used a System Property instead of a class member.

  • i18n/src/main/resources/openfire_i18n.properties (version d56dd63fd38df479b1dae8ee51ab96f7db3e0e46)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version d56dd63fd38df479b1dae8ee51ab96f7db3e0e46)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubServiceInfo.java (version d56dd63fd38df479b1dae8ee51ab96f7db3e0e46)
• 

  Guus der Kinderen 22 Jun 2020 6a2b253dd9ddda8c9749b1ece56fc01b614cdb18

  OF-1985: Generic improvements (mostly Intellij hints)

  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java (version 6a2b253dd9ddda8c9749b1ece56fc01b614cdb18)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java (version 6a2b253dd9ddda8c9749b1ece56fc01b614cdb18)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version 6a2b253dd9ddda8c9749b1ece56fc01b614cdb18)
• 

  Guus der Kinderen 22 Jun 2020 65190848931f20e2dc25119a5dae43de8768ace6

  OF-1985: More type-safe locking

  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceManager.java (version 65190848931f20e2dc25119a5dae43de8768ace6)
• 

  Guus der Kinderen 22 Jun 2020 b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5

  OF-1985: Pubsub type-safety improvements
  Use specific classes instead of their string representation.

  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceInfo.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceManager.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProvider.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
  • xmppserver/src/main/webapp/pubsub-node-summary.jsp (version b19b55a5ab8eb9b5b2372f84bd2b73ed5b4a55d5)
• 

  Guus der Kinderen 22 Jun 2020 5a2501eaa56f9dce1db605863939d35f060a5c27

  OF-1985: More type-safe locking (and fixes for incorrect lock usage)

  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java (version 5a2501eaa56f9dce1db605863939d35f060a5c27)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java (version 5a2501eaa56f9dce1db605863939d35f060a5c27)
• 

  Guus der Kinderen 22 Jun 2020 4e1aa905fbeb87f106c22bcc2a316e66084113d3

  Applying Intellij hint: Locks to be acquired outside of try/catch

  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java (version 4e1aa905fbeb87f106c22bcc2a316e66084113d3)
• 

  Guus der Kinderen 22 Jun 2020 dc450a572c6af125f94b7146c8850a65ccc5f3e7

  OF-1985: Pubsub type-safety improvements
  Use specific classes instead of their string representation.

  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java (version dc450a572c6af125f94b7146c8850a65ccc5f3e7)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version dc450a572c6af125f94b7146c8850a65ccc5f3e7)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version dc450a572c6af125f94b7146c8850a65ccc5f3e7)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java (version dc450a572c6af125f94b7146c8850a65ccc5f3e7)
• 

  Guus der Kinderen 22 Jun 2020 5c5b3c37380cbde87440e9457ddea7c266f754c8

  OF-1985: Use identifiers instead of objects where possible
  If possible, use a reference to a service or a node, instead of the entire node object. This reduces complexity and should be less error-prone.
  
  Additionally, added more type-safetey, by providing UniqueIdentifier-based alternatives to various operations that use String-based identifiers.

  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CollectionNode.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/LeafNode.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeAffiliate.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProvider.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeChangeTask.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PresenceAccess.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/RosterAccess.java (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
  • xmppserver/src/main/webapp/pubsub-node-summary.jsp (version 5c5b3c37380cbde87440e9457ddea7c266f754c8)
• 

  Guus der Kinderen 22 Jun 2020 c226075c5cd1060627125fa5a797bdf7234616bb

  OF-1989: Introduce cluster wide locking when operating on nodes with in-memory pubsub provider

  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java (version c226075c5cd1060627125fa5a797bdf7234616bb)