Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8c65c61 authored by Alan Stokes's avatar Alan Stokes
Browse files

Make AVC log parsing less strict 

Commit 5aab83aa6130760ca5c76c5b6cd429f1b29668e8 means that double
spaces are no longer removed from audit log messages. Change the
parsing code to be tolerant of 1 or more spaces in the relevant
places.

Also modify the tests to fail more quickly (otherwise they just time out, which makes the failure hard to diagnose). Make sure we have one explicit test for a log message with multiple spaces.

Bug: 276686518
Test: atest DynamicCodeLoggerIntegrationTests
Change-Id: Ia08b90785aabb4db0f005587e2315893b561573a
parent 73482477

services/core/java/com/android/server/pm/DynamicCodeLoggingService.java

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class DynamicCodeLoggingService extends JobService { 
    private static final String AVC_PREFIX = "type=" + AUDIT_AVC + " ";



    private static final Pattern EXECUTE_NATIVE_AUDIT_PATTERN =

            Pattern.compile(".*\\bavc: granted \\{ execute(?:_no_trans|) \\} .*"

            Pattern.compile(".*\\bavc: +granted +\\{ execute(?:_no_trans|) \\} .*"

                    + "\\bpath=(?:\"([^\" ]*)\"|([0-9A-F]+)) .*"

                    + "\\bscontext=u:r:untrusted_app(?:_25|_27)?:.*"

                    + "\\btcontext=u:object_r:app_data_file:.*"

tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public final class DynamicCodeLoggerIntegrationTests { 
    // avoid flakiness we run these tests multiple times, allowing progressively longer between

    // code loading and checking the logs on each try.)

    private static final int AUDIT_LOG_RETRIES = 10;

    private static final int RETRY_DELAY_MS = 2_000;

    private static final int RETRY_DELAY_MS = 500;



    private static Context sContext;

    private static int sMyUid;