Build: #15 failed
Job: RPM Workflow failed
Code commits
Openfire (master)
-
daryl herzmann 01625bef885b8aa715d411c17b5d059d275cacfe
Openfire 4.8.0 Beta (#2353)
* doc: merge changelog for 4.7.1 thru 4.7.5
* denote Openfire 4.8.0 Beta Release
* mnt: update changelog- distribution/pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- i18n/pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- plugins/openfire-plugin-assembly-descriptor/pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- plugins/pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- starter/pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- xmppserver/changelog.html (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- xmppserver/pom.xml (version 01625bef885b8aa715d411c17b5d059d275cacfe)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java (version 01625bef885b8aa715d411c17b5d059d275cacfe)
-
Guus der Kinderen e8f83e8f4bf7ab60b73fe037adbab61d2ebbd0bb
OF-2738: Include SNI when setting up outbound server-to-server connection
When setting up an outbound server-to-server connection, Openfire should send along an indication to what domain name it is attempting to connect. This will help the recipient server to process the connection for the correct vhost when that server is hosting multipe XMPP domains on the same server (ejabberd allows for this, for example).- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version e8f83e8f4bf7ab60b73fe037adbab61d2ebbd0bb)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java (version e8f83e8f4bf7ab60b73fe037adbab61d2ebbd0bb)
-
daryl herzmann 271731d66f6cbdb4eed2fae9997c4daa5bce1b29
Merge pull request #2348 from guusdk/OF-880_NoSuchUser-IQ-handling
OF-880: IQHandlers must comply with RFC 6121 Section 8.5.1 by default -
daryl herzmann 4895e5da0e54d9f000eb9b4d5d2e31d76de38656
Merge pull request #2352 from guusdk/OF-1394_Pubsub-reload-nodes-after-restart
OF-1395: Pubsub should load its nodes when re-enabled -
daryl herzmann 971f0da932438ba6e5330b14ba2b171002544583
Merge pull request #2310 from guusdk/OF-2699_PacketRejection-error
OF-2699: Define optional PacketError on PacketRejectedException -
Guus der Kinderen 1c036e8a553bb32c4ecb6d5718ab0e078331f1ce
OF-1395: Pubsub should load its nodes when re-enabled
When disabling a pubsub service, its nodes get unloaded. When re-enabling the service, those nodes should be loaded again.- i18n/src/main/resources/openfire_i18n.properties (version 1c036e8a553bb32c4ecb6d5718ab0e078331f1ce)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 1c036e8a553bb32c4ecb6d5718ab0e078331f1ce)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java (version 1c036e8a553bb32c4ecb6d5718ab0e078331f1ce)
- xmppserver/src/main/webapp/pubsub-node-summary.jsp (version 1c036e8a553bb32c4ecb6d5718ab0e078331f1ce)
-
daryl herzmann 48aeedbeab739fb041423ed5d79ff5276d7bbcd9
Merge pull request #2351 from guusdk/OF-1399_AdminConsole-pubsub-maxnumberofitems
OF-1399: PubSub Admin Console - Max number of items to persist config -
daryl herzmann 35b5c62df05faf000ba349786d2269a2ac2e8ca7
nit: add semicolon
- xmppserver/src/main/webapp/pubsub-node-edit.jsp (version 35b5c62df05faf000ba349786d2269a2ac2e8ca7)
-
daryl herzmann c7d9421ccd0e555b9d164a46dd8eb3ec8f55a854
Merge pull request #2350 from guusdk/OF-1406-AdminConsole-S2STest-output-readonly
OF-1406: Admin Console S2S Connection Test output should be read-only -
Guus der Kinderen 885c8dd2f8351a9f5470c7b5f9262fad21a3068f
OF-1399: PubSub Admin Console - Max number of items to persist config
'Max number of items' is now only configurable when 'persist items' is enabled.- xmppserver/src/main/webapp/pubsub-node-edit.jsp (version 885c8dd2f8351a9f5470c7b5f9262fad21a3068f)
-
Guus der Kinderen f3bc54fdac9afa1362a7162538dabacdf358e30d
OF-1406: Admin Console S2S Connection Test output should be read-only
Still allows the content to be copied.- xmppserver/src/main/webapp/server-connectiontest.jsp (version f3bc54fdac9afa1362a7162538dabacdf358e30d)
-
Guus der Kinderen 3c658c44e632f99f6bc78ffd2c0940a501ee62c0
OF-880: IQHandlers must comply with RFC 6121 Section 8.5.1 by default
This builds on a previous attempt to add support for IQ handling with regards to RFC 6121 Section 8.5.1 (No Such User), which was added in 15e6c5619d6ade7c40de95a1a7a158b1a9358ff0 and got partially reverted in 637cc81733092275c2726b43ebe603c0cbd438fe
The original fix got reverted, because pre-existing code (in IQHandlers of plugins) depends on non-compliant behavior.
With this new commit, I'm re-introducing the fix, but am adding a mechanism for individual plugins to opt out.- xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java (version 3c658c44e632f99f6bc78ffd2c0940a501ee62c0)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQHandler.java (version 3c658c44e632f99f6bc78ffd2c0940a501ee62c0)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSessionEstablishmentHandler.java (version 3c658c44e632f99f6bc78ffd2c0940a501ee62c0)
-
Guus der Kinderen 44349ac44fc98d9e9e474305ae0f5b8c4d219856
OF-880: No Such User detection to evaluate pre-authenticated session
A pre-authenticed session should not be consided a 'no such user' case.
Given the implementation, it's hard to identify a pre-authenticated session based on a (bare JID) 'to' address. The API is designed to be used by 'from' addresses.
Pre-authenticated sessions are unlikely to be the subject of a query, unless it is the client itself issuing the query. Aioxmpp's tests have been observed to perform disco/info requests prior to authentication. Given this, we can use the 'from' address (full JID) if its bare JID matches the addressee for the 'no such user' detection.- xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java (version 44349ac44fc98d9e9e474305ae0f5b8c4d219856)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQHandler.java (version 44349ac44fc98d9e9e474305ae0f5b8c4d219856)
-
Guus der Kinderen cf4026c9b369bd506632a797ad53a32c7080e4d6
OF-1405: Detect usage of local components
- xmppserver/src/main/webapp/server-connectiontest.jsp (version cf4026c9b369bd506632a797ad53a32c7080e4d6)
-
Guus der Kinderen 4a80408b43a47db8022821a97d44ab80694bd04a
OF-1405: Validate XMPP domain field of S2S Tester in admin console
When the end-user provides an invalid value, try to correct for common mistakes, or show a nicer error message.- i18n/src/main/resources/openfire_i18n.properties (version 4a80408b43a47db8022821a97d44ab80694bd04a)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 4a80408b43a47db8022821a97d44ab80694bd04a)
- xmppserver/src/main/java/org/jivesoftware/util/S2STestService.java (version 4a80408b43a47db8022821a97d44ab80694bd04a)
- xmppserver/src/main/webapp/server-connectiontest.jsp (version 4a80408b43a47db8022821a97d44ab80694bd04a)
-
Guus der Kinderen f4287c449a997a4382afa667bce3f90257fa9a78
OF-1405: Fix trim of trailing slash
- xmppserver/src/main/webapp/server-connectiontest.jsp (version f4287c449a997a4382afa667bce3f90257fa9a78)
-
Guus der Kinderen 82d7c32f4ae86745b25c037211ca66f6945ec923
OF-2735: Admin Console: fix title on TLS store details page
... and added a bit of Dutch translation.- i18n/src/main/resources/openfire_i18n.properties (version 82d7c32f4ae86745b25c037211ca66f6945ec923)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 82d7c32f4ae86745b25c037211ca66f6945ec923)
- xmppserver/src/main/webapp/security-certificate-details.jsp (version 82d7c32f4ae86745b25c037211ca66f6945ec923)
-
Guus der Kinderen 120cd4ceb9cb340c44820484977cd6bbde55feb2
OF-1382: Admin console should not autocomplete username/password in all forms
Auto-complete is helpful when logging into the admin console, but it is not helpful when creating new users or other forms where usernames and/or passwords are to be provided to create something new (like a MUC room).- xmppserver/src/main/webapp/group-edit.jsp (version 120cd4ceb9cb340c44820484977cd6bbde55feb2)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 120cd4ceb9cb340c44820484977cd6bbde55feb2)
- xmppserver/src/main/webapp/user-create.jsp (version 120cd4ceb9cb340c44820484977cd6bbde55feb2)
- xmppserver/src/main/webapp/user-password.jsp (version 120cd4ceb9cb340c44820484977cd6bbde55feb2)
- xmppserver/src/main/webapp/user-search.jsp (version 120cd4ceb9cb340c44820484977cd6bbde55feb2)
-
Guus der Kinderen 542147b22edec8ede582656d657a91f6796d9d16
OF-2734: Fix exception on PubSub Node config admin console page
- xmppserver/src/main/webapp/pubsub-node-configuration.jsp (version 542147b22edec8ede582656d657a91f6796d9d16)
-
Guus der Kinderen 4275bbc2df48594d4f6dfd0edc9abc21b462ca71
OF-1389: Admin Console - PubSub Node ID should be clickable
To be consistent with other admin console summary pages, the identifier of nodes on the PEP and Pubsub Node summary pages should be clickable.
This commit replaces the 'config' column with a link on the pre-existing node ID.- i18n/src/main/resources/openfire_i18n.properties (version 4275bbc2df48594d4f6dfd0edc9abc21b462ca71)
- i18n/src/main/resources/openfire_i18n_fr.properties (version 4275bbc2df48594d4f6dfd0edc9abc21b462ca71)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 4275bbc2df48594d4f6dfd0edc9abc21b462ca71)
- i18n/src/main/resources/openfire_i18n_uk_UA.properties (version 4275bbc2df48594d4f6dfd0edc9abc21b462ca71)
- xmppserver/src/main/webapp/pubsub-node-summary.jsp (version 4275bbc2df48594d4f6dfd0edc9abc21b462ca71)
-
Guus der Kinderen fe3b2c17884b4acd7bc1c49668038911ddf6a0e2
OF-2733: Sync Openfire's truststore with Mozilla's shipped CAs
Before we cut a new release, let’s make sure that we update the content of our truststore with the latest CAs. We traditionally use the ones from Mozilla.
Dan created a handy script for this task. You can find it in the build directory.
This commit replaces the truststore with one that's created with that script.- distribution/src/security/truststore (version fe3b2c17884b4acd7bc1c49668038911ddf6a0e2)
-
Guus der Kinderen 0c10d9acdafbd74484775db75baeeefbc5f8718d
OF-1407: Admin console should have a visual indicator when S2S test is running
The S2S test is a potentially long-running process. The admin console should show some kind of indicator that something is happening.
This is my poor attempt at adding a spinner. There will be much better approaches, but this is what my limited experience gets you within the amount of time I'd like to spend on something like this. Feel free to improve on this! :)- xmppserver/src/main/webapp/server-connectiontest.jsp (version 0c10d9acdafbd74484775db75baeeefbc5f8718d)
-
Guus der Kinderen 7b18f24cf40c6b3827cc1ca5374aff82aa156420
OF-2732: Updated bundled 'search' plugin to 1.7.4
The Openfire distribution contains one plugin: the search plugin.
It currently ships with version 1.7.3, while the latest release is 1.7.4.
Openfire should ship with the latest release.- distribution/pom.xml (version 7b18f24cf40c6b3827cc1ca5374aff82aa156420)
-
Guus der Kinderen 3a29cc15275ea6b44f6dbe46fa03a327649b8feb
OF-1654: Minor change to reflect change in OF-1984
Mostly non-functional changes, to reflect changes already applied under a duplicate ticket.- xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java (version 3a29cc15275ea6b44f6dbe46fa03a327649b8feb)
-
Guus der Kinderen e6b0dade6949202549ea3d7a0dc53ce1f053ed5a
Revert "OF-317 Subscribe with Response Unsubscribed Causes Roster Push to Responding Client"
Fixes OF-1183 and OF-1224
This reverts commit a9c43db148902f3511f73a1235a252e5a49f4a56.
OF-317 seems to incorrectly state that the observed behavior is a bug. When a subscription request was processed (and rejected), it seems acceptable to have a roster item in both rosters (as long as they're of state 'None').- xmppserver/src/main/java/org/jivesoftware/openfire/roster/Roster.java (version e6b0dade6949202549ea3d7a0dc53ce1f053ed5a)
-
Guus der Kinderen d28997e8fd41324bb4be32908303783929c63f65
Add some context to logged messages in StanzaHandler
- xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java (version d28997e8fd41324bb4be32908303783929c63f65)
-
Guus der Kinderen d62edf3984a889de69e311ec3cb25d99a3a8c8f8
OF-2663: Ignore disco/info errors sent over S2S
This prevents very loud errors being logged.- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version d62edf3984a889de69e311ec3cb25d99a3a8c8f8)
-
Guus der Kinderen d56b99a79c8c4a9710bed455686e3fce4a5665ee
OF-2730: Change the way channels are closed
As per Alex' suggestion: When closing the channel we switched to using `ctx.channel().close();` rather than calling `close` directly on the context:
`ctx.close()` starts to flow through the `ChannelPipeline` from the point of the `ChannelHandlerContext` while `ctx.channel().close()` will start from the tail of the `ChannelPipeline` all the time.- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java (version d56b99a79c8c4a9710bed455686e3fce4a5665ee)
-
Guus der Kinderen f0168d9264d0052cf38409a4c7b33994cb6419d9
OF-2731: Update implementation of XEP-0280: Message Carbons
In earlier versions of the XEP, messages eligible for carbon delivery were limited to those of type 'chat'. In later versions, a more broad selection of criteria was added.
This commit updates the criteria for carbon delivery (mostly) to the latest version of the XEP: 1.0.1- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version f0168d9264d0052cf38409a4c7b33994cb6419d9)
- xmppserver/src/main/java/org/jivesoftware/openfire/forward/Forwarded.java (version f0168d9264d0052cf38409a4c7b33994cb6419d9)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version f0168d9264d0052cf38409a4c7b33994cb6419d9)
- xmppserver/src/test/java/org/jivesoftware/openfire/forward/ForwardTest.java (version f0168d9264d0052cf38409a4c7b33994cb6419d9)
- xmppserver/src/test/java/org/jivesoftware/openfire/forward/ForwardedTest.java (version f0168d9264d0052cf38409a4c7b33994cb6419d9)
-
Guus der Kinderen c2d1f97e2a09642056ca8f6519959d2b52ee447c
OF-2730: Avoid Dialback being attempted when S2S Strict is enabled
This is a bit of a rewrite of NettyOutboundConnectionHandler. It is aimed at having clear, concise outcomes for the various scenarios: either a session is ready to be used, or it is properly abandoned in all of them now.- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java (version c2d1f97e2a09642056ca8f6519959d2b52ee447c)
-
Guus der Kinderen 1cc8aaa71fc5f033ec81595c4b0c44e15b0698fb
OF-2692: Explictly check if S2S Receiving Entity sets StreamID
RFC6120 dictates that during S2S, the Receiving Entity _must_ set a stream ID to the stream header. This commit fails explicitly when that's the case. Prior to this, a NullPointerException was thrown.
It is likely that this commit fixes a symptom rather than the cause of an issue. It appears that the stream-without-ID is sent by Prosody, that's attempting to send a stream error. Openfire might fail to close a socket, after giving up setting up a connection (or something of that nature).- xmppserver/src/main/java/org/jivesoftware/openfire/net/RespondingServerStanzaHandler.java (version 1cc8aaa71fc5f033ec81595c4b0c44e15b0698fb)
-
Guus der Kinderen 0593f9fe76d29e4ff7712f7d7586fb5d7b076851
OF-2728: Phase out Rome
The admin console shows a bit of RSS data. The RSS functionality that we use is very limited. Instead of using a full-fledged RSS parser (that historically has triggered a lot of static analysis warnings), we might as well roll our own implementation, based on all of the XML parsing implementation that we already have for XMPP parsing.- .dependency-check-suppressions.xml (version 0593f9fe76d29e4ff7712f7d7586fb5d7b076851)
- xmppserver/pom.xml (version 0593f9fe76d29e4ff7712f7d7586fb5d7b076851)
- xmppserver/src/main/java/org/jivesoftware/admin/servlet/BlogPostServlet.java (version 0593f9fe76d29e4ff7712f7d7586fb5d7b076851)
- xmppserver/src/main/webapp/index.jsp (version 0593f9fe76d29e4ff7712f7d7586fb5d7b076851)
- xmppserver/src/test/java/org/jivesoftware/admin/servlet/BlogPostServletTest.java (version 0593f9fe76d29e4ff7712f7d7586fb5d7b076851)
- xmppserver/src/test/resources/rss/ignite-blog.rss (version 0593f9fe76d29e4ff7712f7d7586fb5d7b076851)
-
Dan Caseley ec713fc1cc65d0d57bfe433ec8c3fe79307b7818
OF-2725: Suppress CVE related to ROOT webapp in Tomcat
- .dependency-check-suppressions.xml (version ec713fc1cc65d0d57bfe433ec8c3fe79307b7818)
-
Dan Caseley 4861be05dacd3625fbcdb774970c4dca4b681d67
OF-2725: Suppress Rapid Reset false positive
- .dependency-check-suppressions.xml (version 4861be05dacd3625fbcdb774970c4dca4b681d67)
-
Dan Caseley 205c48ef4bd7986cfa3850adbbf451964720baca
OF-2725: Suppress CVE related to to Tomcat clustering
- .dependency-check-suppressions.xml (version 205c48ef4bd7986cfa3850adbbf451964720baca)
-
Dan Caseley 4e7d86613ad71a6c4945b041460c5b2b35594447
OF-2727: Update the tests to mysql-connector-j too
- build/ci/updater/pom.xml (version 4e7d86613ad71a6c4945b041460c5b2b35594447)
-
Dan Caseley 48cd011ddcf5a8e5d746d0dcfca438de2f8ce7b3
OF-2725: Update dependency-check to 8.4.2
- pom.xml (version 48cd011ddcf5a8e5d746d0dcfca438de2f8ce7b3)
-
Dan Caseley 5ef0928d22cd6689a3b6a45e72a8bc4aaad7399b
OF-2725: Add suppression for a false positive CVE for Jetty
- .dependency-check-suppressions.xml (version 5ef0928d22cd6689a3b6a45e72a8bc4aaad7399b)
-
Dan Caseley cfd2afce80385ce613a2314d7cd53412d1c5183a
OF-2725: Suppress CVE related to a Tomcat shipped example app
- .dependency-check-suppressions.xml (version cfd2afce80385ce613a2314d7cd53412d1c5183a)
-
Dan Caseley 9d058644f83900034aff07b94783223f1ade5dfe
OF-2725: Add a suppression for a retracted CVE for dom4j
- .dependency-check-suppressions.xml (version 9d058644f83900034aff07b94783223f1ade5dfe)
-
Dan Caseley 2c850678e077c693d1ed374ed8f45d5369057b59
OF-2727: Update mysql-connector-j from 8.0.32 to 8.2.0
- xmppserver/pom.xml (version 2c850678e077c693d1ed374ed8f45d5369057b59)
-
Dan Caseley 4db3da6b128c2f55d43fd2d99b5e0a369819b286
OF-2725: Suppress CVE related to Tomcat persisted sessions
- .dependency-check-suppressions.xml (version 4db3da6b128c2f55d43fd2d99b5e0a369819b286)
-
Dan Caseley 069a17dc81fa0e88c7cfe1594d35fc4a0a6d2d6f
OF-2725: Add suppression for a default hostname validation check in Netty that Openfire doesn't use
Hostname validation is implemented separately in Openfire
https://github.com/igniterealtime/Openfire/blob/7a53b23e565cdf06a541af82560a6c49d6c9d2ae/xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java#L485-L497
https://github.com/igniterealtime/Openfire/blob/7a53b23e565cdf06a541af82560a6c49d6c9d2ae/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java#L120-L126- .dependency-check-suppressions.xml (version 069a17dc81fa0e88c7cfe1594d35fc4a0a6d2d6f)
-
Dan Caseley b120a9dd1aa6affc78cbbc878a6a6a8dfc466976
OF-2725: Add suppression for false positives on jetty-servlet-api
- .dependency-check-suppressions.xml (version b120a9dd1aa6affc78cbbc878a6a6a8dfc466976)
-
Dan Caseley d71a8ce477d8b46bb6ecf9dc34c073b7839c3fd5
OF-2726: Update dom4j from 2.1.3 to 2.1.4
- xmppserver/pom.xml (version d71a8ce477d8b46bb6ecf9dc34c073b7839c3fd5)
-
Guus der Kinderen 1356cf2a9c5b08f4bc1187e6438b6db74cabb924
OF-2668 / OF-2723: Allow plugins to be compiled against Openfire 4.8
In this commit, a second artifact is produced from the xmppserver module. Apart from the prexisting 'jar' artifact, there now is a 'taglib' artifact.
This taglib artifact is a jar file (that needs to go into our maven repository), that holds the Admin Console taglibs, in a spec-compliant directory structure.
The plugin's parent pom-file is modified to be able to make use of this new artifact.
With this, compilation of a plugin that defins the plugin parent pom as its parent succeeds (although an unhealty amount of errors is logged). The resulting admin console pages appear functional, at least in Openfire 4.8.- plugins/pom.xml (version 1356cf2a9c5b08f4bc1187e6438b6db74cabb924)
- xmppserver/pom.xml (version 1356cf2a9c5b08f4bc1187e6438b6db74cabb924)
- xmppserver/src/assembly/taglib.xml (version 1356cf2a9c5b08f4bc1187e6438b6db74cabb924)
-
Guus der Kinderen 7a53b23e565cdf06a541af82560a6c49d6c9d2ae
OF-2724: Prevent non-fatal errors when compiling plugin JSPs against Openfire 4.8.0
Disabling the 'scanManifest' option for the Jspc compiler should prevent illogical lookups by the compiler of JSP pages.- plugins/pom.xml (version 7a53b23e565cdf06a541af82560a6c49d6c9d2ae)
-
Dan Caseley b951d544f8ea95581af6c27fcf69b7ba1b96870c
OF-2721: Tidy up connection closure for newly created / uninitialised connections
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version b951d544f8ea95581af6c27fcf69b7ba1b96870c)
-
Dan Caseley 2b02502c0735e7b8cc6f4ae1fd7888cf22f16155
OF-2721: Partial fix - close the extra socket that we don't need
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java (version 2b02502c0735e7b8cc6f4ae1fd7888cf22f16155)
-
Dan Caseley 2977abc76b8b210cfc14875c41a8cb9fdcdc07b0
CI: Use TCP connections only
- runIntegrationTests (version 2977abc76b8b210cfc14875c41a8cb9fdcdc07b0)
-
Guus der Kinderen 7741dbf0c392f2523efce504f37eda9cda3289ff
OF-2687: Update Jetty from 10.0.17 to 10.0.18
- plugins/pom.xml (version 7741dbf0c392f2523efce504f37eda9cda3289ff)
- pom.xml (version 7741dbf0c392f2523efce504f37eda9cda3289ff)
-
Dan Caseley 4c14c5a6aac7ea993317f9d305676f7e05de8d65
OF-2661: Ensure we send everything (flush) before actual channel closure (#2325)
* OF-2661: Ensure we send everything (flush) before actual channel closure
* OF-2661: Restructure listeners for better sequence guarantees
* OF-2661: Additional restructuring of closing of Netty connection.
* OF-2661: Suspecting a deadlock-like state
---------
Co-authored-by: Guus der Kinderen <guus.der.kinderen@gmail.com>- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version 4c14c5a6aac7ea993317f9d305676f7e05de8d65)
-
Guus der Kinderen 67f71736f827a1a598baf15372e5f9da5385f1b0
CI: use _all_ Smack connection types
Although the modular connections are experimental, lets experiment with enabling them.
It is particularly desirable to have Websocket support.- runIntegrationTests (version 67f71736f827a1a598baf15372e5f9da5385f1b0)
-
Guus der Kinderen 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9
OF-2708: Force usage of bare JID in GroupProvider implementations
- xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/AbstractGroupProvider.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupProvider.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/JDBCGroupProvider.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
- xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupTest.java (version 788f20fab12be486c0b5c83ff4dd5c6acc7e4fd9)
-
Guus der Kinderen edb6741f792c4b773e216d7a4d7bfa5988ff4f46
OF-2708: Ensure that bare JIDs are used with groups
A Group is ment to be a collection of bare JIDs, not full JIDs. This is illustrated by the default provider, which stores only the node-part of a JID for local users.
This commit ensures that any JID that is used when interacting with a group is used in its 'bare' representation. This prevents an issue where an invocation of remove(fullJid) would not be successfull when the group did contain the corresponding bare JID of that entity.- xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java (version edb6741f792c4b773e216d7a4d7bfa5988ff4f46)
- xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupTest.java (version edb6741f792c4b773e216d7a4d7bfa5988ff4f46)
-
Guus der Kinderen c0b824ec7e149e6c4a12adc62331b2504a729faf
Applied minor IDE suggestions in 'group' package
- xmppserver/src/main/java/org/jivesoftware/openfire/group/AbstractGroupProvider.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupList.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupMap.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupPropertyMap.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupProvider.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupCollection.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupJID.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/JDBCGroupProvider.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
- xmppserver/src/main/java/org/jivesoftware/openfire/group/SharedGroupVisibility.java (version c0b824ec7e149e6c4a12adc62331b2504a729faf)
-
Guus der Kinderen 539191dd3a153b37b001aad367e6ec61686cb66c
OF-2715: Websockets should send closing frame when disconnecting
When closing a websocket connection, a <close xmlns='urn:ietf:params:xml:ns:xmpp-framing'/> should be sent prior to closing the connection.- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientConnectionHandler.java (version 539191dd3a153b37b001aad367e6ec61686cb66c)
- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java (version 539191dd3a153b37b001aad367e6ec61686cb66c)
- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketConnection.java (version 539191dd3a153b37b001aad367e6ec61686cb66c)
-
Guus der Kinderen f1f659ae0837e609395752c5c7358b1f1ba2ef6a
OF-2714: Use JDK1.8+ variant of Bouncy Castle
- xmppserver/pom.xml (version f1f659ae0837e609395752c5c7358b1f1ba2ef6a)
-
Guus der Kinderen 8df84f54f2cc0622aaf9837a794a2948a3a44815
OF-2713: Update Bouncy Castle dependency from 1.70 to 1.76
- pom.xml (version 8df84f54f2cc0622aaf9837a794a2948a3a44815)
- xmppserver/src/main/java/org/jivesoftware/admin/ASN1DERTag.java (version 8df84f54f2cc0622aaf9837a794a2948a3a44815)
- xmppserver/src/main/java/org/jivesoftware/util/cert/SANCertificateIdentityMapping.java (version 8df84f54f2cc0622aaf9837a794a2948a3a44815)
- xmppserver/src/test/java/org/jivesoftware/util/CertificateManagerTest.java (version 8df84f54f2cc0622aaf9837a794a2948a3a44815)
-
Guus der Kinderen f3cd0039368296eddd8d9edde6b729d2f1b96126
OF-2711: Fix bug in queuing mechanism in CSI
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java (version f3cd0039368296eddd8d9edde6b729d2f1b96126)
-
Guus der Kinderen 491034666ee5eaa78b239f1ebca162e169e77716
OF-2706: Split off 'connection details' on client session details page, add local port.
- i18n/src/main/resources/openfire_i18n.properties (version 491034666ee5eaa78b239f1ebca162e169e77716)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 491034666ee5eaa78b239f1ebca162e169e77716)
- xmppserver/src/main/webapp/session-details.jsp (version 491034666ee5eaa78b239f1ebca162e169e77716)
-
Guus der Kinderen 7f4c2f6469d1c2d025e3f733c55adfd098b5acfd
OF-2706: Remove 'resource' column from client session summary page
- xmppserver/src/main/webapp/session-row.jspf (version 7f4c2f6469d1c2d025e3f733c55adfd098b5acfd)
- xmppserver/src/main/webapp/session-summary.jsp (version 7f4c2f6469d1c2d025e3f733c55adfd098b5acfd)
-
Guus der Kinderen 2d89c9d9dbef49823db6cef16c0032ec1a7d66e5
OF-2707: Admin Console session close should disable stream management
When closing a connection, it shouldn't linger around in a detached state.- xmppserver/src/main/webapp/session-details.jsp (version 2d89c9d9dbef49823db6cef16c0032ec1a7d66e5)
- xmppserver/src/main/webapp/session-summary.jsp (version 2d89c9d9dbef49823db6cef16c0032ec1a7d66e5)
-
Guus der Kinderen 91a6ab76947f6d0bafe45e80eb3892fb415f153e
OF-2706: Allow client session to be closed on details admin console page
- xmppserver/src/main/webapp/session-details.jsp (version 91a6ab76947f6d0bafe45e80eb3892fb415f153e)
-
Guus der Kinderen e12a23d816af4d56f4242b8e8d3685ecbb5a87f3
OF-2706: Don't show button for extended info if there's none.
- xmppserver/src/main/webapp/session-details.jsp (version e12a23d816af4d56f4242b8e8d3685ecbb5a87f3)
-
Guus der Kinderen 382ca244cf04b212dddaf1549460080a45944b57
OF-2706: Allow server session to be closed on details admin console page
- xmppserver/src/main/webapp/server-session-details.jsp (version 382ca244cf04b212dddaf1549460080a45944b57)
- xmppserver/src/main/webapp/server-session-summary.jsp (version 382ca244cf04b212dddaf1549460080a45944b57)
-
Guus der Kinderen a30e1dcfc5801cab43e33c5a2c20320506391e27
OF-2706: Reorganize data on client session page
- i18n/src/main/resources/openfire_i18n.properties (version a30e1dcfc5801cab43e33c5a2c20320506391e27)
- i18n/src/main/resources/openfire_i18n_nl.properties (version a30e1dcfc5801cab43e33c5a2c20320506391e27)
- xmppserver/src/main/webapp/session-details.jsp (version a30e1dcfc5801cab43e33c5a2c20320506391e27)
-
Guus der Kinderen 1680824c8e7908fddefee77f0456dc28b847a8f6
OF-2706: Add SASL mechanism to client session details page
- i18n/src/main/resources/openfire_i18n.properties (version 1680824c8e7908fddefee77f0456dc28b847a8f6)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 1680824c8e7908fddefee77f0456dc28b847a8f6)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java (version 1680824c8e7908fddefee77f0456dc28b847a8f6)
- xmppserver/src/main/webapp/session-details.jsp (version 1680824c8e7908fddefee77f0456dc28b847a8f6)
-
Guus der Kinderen c438d27b70fba0949caef1b23d1cc9eddc64ff28
OF-2706: Reduce pause after closing session
- xmppserver/src/main/webapp/session-details.jsp (version c438d27b70fba0949caef1b23d1cc9eddc64ff28)
- xmppserver/src/main/webapp/session-summary.jsp (version c438d27b70fba0949caef1b23d1cc9eddc64ff28)
-
Guus der Kinderen 54afad1e965d02a629d015782c5857aab54bfea7
OF-2705: Remove usage of method deprecated in previous commit
- xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/cluster/RemotePacketExecution.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketCopier.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketPacketWriteHandler.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/roster/Roster.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterManager.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/PresenceManagerImpl.java (version 54afad1e965d02a629d015782c5857aab54bfea7)
-
Guus der Kinderen 117171936b582148f2426c0409828407ce93d6fb
OF-2705: Improve routing stanzas to matching full JID
RFC 6121 section 8.5.3 defines how a server should process a stanza that is addressed to a full JID. When a matching resource is found, the specification does not distinghuis between an “available” resource and a “connected” resource. Instead, it refers to an “available resource or connected resource” (this is different for processing of stanzas to bare JIDs, in section 8.5.2).
Openfire’s implementation of routing stanzas addressed to a full JID of a resource for which a route exist should not evaluate the ‘availability’ of the route, as this contradicts the RFC, which doesn’t differentiate between ‘available’ and ‘connected’.- xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java (version 117171936b582148f2426c0409828407ce93d6fb)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version 117171936b582148f2426c0409828407ce93d6fb)
-
Guus der Kinderen e05b841e1c573f247f8a6706165e6cc98ac6a7bc
OF-2703: Ensure websocket 'open' element is not expanded
This primarily works around an apparent bug in Smack: SMACK-935- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java (version e05b841e1c573f247f8a6706165e6cc98ac6a7bc)
- xmppserver/src/test/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandlerTest.java (version e05b841e1c573f247f8a6706165e6cc98ac6a7bc)
-
Guus der Kinderen dd189d3276c76d17f2bb151c24b580e27442158d
OF-2703: Improve websocket 'open' document generation
By improving how the dom4j document representing an 'open' element is created, there's no need for string-manipulation to collapse the empty element.- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java (version dd189d3276c76d17f2bb151c24b580e27442158d)
- xmppserver/src/test/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandlerTest.java (version dd189d3276c76d17f2bb151c24b580e27442158d)
-
daryl herzmann cd8d0b2b63c2542cdd4559c2863de63a45ba2037
Merge pull request #2317 from guusdk/debug-muc-unload
Reduce verbosity in logs due to unloading inactive MUC rooms -
Guus der Kinderen fd7610747695c583bc6f007861c42674a0e4acea
Debug info: Add remote address to toString of NettyConnection
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version fd7610747695c583bc6f007861c42674a0e4acea)
-
Guus der Kinderen 4dda25cd945df651285d0eb253fe3461532de62d
Modify server-to-server connection timeouts
This changes the default value for the server-to-server initialization timeout from 5 to 10 seconds, and the idle timeout from 6 to 30 minutes. This is more in line with behavior experienced on Ignite's own XMPP domain.- xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java (version 4dda25cd945df651285d0eb253fe3461532de62d)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 4dda25cd945df651285d0eb253fe3461532de62d)
-
Guus der Kinderen 2f72ac7a2dff9ddbec57be1d0d7aaef2108d0eda
Reduce verbosity in logs due to unloading inactive MUC rooms
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java (version 2f72ac7a2dff9ddbec57be1d0d7aaef2108d0eda)
-
Guus der Kinderen 79c76bee384b63d226201f92e58c4cef18f18250
New unit tests for Group
This new unit test verifies behavior of caching and event listeners in relation to operations on a Group.- xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupTest.java (version 79c76bee384b63d226201f92e58c4cef18f18250)
-
Guus der Kinderen 25b27649d7a5244a355fa98ddc0aef5bcf2a493f
Admin Console: padding for icon on server session summary
- xmppserver/src/main/webapp/server-session-row.jspf (version 25b27649d7a5244a355fa98ddc0aef5bcf2a493f)
-
Guus der Kinderen 289b9ca52fd7dc3bbd692a66f3e57bf23e362f80
OF-2699: Define optional PacketError on PacketRejectedException
This change allows a PacketError to be added to the exception that is used to reject (incoming) stanzas in PacketInterceptors. This new field is used in the error that's sent back to the sender, allowing for more detailed error reporting.- xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java (version 289b9ca52fd7dc3bbd692a66f3e57bf23e362f80)
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version 289b9ca52fd7dc3bbd692a66f3e57bf23e362f80)
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version 289b9ca52fd7dc3bbd692a66f3e57bf23e362f80)
- xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketRejectedException.java (version 289b9ca52fd7dc3bbd692a66f3e57bf23e362f80)
-
Guus der Kinderen 1cb692e7e190c0702345dd7525165eb9d6781aa4
OF-2698: Improve Netty's idle detection
Previous implementation worked on a mix of 'read' and 'write' idle events. This replacement more closely reflects the old MINA approach.- i18n/src/main/resources/openfire_i18n.properties (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyClientConnectionHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyComponentConnectionHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnectionHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyIdleStateKeepAliveHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyMultiplexerConnectionHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyServerConnectionHandler.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/NettyServerInitializer.java (version 1cb692e7e190c0702345dd7525165eb9d6781aa4)
-
Dan Caseley 75cb9422667c273405cf9eb3f0bfaca93a4147f6
OF-2620 - Make CSS absolute too
- xmppserver/src/main/webapp/decorators/main.jsp (version 75cb9422667c273405cf9eb3f0bfaca93a4147f6)
-
Dan Caseley 03bddc6d77feb9f0e13c3413f65cd2f2fea66666
OF-2620 - Use Openfire assets on Plugin pages, rather than force them to duplicate
- xmppserver/src/main/webapp/WEB-INF/classes/META-INF/tags/admin/infoBox.tagx (version 03bddc6d77feb9f0e13c3413f65cd2f2fea66666)
-
Dan Caseley ce12f2bf6568d0cf85713b3dbf82629f5e0cd7de
Use path var for custom Admin hosting
Use the path var (defined elsewhere in main) to ensure that if Admin is hosted in an unusual or proxied location (e.g. http://myhost/openfire) that the assets will still be resolved- xmppserver/src/main/webapp/decorators/main.jsp (version ce12f2bf6568d0cf85713b3dbf82629f5e0cd7de)
-
Bogdan Matasaru <bmatasar@gmail.com> 530a617565492459aa216b5fcd6adcda3a1dc662
Fixed behaviour.js
It should iterate over the list of rules instead of the non-iterable Behaviour object.
In several places for..in was used to iterate over the values of an array instead of for..of.- xmppserver/src/main/webapp/js/behaviour.js (version 530a617565492459aa216b5fcd6adcda3a1dc662)
-
Guus der Kinderen a7f3ba3e38806b89c0fa75b77d5d17c0dffc14cb
OF-2697: Improve concurrent setup of S2S connections
By replacing the queue in the thread pool used to setup server-to-server connections, it is far more likely that connections will be created concurrently.
The old queue size property served two purposes. As the thread pool queue now no longer has a configurable capacity, the property description is modified to reflect its other usage: that of the maximum size of the queue of stanzas waiting to be delivered.- i18n/src/main/resources/openfire_i18n.properties (version a7f3ba3e38806b89c0fa75b77d5d17c0dffc14cb)
- i18n/src/main/resources/openfire_i18n_nl.properties (version a7f3ba3e38806b89c0fa75b77d5d17c0dffc14cb)
- i18n/src/main/resources/openfire_i18n_uk_UA.properties (version a7f3ba3e38806b89c0fa75b77d5d17c0dffc14cb)
- xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version a7f3ba3e38806b89c0fa75b77d5d17c0dffc14cb)
-
Guus der Kinderen 10f00cfd500f2e3624452f12b4b86266d4f52f98
OF-2696: Do not resolve CAPS hashes when peer is MUC occupant
Openfire should not try to send any IQ query to a MUC room: it is not an occupant of that room, so the requests are likely to fail.- xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java (version 10f00cfd500f2e3624452f12b4b86266d4f52f98)
-
Guus der Kinderen 4978c17b445b9b164de2efd3c2081be2125f9434
OF-2681: Add Server Dialback namespace even on authenticated connections
The connection to the authoritative server can be authenticated (I'm assuming that it uses laxer SASL EXTERNAL rules). Over that connection, dialback-namespaced data is sent. So, we'll need the namespace prefix to be defined on its stream.- xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java (version 4978c17b445b9b164de2efd3c2081be2125f9434)
-
Guus der Kinderen 42cc4c5a1013f2230dec13bb45077e69fbc8cf3f
OF-2682: Move duplicate version info to new abstract Connection class
- xmppserver/src/main/java/org/jivesoftware/openfire/Connection.java (version 42cc4c5a1013f2230dec13bb45077e69fbc8cf3f)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/AbstractConnection.java (version 42cc4c5a1013f2230dec13bb45077e69fbc8cf3f)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version 42cc4c5a1013f2230dec13bb45077e69fbc8cf3f)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version 42cc4c5a1013f2230dec13bb45077e69fbc8cf3f)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version 42cc4c5a1013f2230dec13bb45077e69fbc8cf3f)
-
Guus der Kinderen 84cdf828e62240885604fddc50cfc7f0f3c7cdb2
OF-2682: Move duplicate close listener management to new abstract Connection class
- xmppserver/src/main/java/org/jivesoftware/openfire/net/AbstractConnection.java (version 84cdf828e62240885604fddc50cfc7f0f3c7cdb2)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version 84cdf828e62240885604fddc50cfc7f0f3c7cdb2)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version 84cdf828e62240885604fddc50cfc7f0f3c7cdb2)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version 84cdf828e62240885604fddc50cfc7f0f3c7cdb2)
-
Guus der Kinderen 7428417c95ff2e44cc5d9a60af58d99b2ecfdbac
Cleanup minor IDE warnings
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version 7428417c95ff2e44cc5d9a60af58d99b2ecfdbac)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version 7428417c95ff2e44cc5d9a60af58d99b2ecfdbac)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version 7428417c95ff2e44cc5d9a60af58d99b2ecfdbac)
-
Guus der Kinderen abe5e6506935c796f933e263f0a278c1694702a6
OF-2682: Move duplicate session management to new abstract Connection class
- xmppserver/src/main/java/org/jivesoftware/openfire/net/AbstractConnection.java (version abe5e6506935c796f933e263f0a278c1694702a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version abe5e6506935c796f933e263f0a278c1694702a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version abe5e6506935c796f933e263f0a278c1694702a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version abe5e6506935c796f933e263f0a278c1694702a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyIdleStateKeepAliveHandler.java (version abe5e6506935c796f933e263f0a278c1694702a6)
- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketConnection.java (version abe5e6506935c796f933e263f0a278c1694702a6)
-
Guus der Kinderen 76588a1a36589898c6168e3293708c2519575153
OF-2682: Replace static field on Connection with abstract class
The 'namespaces' field defined on the Connection interface was expected to contain namespace delarations specific to the Connection instance.
However, fields defined on a Java interface are static, meaning that their content is shared with all instances.
To ensure that each instance gets its own data, the field has been moved into a new abstract class. Existing implementations are changed to inherit from this new class.
There might be potential to move more shared functionality from implementations to this new shared class. That has not been done in this commit.- xmppserver/src/main/java/org/jivesoftware/openfire/Connection.java (version 76588a1a36589898c6168e3293708c2519575153)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/AbstractConnection.java (version 76588a1a36589898c6168e3293708c2519575153)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java (version 76588a1a36589898c6168e3293708c2519575153)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java (version 76588a1a36589898c6168e3293708c2519575153)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java (version 76588a1a36589898c6168e3293708c2519575153)
-
Guus der Kinderen b3c4305176e9a383491a8a95fa57779d143719e0
OF-2693: Make configurable XML declaration generation
This commit replaces boilerplate code that generates a 'stream'-based XML document (and strips the closing tag) with a new utility method.
In this new method, new configuration is made available:
- `xmpp.xml.xml-declaration.suppress` Controls if an XML declaration is generated before a 'stream' open tag is sent.
- `xmpp.xml.xml-declaration.suppress-newline` Controls if a newline is added after a generated XML declaration and the 'stream' open tag.- i18n/src/main/resources/openfire_i18n.properties (version b3c4305176e9a383491a8a95fa57779d143719e0)
- i18n/src/main/resources/openfire_i18n_nl.properties (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/RespondingServerStanzaHandler.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReader.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReadingMode.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalComponentSession.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalConnectionMultiplexerSession.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
- xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java (version b3c4305176e9a383491a8a95fa57779d143719e0)
-
Alex Gidman <alex.gidman@surevine.com> 05ddfa67ac4ef8d2e0081fd61a7b4c5a47ca9810
test: OF-2665 - add unit test for Cache configuration to ensure that unlimited and non-expiring caches are configured as such
- xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java (version 05ddfa67ac4ef8d2e0081fd61a7b4c5a47ca9810)
-
Alex Gidman <alex.gidman@surevine.com> bdba692987245365fbf45371f0ef01a331d52941
fix: OF-2665 tidy up
- xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java (version bdba692987245365fbf45371f0ef01a331d52941)
-
Alex Gidman <alex.gidman@surevine.com> 5307a98c5d446f8bec6432d9a78b8aa063e115d0
chore: OF-2665 - add javadoc and copyright header to CacheFactoryConfigTest
- xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java (version 5307a98c5d446f8bec6432d9a78b8aa063e115d0)
-
Guus der Kinderen 958cba6625a3bc40c6552a6121a4fec1e80375f6
Add missing i18n content for SystemProperties (#2301)
- i18n/src/main/resources/openfire_i18n.properties (version 958cba6625a3bc40c6552a6121a4fec1e80375f6)
- i18n/src/main/resources/openfire_i18n_nl.properties (version 958cba6625a3bc40c6552a6121a4fec1e80375f6)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCvCardHandler.java (version 958cba6625a3bc40c6552a6121a4fec1e80375f6)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/OccupantManager.java (version 958cba6625a3bc40c6552a6121a4fec1e80375f6)
- xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java (version 958cba6625a3bc40c6552a6121a4fec1e80375f6)
-
Guus der Kinderen 4724db69b15eb9aff3a0cdc4072d62a5130d24b2
Revert "OF-2665: Add trace logs for when caches are modified for incoming server sessions (#2293)" (#2300)
This reverts commit b5ed121675a9b0223954e84fc8b9485c60ac6fc3.- xmppserver/src/main/java/org/jivesoftware/openfire/LocalSessionManager.java (version 4724db69b15eb9aff3a0cdc4072d62a5130d24b2)
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 4724db69b15eb9aff3a0cdc4072d62a5130d24b2)
-
Guus der Kinderen 9fa2e118fedcb2d7b6432192ee3d3fa9e126cbb4
Documentation: modifications to Mellium's code snippet
- documentation/client-minimal-working-example-mellium.html (version 9fa2e118fedcb2d7b6432192ee3d3fa9e126cbb4)