Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose parsing util methods for telephony validation" am: 5092ae8c8b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665959

Change-Id: I5470517a08a3f7662bd627c00dc30c8f3325fe3b
This commit is contained in:
Treehugger Robot
2021-04-28 02:25:54 +00:00
committed by Automerger Merge Worker
parent 5bf42637a8 5092ae8c8b
commit 2bf2f964d7
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/common/com/android/internal/telephony/SipMessageParsingUtils.java
View File

@@ -80,6 +80,15 @@ public class SipMessageParsingUtils {
return verifySipRequest(splitLine); return verifySipRequest(splitLine);
} }
/**
* @return true if the SIP message start line is considered a response.
*/
public static boolean isSipResponse(String startLine) {
String[] splitLine = splitStartLineAndVerify(startLine);
if (splitLine == null) return false;
return verifySipResponse(splitLine);
}
/** /**
* Return the via branch parameter, which is used to identify the transaction ID (request and * Return the via branch parameter, which is used to identify the transaction ID (request and
* response pair) in a SIP transaction. * response pair) in a SIP transaction.
@@ -140,7 +149,12 @@ public class SipMessageParsingUtils {
return !headers.isEmpty() ? headers.get(0).second : null; return !headers.isEmpty() ? headers.get(0).second : null;
} }
private static String[] splitStartLineAndVerify(String startLine) { /**
* Validate that the start line is correct and split into its three segments.
* @param startLine The start line to verify and split.
* @return The split start line, which will always have three segments.
*/
public static String[] splitStartLineAndVerify(String startLine) {
String[] splitLine = startLine.split(" "); String[] splitLine = startLine.split(" ");
if (isStartLineMalformed(splitLine)) return null; if (isStartLineMalformed(splitLine)) return null;
return splitLine; return splitLine;
@@ -184,7 +198,7 @@ public class SipMessageParsingUtils {
* (This is internally an equalsIgnoreMatch comparison). * (This is internally an equalsIgnoreMatch comparison).
* @return the matched header keys and values. * @return the matched header keys and values.
*/ */
private static List<Pair<String, String>> parseHeaders(String headerString, public static List<Pair<String, String>> parseHeaders(String headerString,
boolean stopAtFirstMatch, String... matchingHeaderKeys) { boolean stopAtFirstMatch, String... matchingHeaderKeys) {
// Ensure there is no leading whitespace // Ensure there is no leading whitespace
headerString = removeLeadingWhitespace(headerString); headerString = removeLeadingWhitespace(headerString);

9
telephony/java/android/telephony/ims/SipDelegateManager.java
View File

@@ -80,13 +80,18 @@ public class SipDelegateManager {
public static final int MESSAGE_FAILURE_REASON_DELEGATE_CLOSED = 2; public static final int MESSAGE_FAILURE_REASON_DELEGATE_CLOSED = 2;
/** /**
* The SIP message has an invalid start line and the message can not be sent. * The SIP message has an invalid start line and the message can not be sent or the start line
* failed validation due to the request containing a restricted SIP request method.
* {@link SipDelegateConnection}s can not send SIP requests for the methods: REGISTER, PUBLISH,
* or OPTIONS.
*/ */
public static final int MESSAGE_FAILURE_REASON_INVALID_START_LINE = 3; public static final int MESSAGE_FAILURE_REASON_INVALID_START_LINE = 3;
/** /**
* One or more of the header fields in the header section of the outgoing SIP message is invalid * One or more of the header fields in the header section of the outgoing SIP message is invalid
* and the SIP message can not be sent. * or contains a restricted header value and the SIP message can not be sent.
* {@link SipDelegateConnection}s can not send SIP SUBSCRIBE requests for the "Event" header
* value of "presence".
*/ */
public static final int MESSAGE_FAILURE_REASON_INVALID_HEADER_FIELDS = 4; public static final int MESSAGE_FAILURE_REASON_INVALID_HEADER_FIELDS = 4;