SASL 2 #3113
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
|
Member
There was a problem hiding this comment. This should probably be an immutable class. UserAgentInfo is effectively a parsed data carrier with no behavior that requires later mutation. That will make it a easier/safer to use, and to pass data without risking it being modified. If instances are likely to be shared between Openfire cluster nodes, consider making it implement |
||
| * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jivesoftware.openfire.net; | ||
|
|
||
| import org.dom4j.Element; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * Represents user agent information provided by XMPP clients during authentication. | ||
| * This information includes an optional UUID v4 identifier, software description, | ||
| * and device description. This information is not exposed to other entities. | ||
| */ | ||
| public class UserAgentInfo { | ||
| private static final Logger Log = LoggerFactory.getLogger(UserAgentInfo.class); | ||
|
|
||
| private String id; // UUID v4 | ||
| private String software; // Software description | ||
| private String device; // Device description | ||
|
|
||
| /** | ||
| * Extracts and validates user agent information from the authentication element. | ||
| * | ||
| * @param userAgentElement the authentication element containing potential user agent data | ||
| * @return UserAgentInfo containing the parsed data, or null if no user agent data present | ||
| */ | ||
| public static UserAgentInfo extract(Element userAgentElement) { | ||
| if (userAgentElement == null) { | ||
| return null; | ||
| } | ||
|
|
||
| UserAgentInfo userAgentInfo = new UserAgentInfo(); | ||
|
|
||
| // Extract and validate UUID v4 id if present | ||
| String id = userAgentElement.attributeValue("id"); | ||
| if (id != null) { | ||
| try { | ||
| UUID uuid = UUID.fromString(id); | ||
| // Validate it's a v4 UUID | ||
| if (uuid.version() == 4) { | ||
| userAgentInfo.setId(id); | ||
| } else { | ||
| Log.warn("Invalid UUID version in user-agent id (must be v4): " + id); | ||
| } | ||
| } catch (IllegalArgumentException e) { | ||
| Log.warn("Invalid UUID format in user-agent id: " + id); | ||
| } | ||
| } | ||
|
|
||
| // Extract software info if present | ||
| Element softwareElement = userAgentElement.element("software"); | ||
| if (softwareElement != null) { | ||
| userAgentInfo.setSoftware(softwareElement.getTextTrim()); | ||
| } | ||
|
|
||
| // Extract device info if present | ||
| Element deviceElement = userAgentElement.element("device"); | ||
| if (deviceElement != null) { | ||
| userAgentInfo.setDevice(deviceElement.getTextTrim()); | ||
| } | ||
|
|
||
| return userAgentInfo; | ||
| } | ||
|
|
||
| public String getId() { | ||
| return id; | ||
| } | ||
|
|
||
| void setId(String id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getSoftware() { | ||
| return software; | ||
| } | ||
|
|
||
| void setSoftware(String software) { | ||
| this.software = software; | ||
| } | ||
|
|
||
| public String getDevice() { | ||
| return device; | ||
| } | ||
|
|
||
| void setDevice(String device) { | ||
| this.device = device; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think BOSH/HTTP-Bind now advertises SASL2 but cannot process SASL2 stanzas.
HttpSessionuses itssendPendingPacketsmethod to have inbound client data be processed by the server (the term 'send' here is a bit confusing). It uses aorg.jivesoftware.openfire.SessionPacketRouterinstance to do this.org.jivesoftware.openfire.SessionPacketRouter#route(org.dom4j.Element)processes SASL1 ("auth"and"response"elements) but not the SASL2 elements.This may be indicative of a larger issue. Why is the inbound stanza handling for BOSH/Http-Binding different from other client transports? All those transports use a StanzaHandler to process inbound data, but BOSH/HTTP-Bind does not.