Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OF-2692: Explictly check if S2S Receiving Entity sets StreamID #2333

Merged
merged 1 commit into from
Nov 14, 2023
Merged

OF-2692: Explictly check if S2S Receiving Entity sets StreamID #2333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions xmppserver/src/main/java/org/jivesoftware/openfire/net/RespondingServerStanzaHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmpp.packet.JID;
import org.xmpp.packet.StreamError;

import java.io.StringReader;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -116,7 +117,7 @@ protected void initiateSession(String stanza, XMPPPacketReader reader) throws Ex
if (startOfStream) {
// We initiate the stream for a RespondingServerStanzaHandler, so we need to add the stream namespace
// Pull namespaces off of the stream:stream stanza and add them to the additional
List<Namespace> receivedNamespaces = null;
List<Namespace> receivedNamespaces;
try {
Element rootElement = DocumentHelper.parseText(stanza + "</stream:stream>").getRootElement();
receivedNamespaces = rootElement.declaredNamespaces();
Expand All @@ -126,7 +127,12 @@ protected void initiateSession(String stanza, XMPPPacketReader reader) throws Ex
.collect(Collectors.toSet());
connection.setAdditionalNamespaces(additionalNamespaces);

String streamHeaderId = rootElement.attribute("id").getValue();
final String streamHeaderId = rootElement.attributeValue("id");
if (streamHeaderId == null || streamHeaderId.isBlank()) { // OF-2692: the peer is required to send a Stream ID. Some servers do not, when they are sending a stream error.
LOG.info("Closing connection {}. As the initiating party in a server-to-server connection, we require the receiving party to supply a stream ID value. The peer that sent this stream element did not: {}", connection, stanza);
connection.close(new StreamError(StreamError.Condition.invalid_xml, "Expected a stream ID value, but none was received."));
return;
}

// Create a new session with a new ID if a new stream has started on an existing connection
// following TLS negotiation in accordance with RFC 6120 § 5.4.3.3. See https://datatracker.ietf.org/doc/html/rfc6120#section-5.4.3.3
Expand Down