Code commits
Openfire (master)
-
Guus der Kinderen abd2f93203b569a9fa90c4ddd713475116ae1445
OF-2809: Guard against negative max idle time for websockets (#2434)
* OF-2809: Guard against negative max idle time for websockets
When the max idle time is configured to be negative, then do not schedule the check to see if the connection is still active.
* OF-2809: Tweak task implementation to make null-references less likely
... and rename class to follow convention of starting with a capital letter.- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientConnectionHandler.java (version abd2f93203b569a9fa90c4ddd713475116ae1445)
-
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 914f1f4f9f36903348e7d615ff65a43ca2670d8f
Bump dorny/paths-filter from 2 to 3 (#2407)
Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 2 to 3.
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dorny/paths-filter/compare/v2...v3)
---
updated-dependencies:
- dependency-name: dorny/paths-filter
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>- .github/workflows/continuous-integration-workflow.yml (version 914f1f4f9f36903348e7d615ff65a43ca2670d8f)
-
Guus der Kinderen d66bddd29dbf56aa9b822635619fa66cca6f2112
OF-2795 / OF-2166: Remove MUC affiliation of a user that is being deleted. (#2420)
This prevents a new user by the same name to claim the affiliation.- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version d66bddd29dbf56aa9b822635619fa66cca6f2112)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java (version d66bddd29dbf56aa9b822635619fa66cca6f2112)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version d66bddd29dbf56aa9b822635619fa66cca6f2112)
-
Dan Caseley <dan@caseley.me.uk> 03bafe917a5bbd7e23e9cd28f6064b6d7829fae7
OF-2777: Add tests
- xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupTest.java (version 03bafe917a5bbd7e23e9cd28f6064b6d7829fae7)
-
daryl herzmann <akrherz@iastate.edu> ae81af0e9229321ff106e06718429aa5da3c0a88
Merge pull request #2433 from guusdk/OF-2808_SM-connection-close-race
OF-2808: Fix race condition in connection close / stream management -
daryl herzmann <akrherz@iastate.edu> db9398fe9c60b5765e65faa61b5c71b706d068e8
Merge pull request #2432 from guusdk/OF-2810_SM-resume-a-resumed-stream
OF-2810: Ensure that resumed streams are themselves resumable -
daryl herzmann <akrherz@iastate.edu> 2faa632ecd8002e60fd2eec8906fd3d86d487407
Merge pull request #2431 from guusdk/OF-2777_Contactlist-sharing-onlyGroups
OF-2777: Allow groups to be shared with other groups -
daryl herzmann <akrherz@iastate.edu> 670e2f025fda077c7e3cd4ab212677a314838bc6
Merge pull request #2430 from guusdk/OF-2807_Contactlist-sharing-changes-event
OF-2807: Fix event handling for Group Property changes -
daryl herzmann <akrherz@iastate.edu> b0bf88ff30104e884bb92bbcc6522e99e3d35e18
Merge pull request #2425 from guusdk/OF-2802_Upgrade-postgresql-driver
OF-2802: Upgrade Postgresql JDBC driver from 42.6.0 to 42.7.2 -
Guus der Kinderen f6a6b39e3a552841a57a87919de363ec614b614d
OF-2777: Allow groups to be shared with other groups
When a group is to be shared with other groups, this is stored in the database as a group property of name `sharedRoster.showInRoster` having a value of `onlyGroup`. The group property value for `sharedRoster.groupList` controls to what groups this group is shared. It either is a comma-separated list (denoting group names), or it's empty. An empty value signals that the group is shared only with members of the same group.
This commit corrects how the admin panel interprets the database values, and fixes the `getSharedWithUsersInGroupNames` method of Group.- xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java (version f6a6b39e3a552841a57a87919de363ec614b614d)
- xmppserver/src/main/webapp/group-edit.jsp (version f6a6b39e3a552841a57a87919de363ec614b614d)
-
daryl herzmann <akrherz@iastate.edu> 15290859271334a5df20a51588f3473b4a403fc9
Merge pull request #2426 from guusdk/OF-2805_Admin-console-session-details
OF-2805: Align session details with session summary -
Guus der Kinderen 5741961a8628edc0d0dcf23e38c2f1ff30c7a504
OF-2808: Fix race condition in connection close / stream management
The Netty connection implementation that replaces the MINA connection asynchronously closes a connection. This causes a race condition in Stream Management: when resuming a stream on a new connection, the close-listeners that are intended to operate on the old connection are sometimes erroneously operating on the new connection (which causes issues).
This commit makes the close method synchronous again, by introducing a latch. A new issue (OF-2811) was raised to address the issue without introducing blocking behavior.- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version 5741961a8628edc0d0dcf23e38c2f1ff30c7a504)
-
Guus der Kinderen a4f6383622860e02853972c3ffb556e5ed6b3c34
OF-2810: Ensure that resumed streams are themselves resumable
Unlike the old MINA connections, Netty connections issue a 'formal close' when closed. This prevents them from being resumable.
When a connection is 'resumed', the resumed connection should itself be resumable again. This allows for subsequent network interruptions to be recoverable.- xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java (version a4f6383622860e02853972c3ffb556e5ed6b3c34)
-
Guus der Kinderen 09185134c7b45174de06de7e11334884f7c0750c
OF-2807: Fix event handling for Group Property changes
When a GroupProperty is added, modified or deleted, an event listening mechanism is activated. This, among other things, is used to clean up cache content and push changes to rosters.
This commit fixes a problem with the 'modified' handler. It caused the wrong event to be emitted ('deleted', rather than 'modified').- xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupPropertyMap.java (version 09185134c7b45174de06de7e11334884f7c0750c)
-
Guus der Kinderen 37dfa08326a4c93c1d76520dd882a8f216792164 m
OF-2805: Align session details with session summary
When the same user logs in with more than one client, its 'session details' page on the admin console lists a small table with all the sessions for that user.
This table re-uses the session-details row from the session-summary page. This page was modified in OF-2706 (notably, the 'resource' column got deleted).
With this commit, the layout on the session details page is updated to match that of the rows on the session summary page.- xmppserver/src/main/webapp/session-details.jsp (version 37dfa08326a4c93c1d76520dd882a8f216792164)
-
Guus der Kinderen b3180072cab92cd0970ef4d3fd5c7c8bef419a71 m
OF-2802: Upgrade Postgresql JDBC driver from 4.6.0 to 4.7.2
This addresses CVE-2024-1597. Openfire does not seem to be affected by this, but as the reported severity is 10/10, static analyzers will undoubtedly cause a sense of urgency.- build/ci/updater/pom.xml (version b3180072cab92cd0970ef4d3fd5c7c8bef419a71)
- xmppserver/pom.xml (version b3180072cab92cd0970ef4d3fd5c7c8bef419a71)