Build: #2 was successful Manual run by daryl herzmann
Code commits
Openfire (master)
-
Dele Olajide <dele@4ng.net> c87312d9a4ed03cf447cb3e54c78964e224ea447
OF-2017: Update Jetty to 9.4.28.v20200408
- pom.xml (version c87312d9a4ed03cf447cb3e54c78964e224ea447)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java (version c87312d9a4ed03cf447cb3e54c78964e224ea447)
-
Dele Olajide <dele@4ng.net> 6b5b4210d630904efc734d5193d294eda9962e32
OF-963: WebSocket keep-alive is not working as expected
XEP-0198 stream resumption is not yet implemented.
Prevent resumption from being negotiated for WS sessions.- xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version 6b5b4210d630904efc734d5193d294eda9962e32)
- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version 6b5b4210d630904efc734d5193d294eda9962e32)
-
Guus der Kinderen 55d7a873008add72c2f6b19e59c12a1e9850fc8f
OF-2015: Clean up the donor immediately after session resumption.
When Stream Management is used to resume an old session, the session that was used to resume the old session should be cleaned up immediately. Before this fix, the session lingers in a state of being 'detached'. Not only is there no reason for it to linger (it can't be resumed), marking it as 'detached' is semantically wrong: this session never reached a state where it makes sense to resume it later. The changes in this commit clean up the donor session immediately after resuption.- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java (version 55d7a873008add72c2f6b19e59c12a1e9850fc8f)
- xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version 55d7a873008add72c2f6b19e59c12a1e9850fc8f)
-
Guus der Kinderen be50383327cc5d6ce80b50be3754868e013e4e49
OF-2014: Update OnConnectionClose callback object when re-initializing connection.
When a connection gets a new owner (Session), make sure that the old owner that was registered with the callback function gets replaced by the new owner. Without this, the callback will be invoked on the old (non-existing) session. This, among others, prevents Stream Management from working properly after a stream has been resumed for the first time.- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version be50383327cc5d6ce80b50be3754868e013e4e49)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version be50383327cc5d6ce80b50be3754868e013e4e49)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NIOConnection.java (version be50383327cc5d6ce80b50be3754868e013e4e49)
-
Guus der Kinderen 7e01346bf67aa6c99ccacb2375bdd59cb2fcf722
OF-2013: Improve detection of 'detached' session state.
Instead of assuming that a session is detached when it's connection is null (which could also be caused by the connection being closed), verify if the session is currently in the collection of detached sessions.- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 7e01346bf67aa6c99ccacb2375bdd59cb2fcf722)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java (version 7e01346bf67aa6c99ccacb2375bdd59cb2fcf722)
-
Guus der Kinderen 14fb0b57c228152524e4dd16b281daff36978178
OF-158: Make room default settings use configurable service defaults.
MUC services have configurable default settings to be applied to new rooms. These defaults are already used when an end-user creates a room (through XMPP).
This commit takes applies the same settings to the room creation form that is in the Admin console, with one exemption: rooms created in the admin console are always persistent.
Note that it's possible to configure Openfire with more than one MUC service. If that's the case, selecting the MUC service in which the room is to be created is part of the room creation form. As at that point, the to-be-used service is still unknown, the (other) default values that are used on the same form are based on the first available service. That seems to be an acceptable trade-off, given the limited amount of installs that have more than one MUC service.- i18n/src/main/resources/openfire_i18n.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_de.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_es.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_fr.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_ja_JP.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_pl_PL.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_pt_BR.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_pt_PT.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_sk.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- i18n/src/main/resources/openfire_i18n_zh_CN.properties (version 14fb0b57c228152524e4dd16b281daff36978178)
- xmppserver/src/main/webapp/muc-default-settings.jsp (version 14fb0b57c228152524e4dd16b281daff36978178)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 14fb0b57c228152524e4dd16b281daff36978178)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> 040de8d1894e23bd40592863e64498afa9429965
OF-2019: Restore the getArchiver() accessor, as it is essential for the monitoring plugin and possibly other plugins.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version 040de8d1894e23bd40592863e64498afa9429965)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 040de8d1894e23bd40592863e64498afa9429965)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> c18ed43de7b96fdd1005e46964280ca69511953e
OF-2019: Go back to old naming of the logConversationBatchSize property, to not break 3rd party code.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version c18ed43de7b96fdd1005e46964280ca69511953e)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version c18ed43de7b96fdd1005e46964280ca69511953e)
- xmppserver/src/main/webapp/muc-tasks.jsp (version c18ed43de7b96fdd1005e46964280ca69511953e)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> 8588a1e4587c648d05a1428c1204057321c34203
OF-2019: Reordering of property names in interface and impl. Now there is a clear separation between "old" deprecated properties and newer properties that are used to configure the archiving process. Property names are still quite similar though, so take care to not use the deprecated ones.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version 8588a1e4587c648d05a1428c1204057321c34203)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 8588a1e4587c648d05a1428c1204057321c34203)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> 226648c0635de739352b3a0e1d12ed09e202f3be
OF-2019: Support two different names for the max conversation batch size: the one that was specified in the interface, and the one that was specified in the implementation.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 226648c0635de739352b3a0e1d12ed09e202f3be)
-
Guus der Kinderen 1f71a6b7aabae2f11bdc94ad3a5fe5c27e26263e
Cleanup of code layout
- xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveManager.java (version 1f71a6b7aabae2f11bdc94ad3a5fe5c27e26263e)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 1f71a6b7aabae2f11bdc94ad3a5fe5c27e26263e)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> 605c0b2852786b722823bf47c72801b7ea28179a
OF-2019: Correction: use the non-deprecated accessors from the configuration jsp as well.
- xmppserver/src/main/webapp/muc-tasks.jsp (version 605c0b2852786b722823bf47c72801b7ea28179a)
-
Guus der Kinderen 87414a7f63d8173dbf90c07f01570e9e8248bcd5
OF-2019: MUC archive worker need not start until work is produced
The Archive implementation (which is used to persist chat room history) polls quite aggresively. This has proven to be a problem in an environment that has many MUC services, as many threads performing these polls require quite some CPU resources.
When logging does not take place (eg: when it has been disabled) all of this is quite wasteful. This commit introduces a latch that, if used, delays the pollig until after the first message to-be-logged has been produced. This intends to prevent polling to take place on services where not a single message is being logged.- xmppserver/src/main/java/org/jivesoftware/openfire/archive/Archiver.java (version 87414a7f63d8173dbf90c07f01570e9e8248bcd5)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 87414a7f63d8173dbf90c07f01570e9e8248bcd5)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> 657207639920e6472b808a09d10da8dfc4cb8046
OF-2019: Lazy instantiation of archiver now applies the double-check idiom.
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 657207639920e6472b808a09d10da8dfc4cb8046)
-
Emiel van der Herberg <emiel.van.der.herberg@marviq.com> 7c55ab4ba296b498c60ff7ce860c6cd56530c691
OF-2019: Cherry merging to 4.5 branch.
# Conflicts:
# xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java- xmppserver/src/main/java/org/jivesoftware/openfire/archive/Archiver.java (version 7c55ab4ba296b498c60ff7ce860c6cd56530c691)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java (version 7c55ab4ba296b498c60ff7ce860c6cd56530c691)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 7c55ab4ba296b498c60ff7ce860c6cd56530c691)
- xmppserver/src/main/webapp/muc-tasks.jsp (version 7c55ab4ba296b498c60ff7ce860c6cd56530c691)
-
Guus der Kinderen afff2dc8c346ad8453a8cf304a87b81d4d723be2
OF-1788: Adding feature to changelog for Openfire 4.4.0
OF-1788 was fixed in Openfire 4.4.0. We've previously neglected to close the JIRA issue, which made this feature not pop up in the changelog before.- xmppserver/changelog.html (version afff2dc8c346ad8453a8cf304a87b81d4d723be2)
-
Guus der Kinderen 7352453bbd0e51e4cc64e8047cf81e4b25679ada
OF-1999: Prevent overflow
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 7352453bbd0e51e4cc64e8047cf81e4b25679ada)
-
Neustradamus <104737+Neustradamus@users.noreply.github.com> 9165cbdbe9ad0fd4100d7e662948138256407ca3
Bouncy Castle 1.65 instead of 1.64
Bouncy Castle 1.65 instead of 1.64: https://www.bouncycastle.org/releasenotes.html
- http://www.bouncycastle.org/latest_releases.html- pom.xml (version 9165cbdbe9ad0fd4100d7e662948138256407ca3)
-
Guus der Kinderen 2ab7e48010a75078741e50881ac550fc7ebbd3fa
OF-1966: Allow Japanese i18n to be selected.
Openfire has Japanese translation, but lacked the option to select that translation. This commit rectifies that.- xmppserver/src/main/webapp/server-locale.jsp (version 2ab7e48010a75078741e50881ac550fc7ebbd3fa)
- xmppserver/src/main/webapp/setup/index.jsp (version 2ab7e48010a75078741e50881ac550fc7ebbd3fa)
-
Guus der Kinderen 2801ba20cf54205d2f0e87e84fbd2f74f9538637
OF-1976: Admin console: allow any positive number for max muc room occupants
Additionally, room listings no longer show a '0' when listing room occuptant count vs max occupants, when the room max occupant count is unlimited. For those rooms, only the occupant count is shown (eg: "28" instead of "28 / 0").- i18n/src/main/resources/openfire_i18n.properties (version 2801ba20cf54205d2f0e87e84fbd2f74f9538637)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 2801ba20cf54205d2f0e87e84fbd2f74f9538637)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 2801ba20cf54205d2f0e87e84fbd2f74f9538637)
- xmppserver/src/main/webapp/muc-room-summary.jsp (version 2801ba20cf54205d2f0e87e84fbd2f74f9538637)
-
Guus der Kinderen 3cf322f4cc7a2c5463a6a220ec83f58f07121349
OF-1976: Admin console: any number for max occupants in service default settings
- xmppserver/src/main/webapp/muc-default-settings.jsp (version 3cf322f4cc7a2c5463a6a220ec83f58f07121349)
-
Guus der Kinderen 8f8f7a63a23dec9ffa46c7164b3d973ae0cc1066
Update .travis.yml
Add directive that (for DPL v2) will prevent deployment outside of IgniteRealtime's repository.- .travis.yml (version 8f8f7a63a23dec9ffa46c7164b3d973ae0cc1066)
-
admin <root@poldom.local> 7d81302ef1cef00b599b267d6997c12467f821be
fix NPE (Line: password = tokens.nextToken(); - nextToken() will throw an Exception if no further element is available) - could happen if client will send wrong data or abort connection?
- xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerPlainImpl.java (version 7d81302ef1cef00b599b267d6997c12467f821be)
-
Ivan Koško <ivan.kosko@hagedorn-infosysteme.de> 5806a0e03f15719c709664ce4ae3ec4336fc913d
- fix comment
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java (version 5806a0e03f15719c709664ce4ae3ec4336fc913d)
-
Ivan Koško <ivan.kosko@hagedorn-infosysteme.de> d605e200495ca5501cbb0438c9b26232bdbd9ba3
- pubsub fixes to notification sent to subscribers upon node configuration change and upon node deletion
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CollectionNode.java (version d605e200495ca5501cbb0438c9b26232bdbd9ba3)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java (version d605e200495ca5501cbb0438c9b26232bdbd9ba3)
-
daryl herzmann <akrherz@iastate.edu> c765d41e18bf3b4f5adf8ae8d9682deede3dff5f
Merge pull request #1583 from B-apt/jetty-no-serverheader
OF-1974 :lock: Don't send Jetty server name & version in websockets response … -
Baptiste Andrini <baptiste.andrini.externe@capgemini.com> 70f4f244ca575787ed563cea17d10920e443befa
:lock: Don't send Jetty server name & version in websockets response headers
- xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindManager.java (version 70f4f244ca575787ed563cea17d10920e443befa)
-
Greg Thomas <greg.d.thomas@gmail.com> 177d1d9fbf0283c7403dd30dc4d34faa25796dac
Fix XSS issue in security truststore page
- xmppserver/src/main/webapp/security-truststore.jsp (version 177d1d9fbf0283c7403dd30dc4d34faa25796dac)
-
Greg Thomas <greg.d.thomas@gmail.com> f2b366ea42c17b77fc7985a5a15fbd6808f2f7c9
Fix XSS issue in System Cache Details page
- xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemCacheDetailsServlet.java (version f2b366ea42c17b77fc7985a5a15fbd6808f2f7c9)
-
Greg Thomas <greg.d.thomas@gmail.com> b73b5482d8cf3d3b858329b9dadbba45ccdcb844
Fix XSS issue in System Properties page
- xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemPropertiesServlet.java (version b73b5482d8cf3d3b858329b9dadbba45ccdcb844)
-
Greg Thomas <greg.d.thomas@gmail.com> b09d67c1ffc884c5fa8009775a2245859c2d8b09
Fix XSS issue in use of ListPager
- xmppserver/src/main/java/org/jivesoftware/util/ListPager.java (version b09d67c1ffc884c5fa8009775a2245859c2d8b09)
-
Andrea Luciani <guest.luciani.a@IGT.com> b19e6638e0cb736b4b6904a158fcdfa05be260e3
OF-532: Fixed by including sessions with non-negative priority=0 see https://tools.ietf.org/html/rfc6121#section-8.5.3.2.1
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version b19e6638e0cb736b4b6904a158fcdfa05be260e3)
-
tomatis <tomatis@users.noreply.github.com> 4098670c33679a60af549a409ca942ffd20bb522
Update ScramSha1SaslServer.java
Logging username in case of authfail- xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ScramSha1SaslServer.java (version 4098670c33679a60af549a409ca942ffd20bb522)
-
Christian Schudt <christian.schudt@gmx.de> 0fd90e054655ea50816d92b9723336bdb5159fa6
OF-1964: SystemProperty should load classes with Thread.getContextClassloader as fallback (#1578)
- xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java (version 0fd90e054655ea50816d92b9723336bdb5159fa6)
-
akrherz <akrherz@iastate.edu> 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac
march 4.5 branch toward 4.5.2-SNAPSHOT
- distribution/pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- i18n/pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- plugins/openfire-plugin-assembly-descriptor/pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- plugins/pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- starter/pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- xmppserver/pom.xml (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java (version 2a8b81d2b44cb40dc82ebc828e7d39dead3e75ac)