Build: #338 was successful
Job: Mac Build Workflow was successful
Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> 83f653f8d0601ff3667e1c5cf3ac18834f0d4a24
Merge pull request #1492 from akrherz/s
bump bundled search plugin to v1.7.3 -
akrherz <akrherz@iastate.edu> 625d258439ad25e83d51ff6cc3df67d63a7a8b23
bump bundled search plugin to v1.7.3
- distribution/pom.xml (version 625d258439ad25e83d51ff6cc3df67d63a7a8b23)
-
daryl herzmann <akrherz@iastate.edu> 1bb48c3b1717aaf0bc32d647897b150b07671184
Merge pull request #1491 from guusdk/OF-1877_Upgrade-bouncycastle
OF-1877: Upgrade BouncyCastle from 1.61 to 1.63. -
daryl herzmann <akrherz@iastate.edu> 522546ffbd106824b3c975e79a7b5db6bbc5d537
Merge pull request #1488 from guusdk/OF-1873_LDAP-disclose-adminPassword
OF-1873: Don't disclose LDAP adminPassword -
daryl herzmann <akrherz@iastate.edu> 5fd9d99838cf46b1e631851f54bfe33e78aec71e
Merge pull request #1489 from guusdk/OF-1874_profile-settings-xss
OF-1874: Apply JSTL to profile-settings page, to avoid XSS. -
daryl herzmann <akrherz@iastate.edu> dbc5a1327205b227b23d73a79a26d16124782d20
Merge pull request #1490 from guusdk/OF-1876_Upgrade-mysql-connectorj
OF-1876: Upgrade Mysql Connector/J to 8.0.17 -
Guus der Kinderen ee255013d1865a50548fee3542c556cb2e4c068b
OF-1877: Upgrade BouncyCastle from 1.61 to 1.63.
- pom.xml (version ee255013d1865a50548fee3542c556cb2e4c068b)
-
Guus der Kinderen c988ff0efb3e077f9832663af7ce195925dfbbb3
OF-1876: Upgrade Mysql Connector/J to 8.0.17
- xmppserver/pom.xml (version c988ff0efb3e077f9832663af7ce195925dfbbb3)
-
Guus der Kinderen cf33e798249eef76b6aa66d84d0483347413b814
OF-1874: Apply JSTL to profile-settings page, to avoid XSS.
- xmppserver/src/main/webapp/profile-settings.jsp (version cf33e798249eef76b6aa66d84d0483347413b814)
-
Guus der Kinderen 6e05e61085c96138f401d690906d45a47ab88071
OF-1873: Don't disclose LDAP adminPassword
This commit intends to prevent disclosure of a previously configured password for LDAP. Now, the LDAP configuration page will only show a password value if that was provided in the same HTTP session. Likewise, a password value that might already have been stored is not updated, unless explicitly changed.- xmppserver/src/main/webapp/setup/ldap-server.jspf (version 6e05e61085c96138f401d690906d45a47ab88071)
- xmppserver/src/main/webapp/setup/setup-ldap-server_test.jsp (version 6e05e61085c96138f401d690906d45a47ab88071)
-
daryl herzmann <akrherz@iastate.edu> dc5b4ef077c76f784ef72e5f5a0a5c8d34b6266c
Merge pull request #1486 from guusdk/OF-1251_expose-elapsedtime-formatting-in-jstl
OF-1251: Expose time elapsed formatting as taglib function. -
Guus der Kinderen b7215c4d529a639821c670b09cd627e45c00fc02
OF-1251: Expose time elapsed formatting as taglib function.
This allows for the formatting function to be used with JSTL.- xmppserver/src/main/resources/META-INF/admin.tld (version b7215c4d529a639821c670b09cd627e45c00fc02)
- xmppserver/src/main/webapp/META-INF/admin.tld (version b7215c4d529a639821c670b09cd627e45c00fc02)
- xmppserver/src/main/webapp/WEB-INF/admin.tld (version b7215c4d529a639821c670b09cd627e45c00fc02)
-
Guus der Kinderen 4eb625a62134638996b829ac71246d8737112a5d
OF-1860: Check plugin archive structure.
Openfire should verify that the structure of the plugin archive does not include files that are expanded outside of the target directory.- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java (version 4eb625a62134638996b829ac71246d8737112a5d)
-
Guus der Kinderen 2b317ad503de13b71938a966ff5e45bddd7909b5
OF-1860: Don't stop processing all plugins if one fails to unzip.
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java (version 2b317ad503de13b71938a966ff5e45bddd7909b5)
-
Dan Caseley <dan@caseley.me.uk> 7ae8efc63f745bba248cf11e841514f215441d92
Include log4j config for Openfire in entrypoint script
- build/docker/entrypoint.sh (version 7ae8efc63f745bba248cf11e841514f215441d92)
-
Dan Caseley <dan@caseley.me.uk> 5b54a039296b75632747905ff115fd454033c2e4
Bump maven version in docker multi-stage build
- Dockerfile (version 5b54a039296b75632747905ff115fd454033c2e4)
-
GregDThomas <greg.d.thomas@gmail.com> a2475dfc3766a44f2958c532f4dff42584035eb7
OF-1865: Implement a GroupBasedAdminProvider (#1481)
* OF-1865: Implement a GroupAdminProvider
* OF-1865: Improve the JavaDoc
* Rename class to be clearer
* (and fix the test!)- i18n/src/main/resources/openfire_i18n.properties (version a2475dfc3766a44f2958c532f4dff42584035eb7)
- xmppserver/src/main/java/org/jivesoftware/openfire/admin/GroupBasedAdminProvider.java (version a2475dfc3766a44f2958c532f4dff42584035eb7)
- xmppserver/src/test/java/org/jivesoftware/openfire/admin/GroupBasedAdminProviderTest.java (version a2475dfc3766a44f2958c532f4dff42584035eb7)
-
daryl herzmann <akrherz@iastate.edu> d724fedb0cc679007f863de2fd40728e93520fed
Merge pull request #1480 from guusdk/OF-1859_SessionData-previous-value
OF-1859: SessionData modifications should return previous values. -
Guus der Kinderen decc72803a4164adf0060617525e50d09f076076
OF-1859: SessionData modifications should return previous values.
If the operations that modify content of `LocalSession#sessionData` would return previous values (as the `Map` interface does) then there's less need for outside synchronization to keep certain modifications thread-safe.- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java (version decc72803a4164adf0060617525e50d09f076076)
-
daryl herzmann <akrherz@iastate.edu> de1e1cebb5b3fc67452e338fb676e99005ee2477
Merge pull request #1479 from GregDThomas/clustered-muc-chat-service
OF-1858: Ensure that adding/deleting MUC services is cluster aware -
daryl herzmann <akrherz@iastate.edu> 9d4661e1835c506539a707ebc1dde69f1d2adf3e
Merge pull request #1478 from guusdk/OF-1857_shutdown-logging
OF-1857: Improve logging around shutdown event. -
Greg Thomas <greg.d.thomas@gmail.com> 3fd72f29d7634541a232bde39b509140b6d54f3b
OF-1858: Ensure that adding/deleting MUC services is cluster aware
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java (version 3fd72f29d7634541a232bde39b509140b6d54f3b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceAddedEvent.java (version 3fd72f29d7634541a232bde39b509140b6d54f3b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceRemovedEvent.java (version 3fd72f29d7634541a232bde39b509140b6d54f3b)
-
Guus der Kinderen 83379537875572beb169ac861f1e71c7497fe4ff
OF-1857: Improve logging around shutdown event.
- xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 83379537875572beb169ac861f1e71c7497fe4ff)
-
Guus der Kinderen 01774fc4345f069f5853fea7e482f6fd9bd384d6
OF-1855: S2S: Allow Mutual Authentication by default when using signed certificate
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionListener.java (version 01774fc4345f069f5853fea7e482f6fd9bd384d6)
-
Guus der Kinderen 8b5f219e128b6b8f4b38a603c47e0cc73b06ae51
OF-1856: Fix isAnonymous detection
The isAnonymous check should not depend on the fact that the provided JID is a full JID. This will give incorrect results ('not anonymous') if the provided JID is bare.
This commit checks for any anonymous session that matches the bare JID - if there's one then that's enough (a user cannot be both anonymous and not anonymous).- xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version 8b5f219e128b6b8f4b38a603c47e0cc73b06ae51)
-
Guus der Kinderen 9a2efa45dd54a40854d3858ae418d0ea0e8857a7
OF-1854: Allow trust- and identitystores to be of different type.
This primarily facilitates integrating with Windows certificate stores, by setting the type of 'Windows-ROOT' for truststores, and 'Windows-MY' for identity stores.- xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java (version 9a2efa45dd54a40854d3858ae418d0ea0e8857a7)
- xmppserver/src/main/webapp/security-certificate-store-management.jsp (version 9a2efa45dd54a40854d3858ae418d0ea0e8857a7)
-
Guus der Kinderen 9c3caf235d1e874d483eee55e74b3dd78f3f9cdf
OF-1852: Adding more log statements.
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version 9c3caf235d1e874d483eee55e74b3dd78f3f9cdf)
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version 9c3caf235d1e874d483eee55e74b3dd78f3f9cdf)
-
Guus der Kinderen ba08aa600c7660ddaf5716e23377e77f260ebaf2
OF-1852: Improve the handling of unprocessable presence and message stanzas
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version ba08aa600c7660ddaf5716e23377e77f260ebaf2)
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version ba08aa600c7660ddaf5716e23377e77f260ebaf2)
-
Guus der Kinderen a4bd0f95ae450dd733cca9b4ce87679f8d1d3573
OF-1852: Adding more log statements.
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version a4bd0f95ae450dd733cca9b4ce87679f8d1d3573)
-
Guus der Kinderen da61d38f9c264fe9976923238836d6c700f0cafb
OF-1852: Don't bounce presence stanza that potentially was a bounce itself.
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version da61d38f9c264fe9976923238836d6c700f0cafb)
-
Guus der Kinderen 99c9a34b4c436e399b66ea47072ec22442c6aa5c
OF-1852: Don't bounce message stanza that potentially was a bounce itself.
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version 99c9a34b4c436e399b66ea47072ec22442c6aa5c)
-
Guus der Kinderen eabdb81846ed68a41bb18e789b1a84d49286be55
OF-1852: Bounce all non-specified presence stanzas by default.
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version eabdb81846ed68a41bb18e789b1a84d49286be55)
-
Guus der Kinderen 559b74b7a77c6e437e0dbe4e7d9f6adf0c7c5451
OF-1852: More consistency in presence and message bouncing code.
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version 559b74b7a77c6e437e0dbe4e7d9f6adf0c7c5451)
-
Guus der Kinderen 4d59bfd7b4bc3f5733760daea27534535242a8f4
OF-1851: More appropriate error when anon users interact with roster.
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRosterHandler.java (version 4d59bfd7b4bc3f5733760daea27534535242a8f4)
-
daryl herzmann <akrherz@iastate.edu> ca0e2b1b0dc280cbb0e5cb07e3cbab184dec8e3c
Merge pull request #1474 from guusdk/OF-1853_MUC-send-empty-subject
OF-1853: Upon joining a MUC, a subject MUST be set (even when empty). -
Guus der Kinderen d9b1649e90dbb7a046ea7f5dea122f0be93779b0
OF-1853: Upon joining a MUC, a subject MUST be set (even when empty).
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version d9b1649e90dbb7a046ea7f5dea122f0be93779b0)
-
daryl herzmann <akrherz@iastate.edu> 4a5766ea068b5b54d29c64026aea4ec27b3132ec
Merge pull request #1471 from guusdk/OF-1849_Allow-startls-on-directtls-port
OF-1849 allow startls on directtls port -
daryl herzmann <akrherz@iastate.edu> b8e02dd2e70c0f8dc73dc29c96713a33abfe9599
Merge pull request #1470 from guusdk/OF-793_Unsupported-record-version
OF-793: Fixes for 'unsupported record version' exception -
daryl herzmann <akrherz@iastate.edu> e68f6537a0c7b588fda2b3ee1cefd987c0380bee
Merge pull request #1463 from guusdk/OF-1433_Allow-presence-reflection
OF-1433: Allow presence reflection -
daryl herzmann <akrherz@iastate.edu> 9cb002e96a345a963220cb0e86e457be8cc5788f
Merge pull request #1450 from guusdk/OF-1833_dns-check-xmpp-over-tls
OF-1833: Improve dns-check.jsp to include XMPP-over-TLS -
Guus der Kinderen c5cbe3282f7b7182af19b9e3a190fb0aefbc6d79
OF-793: Add comment to clarify code structure.
- xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSWrapper.java (version c5cbe3282f7b7182af19b9e3a190fb0aefbc6d79)
-
Guus der Kinderen 654e7689dd3f6023780db4eac40633add26ee8f5
Add additional debug logging.
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 654e7689dd3f6023780db4eac40633add26ee8f5)
-
Guus der Kinderen 429de4d58a0543de7a84949c0c3576096da7ab7d
OF-1849: Allow StartTLS on DirectTLS port
When DNS SRV records are misconfigured, connections that are expected to receive DirectTLS data could receive non-encrypted data (optionally to be encrypted with StartTLS later).
This commit adds a new configuration option 'xmpp.server.tls.on-plain-detection-allow-nondirecttls-fallback' (default: true) that can be used to toggle this behavior.- xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version 429de4d58a0543de7a84949c0c3576096da7ab7d)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java (version 429de4d58a0543de7a84949c0c3576096da7ab7d)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 429de4d58a0543de7a84949c0c3576096da7ab7d)
-
Guus der Kinderen f271eba6e56a50383dbbe663563a16fbd2fc2446
OF-793: Write </stream:stream> on correct writer
This commit ensures that an end-stream tag, as written by outgoing s2s connections, is written on the proper writer. This change intends to prevent issues where plain-text '</stream:stream>' is written on socket that's supposed to be encrypted.- xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version f271eba6e56a50383dbbe663563a16fbd2fc2446)
-
Guus der Kinderen 2f654c8ba7a69b09ea7448873c7f76fa94837024
OF-793: Log data that triggers "Unsupported record version Unknown-" exception
With some frequency, Openfire logs exceptions with this message: "javax.net.ssl.SSLException: Unsupported record version Unknown-47.115". One source of this appears to be in S2S Dialback negotiation.
This appears to be caused by Openfire trying to parse plain-text data as TLS: the decimal representation 47 115 equals to the characters '/' and 's'. A common place for these characters to occur in XMPP would be in stream close tags: </stream:stream>.
This commit allows the content of the buffer that's being parsed by the TLS handler to be logged in its hexadecimal representation, when the exception occurs.
In a test environment, I've found this hex string to be logged by this: "3c2f73747265616d3a73747265616d3e". Converted to characters, this is: "</stream:stream>"- xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSWrapper.java (version 2f654c8ba7a69b09ea7448873c7f76fa94837024)
-
daryl herzmann <akrherz@iastate.edu> 725c3f69cfec28caa3721d9dc029e32764680194
Merge pull request #1469 from guusdk/OF-1848_s2s-dupes
OF-1848: Prevent duplicate S2S session establishment -
Guus der Kinderen a75e88dfec921e4daf6eff8cb2fdf370caa0bb7b
OF-1848: Prevent duplicate S2S session establishment
The session creation event must not be triggered before the created session has been fully registered. This prevents an issue where a new session is established by stanzas being sent by the trigger.
Additionally, duplicate events should be prevented.- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java (version a75e88dfec921e4daf6eff8cb2fdf370caa0bb7b)
- xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version a75e88dfec921e4daf6eff8cb2fdf370caa0bb7b)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java (version a75e88dfec921e4daf6eff8cb2fdf370caa0bb7b)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version a75e88dfec921e4daf6eff8cb2fdf370caa0bb7b)
-
Eric Ampire <ericampire.top@gmail.com> 87ff0b624d97eb1ced714d20b16617ae98a43156
[Fix] The interceptor could not intercept a domain that is null
- xmppserver/src/main/java/org/jivesoftware/util/S2STestService.java (version 87ff0b624d97eb1ced714d20b16617ae98a43156)
-
Guus der Kinderen 42a4e2eca414a4e87f3b294a54635ddfa557eecf
OF-1433: Allow presence reflection
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java (version 42a4e2eca414a4e87f3b294a54635ddfa557eecf)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version 42a4e2eca414a4e87f3b294a54635ddfa557eecf)
-
Guus der Kinderen 2ce63c5c819179e731e4dd4e1eeeda94f2da46c6 m
OF-1833: Improve dns-check.jsp to include XMPP-over-TLS
- i18n/src/main/resources/openfire_i18n.properties (version 2ce63c5c819179e731e4dd4e1eeeda94f2da46c6)
- i18n/src/main/resources/openfire_i18n_es.properties (version 2ce63c5c819179e731e4dd4e1eeeda94f2da46c6)
- i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 2ce63c5c819179e731e4dd4e1eeeda94f2da46c6)
- xmppserver/src/main/webapp/dns-check.jsp (version 2ce63c5c819179e731e4dd4e1eeeda94f2da46c6)