Openfire (master)

• 

  Guus der Kinderen 28 Jul 2022 369a04d751583c7e68596fa6e74e9def30530ea7

  OF-2480: Ensure that admin console starts after setup
  During setup, the CertificateStore manager is started briefly, to ensure that it contains at least a minimum viable certificate. After this has been established, it is shut down again.
  
  This brief occurrence starts an entity that watches the file system for changes (OF-1373: Allow certificate changes to be applied without a restart). Having this watcher running prevents the admin console webserver from being restarted quickly, causing the admin console to be unavailable for about half a minute.
  
  With the changes in this commit, the initial start of CertificateStoreManager will now happen without the 'watching' being started. This prevents issues with reloading the web server.

  • xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 369a04d751583c7e68596fa6e74e9def30530ea7)
  • xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java (version 369a04d751583c7e68596fa6e74e9def30530ea7)
• 

  Guus der Kinderen 28 Jul 2022 31aa3d756032d934ebdd08afe806ad32b3bf05e9

  OF-2473: Guard access to websocket session state
  By having more asynchronous operations being introduced as part of OF-2473, the need to guard state increased. This commit adds some mutexes.

  • xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version 31aa3d756032d934ebdd08afe806ad32b3bf05e9)
• 

  Guus der Kinderen 28 Jul 2022 0dd051fa7e3da230b67ca9de799f51a976963569

  OF-2473: Ensure throwables are not lost
  If the implementation of the `@OnWebSocketError` annotated methods throws an exception, this exception should not be lost.

  • xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version 0dd051fa7e3da230b67ca9de799f51a976963569)
• 

  Guus der Kinderen 28 Jul 2022 5470afb4efca55a3f287e778555e15f0792ab3f5

  OF-2473: Prevent websocket deadlock
  Jetty's websocket implementation invokes `@OnWebSocketError` and `@OnWebSocketClose` annotated methods when certain erroneous conditions occur. These invocations happen synchronously.
  
  As a result, a 'close' operation is called synchronously to the processing of the original request, which can happen under guard of a mutex. This leads to the 'close' implementation being called while a mutex is held that is intended to be held only while inbound data is being processed. This has lead to deadlocks.
  
  An example scenario is when a websocket request arrives that asks to close the connection. Sometimes (presumably if the per immediately disconnects the connection, rather than waiting for an answer), returning a response fails ('EOF'). This then triggers error handling.
  
  This commit makes the `@OnWebSocketError` and `@OnWebSocketClose` methods be asynchronous, to ensure that its processing is decoupled from the inbound data that might have tirggered their invocation.

  • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSessionManager.java (version 5470afb4efca55a3f287e778555e15f0792ab3f5)
  • xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version 5470afb4efca55a3f287e778555e15f0792ab3f5)
• 

  Guus der Kinderen 28 Jul 2022 fda04032bcc2c796dad07e3be979d011fa879c33

  OF-2479: Allow clients that do websockets without the required XMPP framing
  This basically is a hack to get Tsung to connect to Openfire of websockets.
  
  The functionality introduced here is switched off by default. If enabled, it replaces `stream` element names with `open` and `close` where appropriate, to conform to 'XMPP framing' as described in https://datatracker.ietf.org/doc/html/rfc7395#section-3.3

  • i18n/src/main/resources/openfire_i18n.properties (version fda04032bcc2c796dad07e3be979d011fa879c33)
  • xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version fda04032bcc2c796dad07e3be979d011fa879c33)
• 

  Guus der Kinderen 28 Jul 2022 a5a4947ca6304deb65c658c4b85dcfce2019a3af

  feedback on fix forOF-2472: replace string usage with constants

  • xmppserver/src/main/java/org/jivesoftware/util/ListPager.java (version a5a4947ca6304deb65c658c4b85dcfce2019a3af)
• 

  Guus der Kinderen 28 Jul 2022 7e669077a8abda5dfea155a05d4cc7780d791e7a

  fixes OF-2472: Pubsub node summary pages should be sortable
  This adds 'sorting' functionality to the admin console pages that show pubsub node listings (for both the pubsub service, as well as each PEP service).
  
  The changes are largely implemented in the generic, pre-existing ListPager implementation, in the hope that they are re-useable for other pages.

  • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubsubNodeResultFilter.java (version 7e669077a8abda5dfea155a05d4cc7780d791e7a)
  • xmppserver/src/main/java/org/jivesoftware/util/ListPager.java (version 7e669077a8abda5dfea155a05d4cc7780d791e7a)
  • xmppserver/src/main/webapp/pubsub-node-summary.jsp (version 7e669077a8abda5dfea155a05d4cc7780d791e7a)
• 

  Dan Caseley <dan@caseley.me.uk> 15 Jul 2022 08c99b27e0bbeb7334f8511c6205753352f2953c

  OF-2470: Protect against NPE from IQ stanza with no child elements

  • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 08c99b27e0bbeb7334f8511c6205753352f2953c)
• 

  Guus der Kinderen 14 Jul 2022 2b92eb011be8e446d597054e7379830439a9d943

  OF-2469: fix NPE on admin console (pubsub config)
  This fixes a NullPointerException that was shown when someone looked at the configuration of a Pubsub node in Openfire's Admin Console.

  • xmppserver/src/main/webapp/pubsub-node-configuration.jsp (version 2b92eb011be8e446d597054e7379830439a9d943)
• 

  akrherz <akrherz@iastate.edu> 13 Jul 2022 9e6714b49bdc32760eb280c98b6f41654ccd03d6

  march toward 4.7.3-SNAPSHOT

  • distribution/pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • i18n/pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • plugins/openfire-plugin-assembly-descriptor/pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • plugins/pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • starter/pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • xmppserver/pom.xml (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)
  • xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java (version 9e6714b49bdc32760eb280c98b6f41654ccd03d6)