Commit Graph

3282 Commits

Author SHA1 Message Date
Benedict Wong
d09d1dc280 [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours am: c7657003be -s ours
am: ced3090359 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I4aa807405215cf72914bb96c53da03af21dc331a
2019-05-16 01:42:50 -07:00
Junyu Lai
89165b1f20 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours am: 9fe83529b8 -s ours
am: 33dd370165 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: If89cdbe56a37a6e70ae4e29adb3f87ab86ee36c0
2019-05-16 00:47:13 -07:00
Benedict Wong
75d341a00c [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours
am: 9107d1254d -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I2bbd2e1b17d3817e0cc428e611f067869ce468a1
2019-05-15 20:32:18 -07:00
Junyu Lai
95cdce29d4 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours
am: 13ac5e1179 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 bbf160a93d is in history

Change-Id: I05acf67444e52603cf72e1ba332b789688bec6d4
2019-05-15 19:42:14 -07:00
Benedict Wong
ced3090359 [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours
am: c7657003be -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: If52d90532c3e66d3ac92f075b347f48f83728a0c
2019-05-15 18:06:39 -07:00
Junyu Lai
33dd370165 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours
am: 9fe83529b8 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 bbf160a93d is in history

Change-Id: I2780d2e0e6abdeacd606e2c1da72f0534e9f7b5e
2019-05-15 17:25:06 -07:00
Benedict Wong
9107d1254d [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev
am: c7774ffa16 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I055e83cefe7fb9865688c6750d7f85f57ef125a4
2019-05-15 16:15:12 -07:00
Junyu Lai
13ac5e1179 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev
am: 8702c1454d -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: I8df6484c7872da7459437518451468e7d6cf24a2
2019-05-15 14:46:56 -07:00
Benedict Wong
82752ae2af [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev am: c7774ffa16 -s ours
am: c7657003be -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I6177843de2b7cfa8e95543430a7c9f0a7fb84854
2019-05-14 22:30:31 -07:00
Benedict Wong
c7657003be [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev
am: c7774ffa16 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I990a35a69d0c5d10cb97e27668a831e2ca78bcc4
2019-05-14 21:42:35 -07:00
TreeHugger Robot
c7774ffa16 Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev 2019-05-15 03:58:29 +00:00
Junyu Lai
7bfd517419 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours
am: 9fe83529b8 -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: Ie41cf36442cb8148844d8ab3ded4765f76bd2c14
2019-05-14 20:22:57 -07:00
Junyu Lai
9fe83529b8 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev
am: 8702c1454d -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: I34770e7d4fe3dcde9f8f41eeedee93053049b0bd
2019-05-14 19:32:45 -07:00
Junyu Lai
8efd5f026b Merge changes I60b9e9ae,I8be89116 am: c3db303f0b am: 3fc54a07ae
am: 6bbc8f71af

Change-Id: I5be7d999607d81c7cc38445502085ca21e89773d
2019-05-13 07:30:06 -07:00
Junyu Lai
6bbc8f71af Merge changes I60b9e9ae,I8be89116 am: c3db303f0b
am: 3fc54a07ae

Change-Id: I7dbe2879e00bb9f7614ca700b40fb54e7e3f1744
2019-05-13 07:24:29 -07:00
Junyu Lai
3fc54a07ae Merge changes I60b9e9ae,I8be89116
am: c3db303f0b

Change-Id: I2b98b3083c33dfd7e9e4a204375433c116f84813
2019-05-13 07:19:21 -07:00
junyulai
bbf160a93d add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

(Clean cherry-pick of aosp/957205)

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
Merged-In: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 22:19:02 +08:00
junyulai
ad4c047f6d [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

(Clean cherry-pick of aosp/937026)

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
Merged-In: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 22:16:50 +08:00
junyulai
80ec50b8ae add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 18:10:36 +08:00
junyulai
b41bc72ea3 [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 18:10:23 +08:00
Benedict Wong
9e0263943f Merge "Convert IPsec tests to JUnit4" into qt-dev am: cb00fbdcc2
am: 236be238b6

Change-Id: I7a1b315b7d9c433ce996791fa64408f01aa75812
2019-05-11 01:49:04 -07:00
Benedict Wong
8929f6bfdd Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50 am: ad380770a3
am: d2465991d9

Change-Id: Iad5cb4d5b6c83e0e2cda87e0f7ce0d69a52acd6d
2019-05-10 21:37:39 -07:00
Benedict Wong
ff0c1c3ff6 [automerger skipped] Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 into qt-dev am: e97231be1b -s ours
am: 305873fdd9 -s ours
am skip reason: change_id Ic4181fc857fa880db5553314efa914f870dbe87c with SHA1 64e64ff454 is in history

Change-Id: Iddcd115b723754be646ac7726b794f7433c11ca3
2019-05-10 21:33:52 -07:00
Benedict Wong
236be238b6 Merge "Convert IPsec tests to JUnit4" into qt-dev
am: cb00fbdcc2

Change-Id: I55b51901ecf1166bc553b247e0c9681fb1e20058
2019-05-10 15:52:14 -07:00
Benedict Wong
0d08e91fe7 Convert IPsec tests to JUnit4
This patch fixes an incompatibility where some tests in the same
hierarchy were using Junit3, and other Junit4

No functional test changes made

Bug: 72950854
Test: Ran on devices, working
Change-Id: I79d231e202ba25ad5f57b44b387bebd7f012aa95
2019-05-10 20:05:43 +00:00
Benedict Wong
fbbb9c9c04 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Merged-In: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
(cherry picked from commit d2465991d9)
2019-05-10 18:08:48 +00:00
Benedict Wong
d2465991d9 Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50
am: ad380770a3

Change-Id: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
2019-05-10 11:05:43 -07:00
Benedict Wong
ad380770a3 Merge "Enforce IPsec Tunnel mode for Android Q"
am: 81e51bce50

Change-Id: I6004a243d1840c5f89f400d8f5a3f682054ef12f
2019-05-10 10:57:35 -07:00
Benedict Wong
305873fdd9 [automerger skipped] Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 into qt-dev
am: e97231be1b -s ours
am skip reason: change_id Ic4181fc857fa880db5553314efa914f870dbe87c with SHA1 64e64ff454 is in history

Change-Id: Id9e175e0d4670fc082f28d55945dfde823672eb6
2019-05-10 10:52:49 -07:00
Benedict Wong
81e51bce50 Merge "Enforce IPsec Tunnel mode for Android Q" 2019-05-10 17:41:04 +00:00
Benedict Wong
084c8b47b6 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
2019-05-10 01:22:13 -07:00
Xin Li
df7916b3ec [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 8982cb36d7 -s ours am: 849c3a4352 -s ours
am: 574d9a15f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I618bf485ce2771a232aebff9b5545b70864a9bba
2019-05-09 22:45:27 -07:00
Benedict Wong
9dd0e2dbf8 Merge "Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 am: 54c0726220 am: df00896e14" into qt-dev-plus-aosp
am: b746ff1c7d

Change-Id: Ia9607e0bac862abec9102eacfda4841ab639d332
2019-05-09 20:01:10 -07:00
Xin Li
574d9a15f9 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 8982cb36d7 -s ours
am: 849c3a4352 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia270b9bb1c50ae27a441fd7aedb2950f450fa249
2019-05-09 17:56:47 -07:00
Benedict Wong
817d192bc4 Add IPsec Tunnel mode data tests
This change adds single-direction tests for the IPsec Tunnel Mode API.
In the outbound direction, TUNs are used to capture outgoing packets,
and values are inspected. In the inbound direction, packets are built
manually, using the PacketUtils framework. Additional testing for
end-to-end integration tests will follow in aosp/941021 using packet
reflection via the TUN.

Bug: 72950854
Test: This; passing
Change-Id: Ic4181fc857fa880db5553314efa914f870dbe87c
Merged-In: Ic4181fc857fa880db5553314efa914f870dbe87c
(cherry picked from commit d708a4c217f13c9028427d98031394f0933482bf)
2019-05-09 17:30:32 -07:00
Benedict Wong
2d2a1ab8f7 Add utilities to generate packets
This change adds utility methods to generate packets incrementally. It
supports UDP, ESP, IPv4, IPv6 packet generation.

For ESP, it exclusively does AES-CBC, HMAC-SHA256.

Bug: 72950854
Test: This
Change-Id: Icffeed2ebb2005d79faf04f48fd5126d1d6fb175
Merged-In: Icffeed2ebb2005d79faf04f48fd5126d1d6fb175
(cherry picked from commit 0e4743d56553d698ac45ae548f31019ea6e91541)
2019-05-09 17:30:32 -07:00
Benedict Wong
2742923a63 Add TunUtils as utility to reflect packets
This patch adds a TunUtils class, allowing for packet capture over a TUN
interface, inspection of some basic header fields, and reflection of
packets with flipped src/dst headers.

Bug: 72950854
Test: Ran, passing
Change-Id: I9fdba4a905886c7a4820d86ef52c0cc1843215b2
Merged-In: I9fdba4a905886c7a4820d86ef52c0cc1843215b2
(cherry picked from commit 2f07cd8551d755a4076e94b9e620bc446a66bf54)
2019-05-09 17:30:32 -07:00
Benedict Wong
f57c5e21cc Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 am: 54c0726220
am: df00896e14

Change-Id: Id0c3017b926b6f2fc158b10c0c0eb9a727e57dd6
2019-05-09 16:50:17 -07:00
Xin Li
849c3a4352 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 8982cb36d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Iab80c552f75d155db7c8b1e9408eb86dd56acaa3
2019-05-09 16:42:07 -07:00
Benedict Wong
df00896e14 Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9
am: 54c0726220

Change-Id: I3a5a1a1ae0096eba2993798bf2707a8cfda81c97
2019-05-09 15:10:52 -07:00
Xin Li
8982cb36d7 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:51 +00:00
Benedict Wong
54c0726220 Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9
* changes:
  Add IPsec Tunnel mode data tests
  Add utilities to generate packets
  Add TunUtils as utility to reflect packets
2019-05-09 20:51:01 +00:00
Benedict Wong
64e64ff454 Add IPsec Tunnel mode data tests
This change adds single-direction tests for the IPsec Tunnel Mode API.
In the outbound direction, TUNs are used to capture outgoing packets,
and values are inspected. In the inbound direction, packets are built
manually, using the PacketUtils framework. Additional testing for
end-to-end integration tests will follow in aosp/941021 using packet
reflection via the TUN.

Bug: 72950854
Test: This; passing
Change-Id: Ic4181fc857fa880db5553314efa914f870dbe87c
2019-05-09 11:25:15 -07:00
Benedict Wong
75fb3d002e Add utilities to generate packets
This change adds utility methods to generate packets incrementally. It
supports UDP, ESP, IPv4, IPv6 packet generation.

For ESP, it exclusively does AES-CBC, HMAC-SHA256.

Bug: 72950854
Test: This
Change-Id: Icffeed2ebb2005d79faf04f48fd5126d1d6fb175
2019-05-09 11:25:06 -07:00
Benedict Wong
8f2f7d5908 [automerger skipped] Check for IPSEC_TUNNELS feature before running CTS tests am: af4330f777 -s ours
am: 8553bf3be5 -s ours
am skip reason: change_id I62fcc2cbca8bf3d2b70da5646303a7059a0df663 with SHA1 437eb03a33 is in history

Change-Id: I3beb61ab58561377ad900e884727ca1c66164761
2019-05-09 01:40:15 -07:00
Benedict Wong
8553bf3be5 [automerger skipped] Check for IPSEC_TUNNELS feature before running CTS tests
am: af4330f777 -s ours
am skip reason: change_id I62fcc2cbca8bf3d2b70da5646303a7059a0df663 with SHA1 437eb03a33 is in history

Change-Id: I4b7431f8727654d3088122f9312b9913da8672e2
2019-05-08 21:29:41 -07:00
Benedict Wong
20d01b7570 Merge "Check for IPSEC_TUNNELS feature before running CTS tests" am: 4243c834ce am: 0086fba2bf
am: e341fca9bc

Change-Id: Idbc44b881610dc17723c2440dd9fdac31bd1173c
2019-05-08 14:43:18 -07:00
Benedict Wong
e341fca9bc Merge "Check for IPSEC_TUNNELS feature before running CTS tests" am: 4243c834ce
am: 0086fba2bf

Change-Id: Ia45b229e5c3b5d1f8c8a7afcb53304ef83cca04a
2019-05-08 13:57:50 -07:00
Benedict Wong
0086fba2bf Merge "Check for IPSEC_TUNNELS feature before running CTS tests"
am: 4243c834ce

Change-Id: Ia996f994fdfc373ffbe634a40cb13002128fe98d
2019-05-08 13:25:51 -07:00
Benedict Wong
4243c834ce Merge "Check for IPSEC_TUNNELS feature before running CTS tests" 2019-05-08 20:04:06 +00:00