Commit Graph

1053 Commits

Author SHA1 Message Date
Treehugger Robot
adb9c9e83a Merge "Refactor CarrierPrivilegeAuthenticatorTest" 2022-11-18 12:05:53 +00:00
Remi NGUYEN VAN
0f92b69af7 Merge "Add MdnsNsecRecord" 2022-11-17 08:00:15 +00:00
Remi NGUYEN VAN
b683dfcea5 Merge changes I0f8e6590,I61a1bb91
* changes:
  Add MdnsAnyRecord
  Add constructors to MDNS records
2022-11-16 09:12:57 +00:00
Remi NGUYEN VAN
3ce3a4a9ca Add MdnsNsecRecord
NSEC records are included as mDNS negative responses, as per
RFC6762 6.1.

Bug: 241738458
Test: atest
Change-Id: I1546a2c10447ad46321f595b714c7ee7f6dc34c7
2022-11-16 15:57:30 +09:00
Chiachang Wang
b7577c6d42 Merge "Verify bypassability in the VPN network capabilities" 2022-11-16 05:57:00 +00:00
Treehugger Robot
b6f2a3e587 Merge "ethernet: consolidate interface enabling functions in EthernetTracker" 2022-11-16 05:51:42 +00:00
Remi NGUYEN VAN
e8d3e6d58c Add MdnsAnyRecord
The record is useful for mDNS questions in mDNS probes.

Bug: 241738458
Test: atest
Change-Id: I0f8e659048b6e1d7c3ae1640fbd2d57d723ea9b1
2022-11-16 14:40:47 +09:00
Chalard Jean
23890c29c5 Refactor CarrierPrivilegeAuthenticatorTest
Refactor this test to make it easier to test the no-op
refactoring coming as a follow-up

Test: this
Change-Id: I47c81bdec2b8f9575835ba664b61721d5f2c69ff
2022-11-15 19:27:56 +09:00
chiachangwang
d0a2805616 Verify bypassability in the VPN network capabilities
Bug: 256775913
Test: atest FrameworksNetTests
Change-Id: I6600714e5fc7c5d78fa7b8bb29c0c8840ec69637
2022-11-15 05:36:24 +00:00
Junyu Lai
c1294c2584 Merge "Remove unnecessary permission mock for registerSystemDefaultNetwork" 2022-11-15 02:23:39 +00:00
Treehugger Robot
0448f36d60 Merge "[Feature sync] Resolve class-level nullness suppression" 2022-11-10 13:53:31 +00:00
Treehugger Robot
016269fbb8 Merge "Revert "Partially enforce permission when calling getNetworkInfoForUid"" 2022-11-10 12:13:56 +00:00
Junyu Lai
d0cf7784dc Revert "Partially enforce permission when calling getNetworkInfoForUid"
This reverts commit 163cb98751.

Reason for revert: b/257407201

Change-Id: I412140117d25f4a4b439fff5aaa50785f33b0689
2022-11-10 03:19:06 +00:00
Paul Hu
6c74a13512 [Feature sync] Resolve class-level nullness suppression
This is a chery-picked commit from internal branch which is to
add nullability to reslove the nullness suppression.

Bug: 242631897
Bug: 254155029
Test: atest FrameworksNetTests
Change-Id: I289b0408c0c4ccdefc498d3b6d3f381c2b04132e
2022-11-10 01:57:46 +00:00
Paul Hu
b800e5903b Merge "[Feature sync] Fix issue where multiple SRV records with same host are not fully resolved" 2022-11-09 06:38:22 +00:00
Treehugger Robot
31ee1c1121 Merge "Allow USE_RESTRICTED_NETWORKS for registerSystemDefaultNetworkCallback" 2022-11-09 05:49:54 +00:00
Aaron Huang
4bf6a92a0a Merge "Notify NetworkStatsService if TEMPORARILY_NOT_METERED changed" 2022-11-08 11:55:53 +00:00
Aaron Huang
c067c87672 Notify NetworkStatsService if TEMPORARILY_NOT_METERED changed
Currently 5G usage includes both metered and unmetered usage.
To support 5G unmetered usage metrics, unmetered usage should
be separated from the 5G usage. Thus, ConnectivityService needs
to inform NetworkStatsService if TEMPORARILY_NOT_METERED has
changed. Then NSS will count temporarily not metered usage as
unmetered.

Bug: 222339311
Bug: 183776809
Test: FrameworksNetTests:ConnectivityServiceTest
Change-Id: I0c7e1eb98925184f36e322e09b4d3d8c6f056fa6
2022-11-08 16:01:54 +08:00
Paul Hu
bd92295269 Merge "Make onPackage[Added|Removed] as non-public methods" 2022-11-07 01:35:11 +00:00
Treehugger Robot
94ec30203b Merge "Update tests for new isValidationRequired args" 2022-11-04 11:14:41 +00:00
Remi NGUYEN VAN
21093ce089 Update tests for new isValidationRequired args
Bug: 253989196
Test: atest NetworkMonitorTest

Change-Id: I70633d748cc09a7f695cdc2b4c835d5bf187ec3d
2022-11-04 17:09:50 +09:00
Treehugger Robot
edceea23f4 Merge "Fix errorprone warnings that should be errors" 2022-11-02 19:38:39 +00:00
Cole Faust
22f05839f5 Fix errorprone warnings that should be errors
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I7625fa386afe93823b97cb2ecb8fd09a5856c05b
2022-11-02 10:13:14 -07:00
Junyu Lai
f2edd6477d Remove unnecessary permission mock for registerSystemDefaultNetwork
registerSystemDefaultNetwork now can be accessed via
CONNECTIVITY_USE_RESTRICTED_NETWORKS, there is no need
to mock NETWORK_SETTINGS prior to test.

Test: atest com.android.server.ConnectivityServiceTest
Change-Id: I408094959286f3782496ce7f356f84a6a47c0902
2022-11-02 14:17:33 +08:00
Junyu Lai
aa4ad8c2d1 Allow USE_RESTRICTED_NETWORKS for registerSystemDefaultNetworkCallback
Some callers (e.g. iwlan) need to learn about system default
network but they cannot have NETWORK_SETTINGS permission.
To allow them to use this API but prevent from misuse by
unprivileged apps, enforce USE_RESTRICTED_NETWORKS for this API.

Test: atest com.android.server.ConnectivityServiceTest#testRegisterPrivilegedDefaultCallbacksRequireNetworkSettings android.net.cts.ConnectivityManagerTest#testRegisterNetworkCallback
Fix: 242456635
Change-Id: I80ab27445af874328c9c0f4814a8fbf035ae5df4
2022-11-02 14:16:36 +08:00
Chalard Jean
0e184ac0dd Use expect instead of expectCallback
This use was checked in after the cleanup that changed the latter into the former

Bug: 157405399
Test: FrameworksNetTests
Change-Id: I2b27ad712ee218322209bbc6af6e8147a0a41430
2022-11-02 05:40:03 +00:00
Yan Yan
18ddc7daab Merge "Fix policy leak by deleting forwarding security policies" 2022-11-02 00:47:09 +00:00
lucaslin
afe76f3b77 Test dynamically calculated VPN MTUs
This change adds testing for VPN MTU calculations, and in particular
cases where IPv6 is not supported due to MTUs being too small.

Bug: 245612827
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ib064e6670244cf3b53b5d03bd62c86b2139ff32a
2022-11-01 08:09:37 +00:00
Yan Yan
f4eceba0a9 Fix policy leak by deleting forwarding security policies
Fix the policy leak by deleting forwarding policies when deleting
the IPsec tunnel interface.

Bug: 254566085
Test: atest IpSecServiceParameterizedTest (new tests added)
Change-Id: I29dd4810abb978fe886776b2fbacdfc74325436d
2022-10-31 22:51:08 +00:00
Treehugger Robot
9a726855f2 Merge "[Feature sync] Fix flaky test in MdnsSocketClientTests" 2022-10-28 08:25:08 +00:00
Paul Hu
cd04d83e68 [Feature sync] Fix flaky test in MdnsSocketClientTests
The interface index is only propagated if there is an A/AAAA
record in the response. Since the responses here are not entirely
controlled in the test, we just want to verify that we get a
response with the target we expect.

Verified by running the test 1400 times via --runs_per_test flag.

Bug: 254155029
Fix: 255922416
Test: atest MdnsSocketClientTests#startDiscovery_andPropagate\
      InterfaceIndex_includesInterfaceIndex --iteration 100
Change-Id: Icb0fe7a58a1e626b7f781ff24c2389a3095d4dc6
2022-10-28 10:26:15 +08:00
Nucca Chen
f76b8d67f8 ClatCoordinatorTest: override test generateIpv6Address correctly
aosp/2267683 adds the new param "mark" in generateIpv6Address and
TestDependencies#generateIpv6Address needs to override for this change
correctly.

Change-Id: Ia526bcdf80a428948d55a28bd5adec405530a634
Test: TH
2022-10-27 10:11:28 +00:00
Junyu Lai
0f4cb380f0 Merge "Notify NetworkStats only when interfaces changed in updateLinkProperties" 2022-10-27 06:49:33 +00:00
Chiachang Wang
c39c3759ca Merge "Test session reset on VPN data stall" 2022-10-27 05:13:45 +00:00
chiachangwang
f60356f273 Test session reset on VPN data stall
Add tests to verify ike session being triggered when data stall.

Bug: 238692379
Test: atest FrameworksNetTests
Change-Id: I656ea0973072b0bbdd54863eccbe105adb02d6ad
2022-10-26 03:05:59 +00:00
Paul Hu
e3aa5c0e06 Merge "[Feature sync] Propagate network interface index to MdnsServiceInfo" 2022-10-26 01:17:10 +00:00
Paul Hu
df7335f3cd Merge "[Feature sync] fix handling arbitrary bytes in TXT value" 2022-10-26 01:05:55 +00:00
Patrick Rohr
6150134515 ethernet: consolidate interface enabling functions in EthernetTracker
I want to add some logic to setInterfaceEnabled in a follow up, so
consolidating the functions prevents redundancy.

Test: atest EthernetManagerTest
Change-Id: I5756a09be392a970bc545612220595c6984f2b54
2022-10-25 19:15:17 +00:00
Maciej Żenczykowski
9592fa89b3 Merge "Bypass VPN lockdown for clat initialization" 2022-10-25 07:43:12 +00:00
Junyu Lai
2ed7d4182a Notify NetworkStats only when interfaces changed in updateLinkProperties
In ConnectivityService, updateLinkProperties calls NetworkStats
even though the ip address or interface name has not changed and
only the tcp buffer size has changed. This is noisy and could
be problematic when RAT change occurs frequently, since when
RAT changes tcp buffer size configuration also changes.

This CL also fixes a wrong nullability annotation where the oldLp
of updateLinkProperties could be null when updateNetworkInfo
is called.

Test: atest ConnectivityServiceTest#testStatsIfacesChanged
Fix: 232048480
Change-Id: Ic226eb4a8aa1f38cba293510813f1cb55f0ea658
2022-10-25 15:27:53 +08:00
Treehugger Robot
a40faea28d Merge changes I0789d9bd,Idf4cf74a
* changes:
  Disable ignoring validation on roam just after boot.
  Minor cleanups for ignore validation failures after roam tests.
2022-10-25 02:15:29 +00:00
t-m-w
130e75b0ab Bypass VPN lockdown for clat initialization
This allows clat to initialize properly when VPNs are configured
with "Block connections without VPN", rather than to error out with
"no IPv6 addresses were available for clat".

This issue primarily affects particular mobile networks configured
with NAT64 (without direct IPv4 connectivity).

Bug: 255040839
Change-Id: I4a8ee0295e0f5d1e330f7529856347b8bd10360c
2022-10-25 01:54:51 +00:00
Lorenzo Colitti
5edd296baa Merge "Improve tests for notifyIfacesChangedForNetworkStats." 2022-10-24 23:35:35 +00:00
Lorenzo Colitti
580d0d53be Disable ignoring validation on roam just after boot.
shouldIgnoreValidationFailureAfterRoam will incorrectly return
true in the first few seconds after boot even if the network
never roamed. This is extremely unlikely to happen, but add a
check for that just in case.

Fix: 230450214
Test: new unit test
Change-Id: I0789d9bdaa0bd9e78673e8f4248a2ca610052f1e
2022-10-24 23:28:56 +09:00
Lorenzo Colitti
6bf9bb3e58 Minor cleanups for ignore validation failures after roam tests.
- Confirm that the default network switches to cell for the right
  reason.
- Test the behaviour on T as well (always disabled).
- Minor code cleanups.

Bug: 216567577
Test: test-only change
Change-Id: Idf4cf74aec3d40246f67519d211dbd45e739a6dc
2022-10-24 23:28:54 +09:00
Paul Hu
e62d151d1e [Feature sync] Fix issue where multiple SRV records with same host are not fully resolved
For Matter, a device may have a single host with multiple A/AAAA
records, but multiple PTR/SRV pairs that represent different
operational identities for the same device.

Currently, MdnsResponseDecoder looks for only a single matching
MdnsResponse by hostname when looping through the A/AAAA records
(which will leave the second response incomplete). Updated with a
flag that will allow returning all MdnsResponses which match the
given hostname and update the Inet records for all responses.

Bug: 254155029
Test: atest FrameworksNetTests
      Verified with a Matter device with two identities that the
      second response is incomplete without this change.
      Additionally, added unit tests to verify the before and
      after behavior with a real packet capture from the device.
Change-Id: Ic4a101b305c039f6cd7fd557246a2bfdaf0c781a
2022-10-24 07:29:44 +00:00
Paul Hu
6540583f08 [Feature sync] Propagate network interface index to MdnsServiceInfo
For Matter, in addition to the InetAddress and port, we also need
to know the associated NetworkInterface index. With this change,
the interface index is propagated from the MdnsSocketTypeClient
through to MdnsServiceInfo based on a flag (defaulting to -1 for
unspecified, if the flag is disabled).

Validated end-to-end against a commissioned Matter device,
enabling the flags, verifying the returned network index against
an adb shell 'ip link show' output.

Bug: 254155029
Test: atest FrameworksNetTests
Change-Id: I96e804b32cdeeff3ed22da35a030df4d5dbb179a
2022-10-24 06:41:50 +00:00
Paul Hu
e231650e34 [Feature sync] fix handling arbitrary bytes in TXT value
RFC 6763 defines that TXT value can accept both utf-8 string and
binary data. Current implementation will always cast the TXT
value to a utf-8 string and will cause data lose when there are
non-utf-8 chars in the TXT value. This commit fixes this by
having the browser passing the TXT values back as byte[].

Also fixed the TXT key&value parsing issues per RFC 6763
section 6.5: accept cases of no '=' and reject empty key.

Bug: 254155029
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I4b755e60ad6e59db19faa41556dd214993d73896
2022-10-24 06:03:50 +00:00
Chalard Jean
90143e475f [CC05] Replace expectCallback* with expect
See CC03 (aosp/2255619) for details

Test: CtsNetTestCases
      FrameworksNetIntegrationTests
      FrameworksNetTests
Bug: 157405399
Change-Id: I0fd99561757bd76c073a050d511c668270ccb2b7
2022-10-21 11:46:27 +09:00
Jean Chalard
d6317fbe77 Merge "[CC02] Expect losing explicitly" 2022-10-19 00:22:48 +00:00