Build: #198 was successful
Job: RPM Workflow was successful
Code commits
Openfire (main)
-
daryl herzmann 6097b344a586991808c302826e884157669acd16
Merge pull request #3133 from igniterealtime/backport-3129-to-5.0
[Backport 5.0] OF-3175: Prevent deadlock when enumerating encrypted XML properties -
Guus der Kinderen a3b3091f9d6a23d7c28afb3b7590f5095c0791c2
OF-3175: Prevent deadlock when enumerating encrypted XML properties
Fix a potential deadlock in XMLProperties when getAllPropertyNames() encounters encrypted properties that may trigger rewrite or auto-upgrade logic.
The previous implementation iterated properties while holding a read-lock, but could indirectly attempt to acquire a write-lock (via decryption or encryption upgrade paths), resulting in a read→write lock upgrade deadlock during startup.
This change makes getAllPropertyNames() strictly read-only by separating name collection from any property access that could mutate state, ensuring no write-lock is attempted while the read-lock is held.
This resolves startup hangs observed when encrypted properties (e.g. LDAP credentials) are present.
(cherry picked from commit 5cb5258fc0432e1b5605140755cc360e10b3d1c3)- xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java (version a3b3091f9d6a23d7c28afb3b7590f5095c0791c2)
-
daryl herzmann f325bf2a241a1642564260e160bd91bad36ec17f
Merge pull request #3131 from igniterealtime/backport-3130-to-5.0
[Backport 5.0] OF-3177: Log root cause when TrustManager initialization fails -
Guus der Kinderen c9f8ca5cbdca6d58fb450232eddb8bba51f7ecd2
OF-3177: Log root cause when TrustManager initialization fails
Ensure that the original exception and full stack trace are logged when TrustManager instantiation fails, instead of suppressing the error when trying to use the fallback mechanism.
(cherry picked from commit 109ab75448c41e0c5a4164bc165245ab80088617)- xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java (version c9f8ca5cbdca6d58fb450232eddb8bba51f7ecd2)