Build: #2367 was successful Changes by daryl herzmann <akrherz@iastate.edu>
Code commits
Openfire (master)
-
daryl herzmann <akrherz@iastate.edu> e6f1e7e0deac9c13dcb2836cb0075638879e7d50
Merge pull request #2151 from guusdk/OF-2550_dnsutil-logging
OF-2550: Additional logging when dnsutil.dnsOverride is used -
daryl herzmann <akrherz@iastate.edu> b49b2703f7f9685e07dff487b6b1da8b229d3163
Merge pull request #2155 from igniterealtime/dependabot/maven/build/ci/updater/org.postgresql-postgresql-42.4.3
Bump postgresql from 42.4.1 to 42.4.3 in /build/ci/updater -
daryl herzmann <akrherz@iastate.edu> a8e359d5431f1f45d930475ed576619509ac973b
Merge pull request #2154 from igniterealtime/dependabot/maven/xmppserver/org.postgresql-postgresql-42.4.3
Bump postgresql from 42.4.1 to 42.4.3 in /xmppserver -
daryl herzmann <akrherz@iastate.edu> aacbba514a20368360223256e9b2c79262c1005d
Merge pull request #2168 from guusdk/OF-2565_Drop-stream-prior-to-resource-binding
OF-2565: Should drop stream when client sends stanzas prior to resource binding -
daryl herzmann <akrherz@iastate.edu> e10b4da8ec55def3c8b5ada684e6b2d8eee50b92
Merge pull request #2167 from guusdk/OF-2564_ServerSession-authentication-state
OF-2564: Refactor server session authentication state -
daryl herzmann <akrherz@iastate.edu> 9c7a7df77c1e43fc9dc6a59dab3ee463eea5e105
Merge pull request #2158 from guusdk/OF-2556-also-ignore-stream
OF-2556: Ignore stream namespace -
Guus der Kinderen 8094b39d6fceceb593e2e9ed113fee5decd469ae m
OF-2565: Should drop stream when client sends stanzas prior to resource binding
RFC 6120, section 7.1 dictates:
> If, before completing the resource binding step, the client attempts to send an XML
> stanza to an entity other than the server itself or the client's account, the server MUST NOT process the
> stanza and MUST close the stream with a `<not-authorized>` stream error.
Openfire, prior to this commit, would reply to pretty much all stanzas that are sent prior to resource binding with a
stanza (not stream) error, and would not terminate the stream when the stanza is addressed to an entity other than the
server itself or the client's account.
With this commit, stanzas that match the RFC definition will now cause the stream to be closed with a stream error.
The prior behavior will remain in place for all other stanzas.
Arguably, there is room for further optimization:
- There appears to be duplication of processing in IQ-, Message- and PresenceRouter. However, they are invoked by other
instances than those of SessionPacketRouter (which may in itself be something that's desirable to change)
- XmppWebSocket appears to duplicate part of the processing of data that is exchanged during session setup. Comments
have been added for future improvement.
- The Openfire API makes it hard to distinghuish between 'client authenticated & completed resource binding' and
'client authenticated, but did not complete resource binding yet'. There are no explicit handling for the latter
scenario, which again could be improved upon in the future.- xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java (version 8094b39d6fceceb593e2e9ed113fee5decd469ae)
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version 8094b39d6fceceb593e2e9ed113fee5decd469ae)
- xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java (version 8094b39d6fceceb593e2e9ed113fee5decd469ae)
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionPacketRouter.java (version 8094b39d6fceceb593e2e9ed113fee5decd469ae)
- xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XmppWebSocket.java (version 8094b39d6fceceb593e2e9ed113fee5decd469ae)
- xmppserver/src/test/java/org/jivesoftware/openfire/SessionPacketRouterTest.java (version 8094b39d6fceceb593e2e9ed113fee5decd469ae)
-
Guus der Kinderen 01660b4bbb1c2d77f832f52901e5dbcbff413c2e m
OF-2564: Introduce enum for 'authentication method' for S2S session
Prior to this commit, an S2S session was marked as 'Dialback', unless overridden (even non-authenticated sessions were marked as 'Dialback').
Now, a session defines the authentication method that was used explicitly, and only after authentication has occurred.- i18n/src/main/resources/openfire_i18n.properties (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/IncomingServerSessionTask.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalServerSession.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/OutgoingServerSessionTask.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteIncomingServerSession.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteOutgoingServerSession.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionTask.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/ServerSession.java (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
- xmppserver/src/main/webapp/server-session-details.jsp (version 01660b4bbb1c2d77f832f52901e5dbcbff413c2e)
-
Guus der Kinderen 9535f35a757dca64f7d8e571b96cbf131f8f1e56 m
OF-2564: Make sure S2S sessions get flagged as 'authenticated'
- xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java (version 9535f35a757dca64f7d8e571b96cbf131f8f1e56)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java (version 9535f35a757dca64f7d8e571b96cbf131f8f1e56)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 9535f35a757dca64f7d8e571b96cbf131f8f1e56)
-
Guus der Kinderen 89877e47c4fac303306d41d02e81ff91194b7508 m
OF-2556: Ignore stream namespace
Additionally ignore any explicity declaration of the http://etherx.jabber.org/streams namespace.- xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java (version 89877e47c4fac303306d41d02e81ff91194b7508)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java (version 89877e47c4fac303306d41d02e81ff91194b7508)
- xmppserver/src/test/java/dom/io/XMPPPacketReaderTest.java (version 89877e47c4fac303306d41d02e81ff91194b7508)
-
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> b815c92a83e1a27b0c67a323faeeb16e05d4a4e3 m
Bump postgresql from 42.4.1 to 42.4.3 in /build/ci/updater
Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.3)
---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>- build/ci/updater/pom.xml (version b815c92a83e1a27b0c67a323faeeb16e05d4a4e3)
-
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> bac127e0e952e22c9dacbd7dc34b5f3dc8ef363e m
Bump postgresql from 42.4.1 to 42.4.3 in /xmppserver
Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.3)
---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>- xmppserver/pom.xml (version bac127e0e952e22c9dacbd7dc34b5f3dc8ef363e)
-
Guus der Kinderen 8b76b91d66455d43e005689c80ceef554ae9fd8d m
OF-2550: Additional logging when dnsutil.dnsOverride is used
- xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version 8b76b91d66455d43e005689c80ceef554ae9fd8d)