Commit graph android_packages_modules_Co.../networksecurity
Message SHA1
Add mapping to trigger NetworkSecurity unit tests on presubmit for tethering-mainline-presubmit
Test with connectivity/tethering module only, to catch integration issues with older versions of other modules.

Only the unit test are added to the test_mapping for now. The CTS tests are not compatible with older dessert releases.

Bug: 397130276
Test: n/a
Change-Id: I832bf21ebe5a0f7033e0f2a68714efa7a6e37bc8

Sandro Montanari   commited 2025-02-24 14:10:16 +00:00
f37bf52f86
Revert "Add mapping to trigger NetworkSecurity unit tests on presubmit for tethering-mainline-presubmit"
This reverts commit b54ea49050.

Reason for revert: Droidmonitor created revert due to b/397704210. Will be verifying through ABTD before submission.

Change-Id: I9ca21679c505c1db0ce40b607336dbf43abda011

Priyanka Advani (xWF)   authored and   Gerrit Code Review   commited 2025-02-19 12:28:14 -08:00
4a2854b30a
Add mapping to trigger NetworkSecurity unit tests on presubmit for tethering-mainline-presubmit
Test with connectivity/tethering module only, to catch integration issues with older versions of other modules.


Bug: 397130276
Change-Id: Idc2fec3fa7b17ae87f6dcebcf4179196abd9f971
Test: n/a

Sandro Montanari   commited 2025-02-19 03:03:14 -08:00
b54ea49050
Add catching of IllegalArgumentException, which gets thrown when there is a malformed Unicode escape character sequence
System crashes are occurring for partners (b/396308673) due to the DataStore failing to load. While we investigate the underlying cause, add IllegalArgumentExceptions to the catch clause to prevent the fatal exception from being thrown.

Change-Id: I99e72af60064e2f0a5eed69c4f82b6cc69ee5f66
Fixes: 396308673
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests

Bessie Jiang   commited 2025-02-13 09:14:29 -08:00
3f4ee6c4b5
Fix the string encoding issues with logging the signature
The signature should be logged _before_ decoded from the Base64
encoding in order to properly compare with what is published on gstatic.

Bug: 391327942
Bug: 378626065
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests
Change-Id: Ibde2d4f45b998f764e2cb8d0772a0536ff763a4a

Bessie Jiang   commited 2025-02-10 15:31:42 +00:00
20293a86ef
Add logging of the log list timestamp
This CL adds the parsed log list timestamp from the JSON log list, as
well as logging a SUCCESS event (with timestamp and signature) when the
log list has been successfully updated.

Fixes: 391327942
Fixes: 394278886
Bug: 378626065
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests

Change-Id: I8f0d96ca96cd89dce5da588cb478f9332537df48

Bessie Jiang   commited 2025-02-10 13:32:48 +00:00
ae659ace56
Modify CTLogger to take in the LogListUpdateStatus object instead of
individually passed parameters

This CL also moves the DataStore updates of the failure count into
CTLogger directly (CTDownloader will only modify the failure count on
complete success).

Note: due to limitations with Mockito (not being able to mock static
classes like the auto-generated CTStatsLog), there is no test class for
CTLoggerImpl.

Bug: 394278886
Bug: 378626065
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests
Change-Id: I4498bfe75e84c6ba1654cfa55912c46836f61e03

Bessie Jiang   commited 2025-02-05 18:47:01 +00:00
782fad0c3a
Merge "Fix bug in Killswitch implementation" into main
Sandro Montanari   authored and   Gerrit Code Review   commited 2025-02-05 05:05:08 -08:00
bc74f0050e
Add logging of the log list signature
As previously discussed, we will be logging the signature to help with
on-path attacker detection. See go/ct-android-notes for summary of the past
discussions. SignatureVerifier has been modified to return a status
object to better capture the various potential signature verification
failure statuses.

The log list timestamp will be added in a later change as
this will require modifying CompatibilityVersion's logic.

Bug: 378626065
Bug: 391327942
Bug: 394278886
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests
Change-Id: I33d08b2d8c0260237bb3c5a66770fdf409adf8b1

Bessie Jiang   commited 2025-02-04 16:52:07 +00:00
a0c6b166a1
Create an intermediate enum to represent the log list update status
All of the auto-generated enum naming in CTStatsLog is over 100+ chars
long, causing there to be numerous lint errors. This CL creates an
intermediate enum to make it easier to reference these status enums
without introducing lint warning fatigue.

Bug: 378626065
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests
Change-Id: I451a006961ee5d801b3fbf702d3f5282d0b02242

Bessie Jiang   commited 2025-02-03 19:39:14 +00:00
eb7de53d01
Fix bug in Killswitch implementation
The current implementation does not delete the CompatibilityVersion
directory if the killswitch is activated while the device is powered
off.

This CL fixes the bug and centralizes the handling of the killswitch
inside the CertificateTransparencyJob class, instead of spreading it
among multiple classes. Hopefully this change makes the killswitch
logic easier to follow and less-prone to mistakes.

Bug: 384688420
Test: adb shell device_config put network_security CertificateTransparencyLogList__service_enabled true/false
Flag: com.android.net.ct.flags.certificate_transparency_service
Change-Id: Ic1d0d78879753abc42829be18ce15f32a86532c5

Sandro Montanari   commited 2025-01-28 09:51:12 +00:00
0410737b6a
Rename the CTLogger APIs to reflect the atom name change
The atom no longer just represents log list update failures, and will
instead be representing the entire log list update result regardless of
success or failure.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests
Change-Id: Ide254542aeb9c9657e79a154e53f651478bb1a54

Bessie Jiang   commited 2025-01-24 15:40:51 +00:00
c9cefdbe1c
Remove the threshold logic for logging log list update failures
Previously, we would only log to statsd if a default threshold of 10 had
been met to avoid noise in the logs. Because we will instead be logging
every time a log list update happens (success or failure), we are
removing this threshold logic.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests
Change-Id: Id3ad2c75fcceb3c15add70d4263f6c443f145348

Bessie Jiang   commited 2025-01-24 12:18:48 +00:00
e48e790e32
Merge "Update CT log list update logging to reflect atom changes" into main
Bessie Jiang   authored and   Gerrit Code Review   commited 2025-01-23 09:37:57 -08:00
46ac499e60
Update CT log list update logging to reflect atom changes
This CL updates all usages of the atom FKA CertificateTransparencyLogListUpdateFailed, as it's now been renamed to CertificateTransparencyLogListUpdateStatusChanged to include more generic status updates beyond failures.

Change-Id: I32ac454a46d0dd2e10d1ac6388d25c8d5d199f79
Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests

Bessie Jiang   commited 2025-01-22 11:46:14 -08:00
78b7f41a63
Add NetSecConfigCertificateTransparencySctNoLogListTestCases to
networksecurity TEST_MAPPING

Now that ag/31339357 has been merged, the "no log list present" test
cases can now be added to the NetworkSecurity presubmit.

Bug: 378424118
Bug: 378423774
Test: atest --test-mapping packages/modules/Connectivity/networksecurity
Change-Id: Id72bf93657ea7257e37a52a42294bcd90b56591c

Bessie Jiang   commited 2025-01-22 19:41:18 +00:00
f449f91537
Add support for Base64 encoded signature
To simplify debugging, we are planning to publish the log list signature
as a Base64 encoded string.

It might take a while for the changes to the signature publishing pipeline
to reach prod, and we do not know exactly when that will happen. To avoid
accidental crashes, I added a fallback path to the verifier code that
reverts to use the signature as raw (not Base64 encoded) bytes. I will
remove the fallback path once the signature publishing changes are
finalized.

Bug: 374719543
Test: atest NetworkSecurityUnitTests
Change-Id: Ia785b554b840940dc81b47ac9bc2121c0b410ab0

Sandro Montanari   commited 2025-01-21 17:37:35 +00:00
ed61bfc39d
Ensure directory permissions are granted for CT root and version directories
In aosp/3434620 the logic of the DirectoryUtils#makeDir method
was changed to use dir.mkdirs() instead of dir.mkdir(). This
resulted in an issue where the permissions were not properly
set for the CT root directory.

Also, add tests to presubmit set for networksecurity.

Bug: 377276991
Test: atest --test-mapping packages/modules/Connectivity/networksecurity
Change-Id: I8a41224bf425b4ec869dc1ee087e8efda4644423

Sandro Montanari   commited 2025-01-16 10:52:52 +00:00
5cc68e42f8
Add device_config flag to change the threshold for logging log list
update failures to statsd

This will allow it easier to debug the logging logic, without needing to
hit the default threshold of 10.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests && tested flag behavior manually
Change-Id: I10c652615e78a700bb84aabaa37ddc850e031e56

Bessie Jiang   commited 2025-01-13 15:30:33 +00:00
7e4361ee09
Simplify failure logging code by removed failureLogged boolean flag
Instead of the boolean flag tracking that we are logging only once, use
an int to store the failureReason instead.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests
Change-Id: Ifcdb599f39bb8e1ce9c8b4a8d27fb4500df23256

Bessie Jiang   commited 2025-01-10 16:24:16 +00:00
5d90324b09
Move DownloadManager.COLUMN_REASON conversion to failure reason into
CTLogger

This CL adds a new API that will convert the
DownloadManager.COLUMN_REASON into the relevant proto failure reason
enum value. The reason why it is a new API rather than reusing an
existing one is because the parameter type is the same (int), so a
separate API will keep it clearer when the DownloadManager value vs. proto enum value is directly used.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests
Change-Id: I9028ba8f2cb95ccc6d21b19c58e0d15a9405c3f7

Bessie Jiang   commited 2025-01-09 15:49:17 +00:00
b6347cb862
Remove CertificateTransparencyInstaller
The task of installing a new log list is now performed by the
CompatibilityVersion class.

Also, each CompatibilityVersion provides the URLs hosting the signature
and log list files. We do not store that information in the DataStore.

Change-Id: I36b585dc6984278de1ab3e6f3dc872e22f06ebea
Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 377276991
Test: atest NetworkSecurityUnitTests

Sandro Montanari   commited 2025-01-09 10:42:17 +00:00
a5b88db27d
Add UPDATE_CONFIG permission check when start CTJob
To prevent untrusted apps from abusing the CTDownloader.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 384869526
Test: atest NetworkSecurityUnitTests
Change-Id: I7c701af673309a1fb854d690c85bfbf0b834fdc3

Sandro Montanari   commited 2025-01-07 15:35:13 +00:00
6f7013968b
Reduce the visibility of logging to statsd to package-private
This change makes CTLogger into a public interface and reduces the
visibility of the actual implementation to package-private, as it was only made
public to allow for testing via mocking.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 378626065
Test: atest NetworkSecurityUnitTests
Change-Id: Ifeab50244219396ba3d3fc7f87b8d6e31ff726c9

Bessie Jiang   commited 2025-01-07 11:31:16 +00:00
2435f1a245
Merge "Implement killswitch mechanism for Android CT" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-12-27 10:15:04 -08:00
1df64f7cf6
Implement killswitch mechanism for Android CT
Enabling the killswitch will scheduele the CT job and initialize the downloader.

Disabling the killswitch will remove the scheduled job, unregister the downloader and delete the compatibility version directory.

Also, remove the CertificateTransparencyFlagsListener as it is deprecated.

Bug: 384688420
Change-Id: I23d2201e22f305284ac47f521258f856b8a9efc2
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests

Sandro Montanari   commited 2024-12-27 08:07:10 -08:00
f24643a42a
Add logging when signature is either not found or doesn't pass
verification

Note: InvalidKeyExceptions may be thrown for other reasons (e.g.
signature algorithm not matching), hence the addition of a new Exception
to specify when the public key is missing.

Flag: com.android.net.ct.flags.certificate_transparency_service
Fixes: 384931263
Bug: 378626065
Test: atest NetworkSecurityUnitTests
Change-Id: I67341b1e2d169cf634e45ca84eb24e3a1f6d887e

Bessie Jiang   commited 2024-12-27 12:50:14 +00:00
558445cc9a
Add logging of cause of failure when the log list fails to update
Bug: 378626065
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests
Change-Id: I4c11d7b09ae0f32fccbdf4085192a0f04cd2321e

Bessie Jiang   commited 2024-12-23 17:15:00 +00:00
a1082d8444
Add new APIs to DataStore to allow for int storage
The failure count for CTLogListUpdateFailed is an integer, not a long.
We need APIs in DataStore to handle this different data type, as
otherwise it will result in an unnecessary cast from long <-> int, which
is a lossy conversion.

Bug: 384473786
Test: atest NetworkSecurityUnitTests
Change-Id: I3b31fc9faef4ac0dec77bc5adb8235a155a4a3d1

Bessie Jiang   commited 2024-12-18 20:24:05 +00:00
8d0c2c0b5f
Merge "Lazy initialize CertificateTransparencyDownloader and DataStore" into main
Sandro Montanari   authored and   Gerrit Code Review   commited 2024-12-18 06:10:50 -08:00
ff0ba88eed
Add a consecutive failure count to the CT DataStore
We plan on only logging failure metrics after 10
consecutive failures, so we need some way of storing it.

Fixes: 384473786
Test: atest NetworkSecurityUnitTests
Change-Id: Ib316309864c536893d08be2dc59b8a70965ebde6

Bessie Jiang   commited 2024-12-18 12:25:54 +00:00
6ae4c31703
Merge "Replace start job action with UPDATE_CT_LOGS system api" into main
Sandro Montanari   authored and   Gerrit Code Review   commited 2024-12-18 02:41:53 -08:00
8a6d83dfe0
Lazy initialize CertificateTransparencyDownloader and DataStore
To prevent Post Boot unlock regressions.

Flag: android.security.certificate_transparency_configuration
Bug: 383437444
Test: atest NetworkSecurityUnitTests
Change-Id: I9da001863998aba7cdf962275d8611e32e8efa84

Sandro Montanari   commited 2024-12-17 13:11:43 +00:00
ff3a006338
Replace start job action with UPDATE_CT_LOGS system api
Instead of defining our own action we can use the @SystemApi already
defined in ConfigUpdate.

Flag: android.security.Flags.certificate_transparency_configuration
Bug: 319829948
Test: atest NetworkSecurityUnitTests
Change-Id: Ibb3a534c0e0dca12a075d031983a8ee754261abd

Sandro Montanari   commited 2024-12-16 07:27:41 -08:00
e5daa72580
Revert aosp/3398620 as it causes a post boot unlock regression from loading the CT code & service.
Bug: 383437444
Change-Id: Ia87751ca2f66a0e3d750a219323fac3d4e69f2f6

Bessie Jiang   commited 2024-12-16 05:54:34 -08:00
952741b504
Gate CT via the certificateTransparencyConfiguration flag
Flag: android.security.Flags.certificateTransparencyConfiguration
Bug: 379988507
Test: atest NetworkSecurityUnitTests
Change-Id: Iffa024d427e120e10847ff03d1fd62f83c45ee3e

Sandro Montanari   commited 2024-12-12 14:48:54 +00:00
88564f625c
Change the default value of the flag to true as discussed via chat
Flag is already enabled on Trunkfood/Droidfood devices, and has soaked
for long enough to enable by default.

Bug: 379988507
Test: atest NetworkSecurityUnitTests
Change-Id: Ib0a9e3023ca46f5ce7a257af310789e1d25eb24d

Bessie Jiang   commited 2024-12-09 12:28:56 +00:00
b3492b7f76
Simplify the Android CT properties
Since we are moving away from runtime flags, the CT URLs for the log
list, signature, and public key will be hardcoded. I took the occasion
to simplify the logic for handling the Android CT properties and removed
the various "_PENDING" properties. They were making everything much
harder to follow.

Flag: com.android.net.ct.flags.certificate_transparency_job
Bug: 319829948
Test: NetworkSecurityUnitTests
Change-Id: I74bb946eccb5f376ee161ace2f151bf6ea1bdcff

Sandro Montanari   commited 2024-11-28 14:42:09 +00:00
9190aed0f8
Add SignatureVerifier class to handle public keys from different sources
The SignatureVerifier class allows setting a public key either as a
string or as a file. The former method is used when the key is read from
a flag via the CertificateTransparencyFlagsListener. The latter method
is used when the key is downloaded as a file by the daily
CertificateTransparencyJob.

This CL also adds an additional step to download a public key from a
URL via the CertificateTransparencyDownloader. Now the class goes
through the following steps:
1. Download a public key from the public key url,
2. If successful, download a log list signature from the metadata url,
3. If successful, download log list from the content url,
4. If successful, verifiy the log list using signature and public key,
5. If successufl, install the log list.

I also realized the CertificateTransparencyDownloaderTest was really
hard to understand, even for me that I wrote it xD
I attempted to clean up the test, hopefully it is a bit clearer now.
I'll probably make a second simplification pass in a follow-up CL.

Flag: com.android.net.ct.flags.certificate_transparency_job
Bug: 319829948
Test: NetworkSecurityUnitTests
Change-Id: I2be3e8b5895182d2afd8161aa44e54e1a6021685

Sandro Montanari   commited 2024-11-27 09:49:01 +00:00
3bd07a5ec6
Add daily CertificateTransparencyJob
Following a conversation with the Experiments team (b/374692404), it
appears we will not be able to use device config flags to trigger the
download of CT log lists.

This CL is the first of a series that will allow us to move away from
flags and instead rely on a daily job execution. For scheduling we rely
on the Android AlarmManager.

I previously attempted to schedule the daily job using the Android
JobScheduler. However, those attempts were unsuccessful beacause the
Tethering apex is not on the system_server classpath, so the system
would crash when attempting to load the class to execute the job.

Flag: com.android.net.ct.flags.certificate_transparency_job
Bug: 374692404
Test: NetworkSecurityUnitTests
Change-Id: I6ce44dcea464cab20d2df73b065e35c0f76dcbab

Sandro Montanari   commited 2024-11-21 14:54:50 +00:00
70c4de8edc
Make newly created CT directories executable
Directories treat the executable bit differently than files, and need it
to be set in order for the files within said directories to be
accessible. Without making the CT directories executable, the log list
file is not accessible. See
https://www.redhat.com/en/blog/linux-file-permissions-explained for more
details.

Test: atest NetworkSecurityUnitTests (also manually)
Bug: 319829948
Change-Id: I03c172e93dc3ecb50f69297ea47b2fdeb860048b

Bessie Jiang   commited 2024-11-13 16:17:26 +00:00
dfed8dc100
Log CT log list download failures
This CL adds a DownloadStatus class inside the DownloadHelper. The class
acts as a thin wrapper around the status and reason Ids returned by the
DownloadManager, with some utility methods to help with the
interpretation of the download status.

Bug: 319829948
Test: atest NetworkSecurityUnitTests
Change-Id: I111388ee37c09e30c02bb9bc9b3d65273961b91d

Sandro Montanari   commited 2024-11-12 11:13:02 +00:00
478ba513aa
Revert "Change the visibility of Config to be public, so it can be accessed from"
This reverts commit a618596be5.

Reason for revert: After discussing with tweek@, he pointed out that this may result in a slippery slope where the code may be tested in CTS instead of the device (https://screenshot.googleplex.com/BJZVK4FfXkWB2Rw).

Change-Id: Ic020cb98049c861947ac431c4b3761084e66073e

Bessie Jiang   authored and   Gerrit Code Review   commited 2024-11-05 11:42:26 +00:00
a4983fd628
Change the visibility of Config to be public, so it can be accessed from
the manual tests in the cts/ directory.

Flag: visibility change only
Test: visibility change only
Bug: 319829948
Change-Id: Ice7563e6f8742724a539e57f644b138f85eed349

Bessie Jiang   commited 2024-11-04 18:07:10 +00:00
a618596be5
Add compatibility version to log lists installed by CT
Introduce a CompatibilityVersion class to group installing operations on
log list related to the same compatibility version (e.g, v3).

Add support for multiple compatibility versions to the
CertificateTransparencyInstaller, although at the moment of writing
there exists only one compatibility version.

Test: atest NetworkSecurityUnitTests
Bug: 319829948
Change-Id: I503dd30cea93d2b1ba57e5ac91b8427394c453f8

Sandro Montanari   commited 2024-10-22 12:34:57 +00:00
a9aafb7c8c
Move public key to a DeviceConfig flag
Instead of hard-coding the public key value in code.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 319829948
Test: atest NetworkSecurityUnitTests
Change-Id: Ided9a9402241d91cae3cee25f5511c3a881e087d

Sandro Montanari   commited 2024-10-10 12:46:44 +00:00
802c8f1a4d
Add Bessie to networksecurity OWNERS
Bug: n/a
Test: n/a
Flag: EXEMPT only changing OWNERS
Change-Id: Icc2639c7afadbbb6fa77c9354b20e974816ff5e7

Sandro Montanari   commited 2024-10-08 15:56:23 +00:00
6f73361204
Migrate CT namespace to "network_security"
Instead of the current "tehtering" namespace.

Also, flags pushed via DeviceConfig come with a
"CertificateTransparencyLogList" feature prefix.

Flag: com.android.net.ct.flags.certificate_transparency_service
Bug: 319829948
Test: atest NetworkSecurityUnitTests
Change-Id: I565f888409f21e78cc28684cbf7daaae44b95d57

Sandro Montanari   commited 2024-09-16 12:12:14 +00:00
5319f5c363
Merge "Make java_sdk_library dependencies explicit" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-09-10 19:12:45 +00:00
430a8ad33c
Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module
actually depends on

Test: CI
Bug: 358613520
Change-Id: I0367068c901df98483f6cf95160d3e7801881b0a

Jihoon Kang   commited 2024-09-10 00:01:31 +00:00
8401b6a9f0