LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add packet filters for IPv6 UDP"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-08 08:45:34 +00:00
committed by Gerrit Code Review
parent c28e11716e bcdc972c86
commit f01d29eae6
3 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java
View File

@@ -197,6 +197,8 @@ public final class NetworkStackConstants {
* - https://tools.ietf.org/html/rfc768 * - https://tools.ietf.org/html/rfc768
*/ */
public static final int UDP_HEADER_LEN = 8; public static final int UDP_HEADER_LEN = 8;
public static final int UDP_SRCPORT_OFFSET = 0;
public static final int UDP_DSTPORT_OFFSET = 2;
public static final int UDP_LENGTH_OFFSET = 4; public static final int UDP_LENGTH_OFFSET = 4;
public static final int UDP_CHECKSUM_OFFSET = 6; public static final int UDP_CHECKSUM_OFFSET = 6;

4
staticlibs/testutils/devicetests/com/android/testutils/ArpResponder.kt
View File

@@ -17,10 +17,14 @@
package com.android.testutils package com.android.testutils
import android.net.MacAddress import android.net.MacAddress
import com.android.net.module.util.NetworkStackConstants.ETHER_HEADER_LEN
import java.net.Inet4Address import java.net.Inet4Address
import java.net.InetAddress import java.net.InetAddress
import java.nio.ByteBuffer import java.nio.ByteBuffer
private const val ARP_SENDER_MAC_OFFSET = ETHER_HEADER_LEN + 8
private const val ARP_TARGET_IPADDR_OFFSET = ETHER_HEADER_LEN + 24
private val TYPE_ARP = byteArrayOf(0x08, 0x06) private val TYPE_ARP = byteArrayOf(0x08, 0x06)
// Arp reply header for IPv4 over ethernet // Arp reply header for IPv4 over ethernet
private val ARP_REPLY_IPV4 = byteArrayOf(0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02) private val ARP_REPLY_IPV4 = byteArrayOf(0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02)

81
staticlibs/testutils/hostdevice/com/android/testutils/PacketFilter.kt
View File

@@ -19,24 +19,25 @@ package com.android.testutils
import java.net.Inet4Address import java.net.Inet4Address
import java.util.function.Predicate import java.util.function.Predicate
const val ETHER_TYPE_OFFSET = 12 // Some of the below constants are duplicated with NetworkStackConstants, but this is a hostdevice
const val ETHER_HEADER_LENGTH = 14 // library usable for host-side tests, so device-side utils are not usable, and there is no
const val IPV4_PROTOCOL_OFFSET = ETHER_HEADER_LENGTH + 9 // host-side non-test library to host common constants.
const val IPV4_CHECKSUM_OFFSET = ETHER_HEADER_LENGTH + 10 private const val ETHER_TYPE_OFFSET = 12
const val IPV4_DST_OFFSET = ETHER_HEADER_LENGTH + 16 private const val ETHER_HEADER_LENGTH = 14
const val IPV4_HEADER_LENGTH = 20 private const val IPV4_PROTOCOL_OFFSET = ETHER_HEADER_LENGTH + 9
const val IPV4_UDP_OFFSET = ETHER_HEADER_LENGTH + IPV4_HEADER_LENGTH private const val IPV6_PROTOCOL_OFFSET = ETHER_HEADER_LENGTH + 6
const val IPV4_UDP_SRCPORT_OFFSET = IPV4_UDP_OFFSET private const val IPV4_CHECKSUM_OFFSET = ETHER_HEADER_LENGTH + 10
const val IPV4_UDP_DSTPORT_OFFSET = IPV4_UDP_OFFSET + 2 private const val IPV4_DST_OFFSET = ETHER_HEADER_LENGTH + 16
const val UDP_HEADER_LENGTH = 8 private const val IPV4_HEADER_LENGTH = 20
const val BOOTP_OFFSET = IPV4_UDP_OFFSET + UDP_HEADER_LENGTH private const val IPV6_HEADER_LENGTH = 40
const val BOOTP_TID_OFFSET = BOOTP_OFFSET + 4 private const val IPV4_PAYLOAD_OFFSET = ETHER_HEADER_LENGTH + IPV4_HEADER_LENGTH
const val BOOTP_CLIENT_MAC_OFFSET = BOOTP_OFFSET + 28 private const val IPV6_PAYLOAD_OFFSET = ETHER_HEADER_LENGTH + IPV6_HEADER_LENGTH
const val DHCP_OPTIONS_OFFSET = BOOTP_OFFSET + 240 private const val UDP_HEADER_LENGTH = 8
private const val BOOTP_OFFSET = IPV4_PAYLOAD_OFFSET + UDP_HEADER_LENGTH
const val ARP_OPCODE_OFFSET = ETHER_HEADER_LENGTH + 6 private const val BOOTP_TID_OFFSET = BOOTP_OFFSET + 4
const val ARP_SENDER_MAC_OFFSET = ETHER_HEADER_LENGTH + 8 private const val BOOTP_CLIENT_MAC_OFFSET = BOOTP_OFFSET + 28
const val ARP_TARGET_IPADDR_OFFSET = ETHER_HEADER_LENGTH + 24 private const val DHCP_OPTIONS_OFFSET = BOOTP_OFFSET + 240
private const val ARP_OPCODE_OFFSET = ETHER_HEADER_LENGTH + 6
/** /**
* A [Predicate] that matches a [ByteArray] if it contains the specified [bytes] at the specified * A [Predicate] that matches a [ByteArray] if it contains the specified [bytes] at the specified
@@ -47,12 +48,48 @@ class OffsetFilter(val offset: Int, vararg val bytes: Byte) : Predicate<ByteArra
bytes.withIndex().all { it.value == packet[offset + it.index] } bytes.withIndex().all { it.value == packet[offset + it.index] }
} }
private class UdpPortFilter(
private val udpOffset: Int,
private val src: Short?,
private val dst: Short?
) : Predicate<ByteArray> {
override fun test(t: ByteArray): Boolean {
if (src != null && !OffsetFilter(udpOffset,
src.toInt().ushr(8).toByte(), src.toByte()).test(t)) {
return false
}
if (dst != null && !OffsetFilter(udpOffset + 2,
dst.toInt().ushr(8).toByte(), dst.toByte()).test(t)) {
return false
}
return true
}
}
/** /**
* A [Predicate] that matches ethernet-encapped packets that contain an UDP over IPv4 datagram. * A [Predicate] that matches ethernet-encapped packets that contain an UDP over IPv4 datagram.
*/ */
class IPv4UdpFilter : Predicate<ByteArray> { class IPv4UdpFilter @JvmOverloads constructor(
srcPort: Short? = null,
dstPort: Short? = null
) : Predicate<ByteArray> {
private val impl = OffsetFilter(ETHER_TYPE_OFFSET, 0x08, 0x00 /* IPv4 */).and( private val impl = OffsetFilter(ETHER_TYPE_OFFSET, 0x08, 0x00 /* IPv4 */).and(
OffsetFilter(IPV4_PROTOCOL_OFFSET, 17 /* UDP */)) OffsetFilter(IPV4_PROTOCOL_OFFSET, 17 /* UDP */)).and(
UdpPortFilter(IPV4_PAYLOAD_OFFSET, srcPort, dstPort))
override fun test(t: ByteArray) = impl.test(t)
}
/**
* A [Predicate] that matches ethernet-encapped packets that contain an UDP over IPv6 datagram.
*/
class IPv6UdpFilter @JvmOverloads constructor(
srcPort: Short? = null,
dstPort: Short? = null
) : Predicate<ByteArray> {
private val impl = OffsetFilter(ETHER_TYPE_OFFSET, 0x86.toByte(), 0xdd.toByte() /* IPv6 */).and(
OffsetFilter(IPV6_PROTOCOL_OFFSET, 17 /* UDP */)).and(
UdpPortFilter(IPV6_PAYLOAD_OFFSET, srcPort, dstPort))
override fun test(t: ByteArray) = impl.test(t) override fun test(t: ByteArray) = impl.test(t)
} }
@@ -77,9 +114,7 @@ class ArpRequestFilter : Predicate<ByteArray> {
* A [Predicate] that matches ethernet-encapped DHCP packets sent from a DHCP client. * A [Predicate] that matches ethernet-encapped DHCP packets sent from a DHCP client.
*/ */
class DhcpClientPacketFilter : Predicate<ByteArray> { class DhcpClientPacketFilter : Predicate<ByteArray> {
private val impl = IPv4UdpFilter() private val impl = IPv4UdpFilter(srcPort = 68, dstPort = 67)
.and(OffsetFilter(IPV4_UDP_SRCPORT_OFFSET, 0x00, 0x44 /* 68 */))
.and(OffsetFilter(IPV4_UDP_DSTPORT_OFFSET, 0x00, 0x43 /* 67 */))
override fun test(t: ByteArray) = impl.test(t) override fun test(t: ByteArray) = impl.test(t)
} }