Code commits
Openfire (master)
-
Amos Chu <hongweichu.ouc@gmail.com> 565da307327e76a2fa284a872e00aca332405ec5
fix wrong typo for connectoin,outoing,connecte and deliverying
- xmppserver/src/main/java/org/jivesoftware/openfire/RemotePacketRouter.java (version 565da307327e76a2fa284a872e00aca332405ec5)
- xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java (version 565da307327e76a2fa284a872e00aca332405ec5)
-
daryl herzmann <akrherz@iastate.edu> 0549a0d9def56157e56c87039705f8a637ee07ff
Merge pull request #1867 from willseeyou/patch-1
fix wrong typo for overriden -
Amos Chu <hongweichu.ouc@gmail.com> 2cbb14bbf642880b5c812d446f0174adf8647232
fix wrong typo for overriden
- documentation/pluggable-roster-support-guide.html (version 2cbb14bbf642880b5c812d446f0174adf8647232)
- xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java (version 2cbb14bbf642880b5c812d446f0174adf8647232)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java (version 2cbb14bbf642880b5c812d446f0174adf8647232)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientStanzaHandler.java (version 2cbb14bbf642880b5c812d446f0174adf8647232)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/ComponentStanzaHandler.java (version 2cbb14bbf642880b5c812d446f0174adf8647232)
- xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyList.java (version 2cbb14bbf642880b5c812d446f0174adf8647232)
-
mightymop <totzkotz@gmail.com> a8366259e2f184fea1ca9ac8b9b1da9c1a97520c
OF-2267: fix listpager on muc-room-summary.jsp when using multiple chatservices (#1853)
OF-2267: Fix for listpager with multiple MUC services
Co-authored-by: admin <root@poldom.local>
Co-authored-by: Guus der Kinderen <guus.der.kinderen@gmail.com>- xmppserver/src/main/webapp/muc-room-summary.jsp (version a8366259e2f184fea1ca9ac8b9b1da9c1a97520c)
-
mightymop <totzkotz@gmail.com> a5392f60a35a1eb3a4471fed4d4842b7854420fd
OF-2277: Fix numeration on muc-room-summary table (#1854)
now starting with 1 on first line
Co-authored-by: admin <root@poldom.local>- xmppserver/src/main/webapp/muc-room-summary.jsp (version a5392f60a35a1eb3a4471fed4d4842b7854420fd)
-
Guus der Kinderen 5ccc4ce9e0c3b36aa00474a6f5057a2ed1696162
OF-2273: Ensure that self-presence mods are made when joining anon room
When joining a room is configured to restrict presence broadcasts, the reflected 'self-presence' should still have all added annotations as it'd otherwise get.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 5ccc4ce9e0c3b36aa00474a6f5057a2ed1696162)
-
Guus der Kinderen 086e04c3f597842d78d7fa66f8f2c98fcdba7358
OF-2276: When a MUC room's config gets changed, send appropriate status codes
As defined by XEP-0045 section 10.2.1 "Notification of Configuration Changes.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java (version 086e04c3f597842d78d7fa66f8f2c98fcdba7358)
-
Guus der Kinderen f0f6bfa501b4ce87eeab35247e6d3a7fb076eff0
OF-2275: Send status 170 when joining a MUC room that has logging enabled.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version f0f6bfa501b4ce87eeab35247e6d3a7fb076eff0)
-
Guus der Kinderen bfabb8315230aee5893618626c1541aeb2b88ac2
OF-2271: Add explicit field types to data forms
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/generic/Ping.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version bfabb8315230aee5893618626c1541aeb2b88ac2)
-
Guus der Kinderen 6477cb6cb118049b19d80d6f2e848d477bc04429
OF-2268: Prevent concurrency issue when starting JMX
This commit ensures that the JMX manager is not started more than once, preventing concurrency issues.- xmppserver/src/main/java/org/jivesoftware/openfire/JMXManager.java (version 6477cb6cb118049b19d80d6f2e848d477bc04429)
-
Guus der Kinderen 0496e94d4528d2eee9e6be62c020b4ff19049397
Disable unstable Smack Integration Test
Smack uses an API for two tests (SoftwareInfoIntegrationTest and EntityCapsTest) that itself defines to be 'unstable'). In Openfire CI, we see these tests occasionally fail. It stands to reason that that's because of the Smack-based unstable solution.
This commit disables both tests (one already was disabled), so that they don't break our build.- runIntegrationTests (version 0496e94d4528d2eee9e6be62c020b4ff19049397)
-
Amos Chu <hongweichu.ouc@gmail.com> db353247790c81a1aa977ff9233d36222db3aec0
fix wrong typo for independtly
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java (version db353247790c81a1aa977ff9233d36222db3aec0)
-
Amos Chu <hongweichu.ouc@gmail.com> 3dec8215ab55228d24f8de10aff5d38239bdea3d
fix wrong type for implementaions
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java (version 3dec8215ab55228d24f8de10aff5d38239bdea3d)
-
Amos Chu <hongweichu.ouc@gmail.com> 0b38a5cc5bfcfcf300198ad272a5df018be8e157
fix wrong typo responsbile and immediatelly
- xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java (version 0b38a5cc5bfcfcf300198ad272a5df018be8e157)
-
daryl herzmann <akrherz@iastate.edu> 31b55763fdd5409e17f7b42391a7bee618230726
Merge pull request #1861 from willseeyou/patch-1
Update ServerStarter.java -
Amos Chu <hongweichu.ouc@gmail.com> b60302db3c6edb927f76d3cc61aa1da20f7da1b3
Update ServerStarter.java
fix wrong typo environment- starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java (version b60302db3c6edb927f76d3cc61aa1da20f7da1b3)
-
Guus der Kinderen 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 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 8bffa2103fb6e9138727512c913166e1bb734da1
OF-2269: Add test that verifies exception handling
- xmppserver/src/test/java/org/jivesoftware/util/SAXReaderUtilTest.java (version 8bffa2103fb6e9138727512c913166e1bb734da1)
-
Guus der Kinderen 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 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 fd4efdf4385b4f50b15b9f96c649695076e3edc3
OF-2269: Improve error message.
- xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version fd4efdf4385b4f50b15b9f96c649695076e3edc3)
-
Guus der Kinderen 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)
-
Dave Cridland <dave@forwardhealth.co> ef94fd74f385a6bd8c3d484a4a15485573219884
Actually remember the presence stanza need setting!
- xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version ef94fd74f385a6bd8c3d484a4a15485573219884)
-
Dave Cridland <dave@forwardhealth.co> 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 89833d0569873d167dfd11d7d84a4a12cab05d74
OF-2269: Add javadoc for exceptions thrown.
- xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version 89833d0569873d167dfd11d7d84a4a12cab05d74)
-
Guus der Kinderen 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)
-
Dave Cridland <dave@forwardhealth.co> 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> 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 f2899c0c91d9bc54b00c66965be35487865d7458
OF-2244: Fix database insertion of new stanza
- xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java (version f2899c0c91d9bc54b00c66965be35487865d7458)
-
Guus der Kinderen d1245c8f8db3a22966ef2d738f98057592259b36
OF-2269: Add async facility to SAXReaderUtil
- xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version d1245c8f8db3a22966ef2d738f98057592259b36)