From 0ba2d82dfa049ce93f38e69184326b1d5e30dd70 Mon Sep 17 00:00:00 2001 From: Pete Fotheringham Date: Tue, 30 Jan 2024 08:03:59 +0000 Subject: [PATCH 1/8] Reset 'builddate` when each device build starts Fixes #562 --- src/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/build.sh b/src/build.sh index 0915658..57a0d0d 100755 --- a/src/build.sh +++ b/src/build.sh @@ -318,7 +318,9 @@ for branch in ${BRANCH_NAME//,/ }; do for codename in ${devices//,/ }; do if [ -n "$codename" ]; then - + + builddate=$(date +%Y%m%d) + if [ "$BUILD_OVERLAY" = true ]; then lowerdir=$SRC_DIR/$branch_dir upperdir=$TMP_DIR/device From 9c4a51a8695c5431ede57ab18e25cb16bf108950 Mon Sep 17 00:00:00 2001 From: Pete Date: Wed, 14 Feb 2024 21:27:39 +0000 Subject: [PATCH 2/8] Sig spoofing patches for Android 14 / LOS 21 --- .../android_frameworks_base-Android14.patch | 124 ++++++++++++++++++ ...ackages_modules_Permission-Android14.patch | 12 ++ 2 files changed, 136 insertions(+) create mode 100644 src/signature_spoofing_patches/android_frameworks_base-Android14.patch create mode 100644 src/signature_spoofing_patches/packages_modules_Permission-Android14.patch diff --git a/src/signature_spoofing_patches/android_frameworks_base-Android14.patch b/src/signature_spoofing_patches/android_frameworks_base-Android14.patch new file mode 100644 index 0000000..9ec072c --- /dev/null +++ b/src/signature_spoofing_patches/android_frameworks_base-Android14.patch @@ -0,0 +1,124 @@ +diff --git a/core/api/current.txt b/core/api/current.txt +index 288ab479c0fb..2124d89c6e6f 100644 +--- a/core/api/current.txt ++++ b/core/api/current.txt +@@ -95,6 +95,7 @@ package android { + field public static final String EXECUTE_APP_ACTION = "android.permission.EXECUTE_APP_ACTION"; + field public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; + field public static final String FACTORY_TEST = "android.permission.FACTORY_TEST"; ++ field public static final String FAKE_PACKAGE_SIGNATURE = "android.permission.FAKE_PACKAGE_SIGNATURE"; + field public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE"; + field public static final String FOREGROUND_SERVICE_CAMERA = "android.permission.FOREGROUND_SERVICE_CAMERA"; + field public static final String FOREGROUND_SERVICE_CONNECTED_DEVICE = "android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"; +@@ -326,6 +327,7 @@ package android { + field public static final String CALL_LOG = "android.permission-group.CALL_LOG"; + field public static final String CAMERA = "android.permission-group.CAMERA"; + field public static final String CONTACTS = "android.permission-group.CONTACTS"; ++ field public static final String FAKE_PACKAGE = "android.permission-group.FAKE_PACKAGE"; + field public static final String LOCATION = "android.permission-group.LOCATION"; + field public static final String MICROPHONE = "android.permission-group.MICROPHONE"; + field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES"; +diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml +index 14cb052b121f..593999bc4ef7 100644 +--- a/core/res/AndroidManifest.xml ++++ b/core/res/AndroidManifest.xml +@@ -4258,6 +4258,22 @@ + android:description="@string/permdesc_getPackageSize" + android:protectionLevel="normal" /> + ++ ++ ++ ++ ++ ++ ++ + +diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml +index 9c018c30f9e3..661297bab701 100644 +--- a/core/res/res/values/strings.xml ++++ b/core/res/res/values/strings.xml +@@ -990,6 +990,19 @@ + Preview, %1$s + + ++ ++ ++ Spoof package signature ++ ++ Allows the app to pretend to be a different app. Malicious applications might be able to use this to access private application data. Legitimate uses include an emulator pretending to be what it emulates. Grant this permission with caution only! ++ ++ Spoof package signature ++ ++ allow to spoof package signature ++ ++ Allow ++ <b>%1$s</b> to spoof package signature? ++ + + + disable or modify status bar +diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java +index 78f1fa60b69f..1e29d3697b89 100644 +--- a/services/core/java/com/android/server/pm/ComputerEngine.java ++++ b/services/core/java/com/android/server/pm/ComputerEngine.java +@@ -1450,6 +1450,29 @@ public class ComputerEngine implements Computer { + return result; + } + ++ private boolean requestsFakeSignature(AndroidPackage p) { ++ return p.getMetaData() != null && ++ p.getMetaData().getString("fake-signature") != null; ++ } ++ ++ private PackageInfo mayFakeSignature(AndroidPackage p, PackageInfo pi, ++ Set permissions) { ++ try { ++ if (p.getMetaData() != null && ++ p.getTargetSdkVersion() > Build.VERSION_CODES.LOLLIPOP_MR1) { ++ String sig = p.getMetaData().getString("fake-signature"); ++ if (sig != null && ++ permissions.contains("android.permission.FAKE_PACKAGE_SIGNATURE")) { ++ pi.signatures = new Signature[] {new Signature(sig)}; ++ } ++ } ++ } catch (Throwable t) { ++ // We should never die because of any failures, this is system code! ++ Log.w("PackageManagerService.FAKE_PACKAGE_SIGNATURE", t); ++ } ++ return pi; ++ } ++ + public final PackageInfo generatePackageInfo(PackageStateInternal ps, + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + if (!mUserManager.exists(userId)) return null; +@@ -1483,13 +1506,15 @@ public class ComputerEngine implements Computer { + || ArrayUtils.isEmpty(p.getPermissions())) ? Collections.emptySet() + : mPermissionManager.getInstalledPermissions(ps.getPackageName()); + // Compute granted permissions only if package has requested permissions +- final Set grantedPermissions = ((flags & PackageManager.GET_PERMISSIONS) == 0 ++ final Set grantedPermissions = (((flags & PackageManager.GET_PERMISSIONS) == 0 ++ && !requestsFakeSignature(p)) + || ArrayUtils.isEmpty(p.getRequestedPermissions())) ? Collections.emptySet() + : mPermissionManager.getGrantedPermissions(ps.getPackageName(), userId); + +- PackageInfo packageInfo = PackageInfoUtils.generate(p, gids, flags, ++ PackageInfo packageInfo = mayFakeSignature(p, PackageInfoUtils.generate(p, gids, flags, + state.getFirstInstallTimeMillis(), ps.getLastUpdateTime(), installedPermissions, +- grantedPermissions, state, userId, ps); ++ grantedPermissions, state, userId, ps), ++ grantedPermissions); + + if (packageInfo == null) { + return null; diff --git a/src/signature_spoofing_patches/packages_modules_Permission-Android14.patch b/src/signature_spoofing_patches/packages_modules_Permission-Android14.patch new file mode 100644 index 0000000..9aace22 --- /dev/null +++ b/src/signature_spoofing_patches/packages_modules_Permission-Android14.patch @@ -0,0 +1,12 @@ +diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java +index d4354bd72..4b90f9327 100644 +--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java ++++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java +@@ -21,6 +21,7 @@ import static android.Manifest.permission_group.CALENDAR; + import static android.Manifest.permission_group.CALL_LOG; + import static android.Manifest.permission_group.CAMERA; + import static android.Manifest.permission_group.CONTACTS; ++import static android.Manifest.permission_group.FAKE_PACKAGE; + import static android.Manifest.permission_group.LOCATION; + import static android.Manifest.permission_group.MICROPHONE; + import static android.Manifest.permission_group.NEARBY_DEVICES; From e813c32135b3ecac29e5a337c5372644bb0b1ee3 Mon Sep 17 00:00:00 2001 From: Pete Date: Wed, 14 Feb 2024 21:51:47 +0000 Subject: [PATCH 3/8] Handle the 'lineage-21.0' BRANCH_NAME value --- src/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/build.sh b/src/build.sh index 57a0d0d..706ecc0 100755 --- a/src/build.sh +++ b/src/build.sh @@ -152,6 +152,12 @@ for branch in ${BRANCH_NAME//,/ }; do frameworks_base_patch="android_frameworks_base-Android13.patch" modules_permission_patch="packages_modules_Permission-Android13.patch" ;; + lineage-21.0*) + themuppets_branch="lineage-20.0" + android_version="14" + frameworks_base_patch="android_frameworks_base-Android14.patch" + modules_permission_patch="packages_modules_Permission-Android14.patch" + ;; *) echo ">> [$(date)] Building branch $branch is not (yet) suppported" exit 1 From a62c3e3db236ddf68e7ee4fb8b5d92bd7ea272d7 Mon Sep 17 00:00:00 2001 From: Pete Date: Thu, 15 Feb 2024 13:28:44 +0000 Subject: [PATCH 4/8] fix build signing for Android 14 --- src/init.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/init.sh b/src/init.sh index fb6e014..dae4142 100755 --- a/src/init.sh +++ b/src/init.sh @@ -59,6 +59,22 @@ if [ "$SIGN_BUILDS" = true ]; then fi done fi + + # Android 14 requires to set a BUILD file for bazel to avoid errors: + cat > $"KEYS_DIR"/BUILD << _EOB +# adding an empty BUILD file fixes the A14 build error: +# "ERROR: no such package 'keys': BUILD file not found in any of the following directories. Add a BUILD file to a directory to mark it as a package." +# adding the filegroup "android_certificate_directory" fixes the A14 build error: +# "no such target '//keys:android_certificate_directory': target 'android_certificate_directory' not declared in package 'keys'" +filegroup( +name = "android_certificate_directory", +srcs = glob([ + "*.pk8", + "*.pem", +]), +visibility = ["//visibility:public"], +) +_EOB for c in cyngn{-priv,}-app testkey; do for e in pk8 x509.pem; do From 8099ad0bc6e98c26cdf8a1cd7607c81868ce3727 Mon Sep 17 00:00:00 2001 From: Pete Date: Thu, 15 Feb 2024 17:07:59 +0000 Subject: [PATCH 5/8] Fix typos and copy / paste errors --- src/build.sh | 2 +- src/init.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build.sh b/src/build.sh index 706ecc0..42812a0 100755 --- a/src/build.sh +++ b/src/build.sh @@ -153,7 +153,7 @@ for branch in ${BRANCH_NAME//,/ }; do modules_permission_patch="packages_modules_Permission-Android13.patch" ;; lineage-21.0*) - themuppets_branch="lineage-20.0" + themuppets_branch="lineage-21.0" android_version="14" frameworks_base_patch="android_frameworks_base-Android14.patch" modules_permission_patch="packages_modules_Permission-Android14.patch" diff --git a/src/init.sh b/src/init.sh index dae4142..2ce1a0f 100755 --- a/src/init.sh +++ b/src/init.sh @@ -61,7 +61,7 @@ if [ "$SIGN_BUILDS" = true ]; then fi # Android 14 requires to set a BUILD file for bazel to avoid errors: - cat > $"KEYS_DIR"/BUILD << _EOB + cat > "$KEYS_DIR"/BUILD << _EOB # adding an empty BUILD file fixes the A14 build error: # "ERROR: no such package 'keys': BUILD file not found in any of the following directories. Add a BUILD file to a directory to mark it as a package." # adding the filegroup "android_certificate_directory" fixes the A14 build error: From 0279cba9335952e43739593aeea381e2ee8e1727 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 13:57:07 +0000 Subject: [PATCH 6/8] Bump docker/metadata-action from 5.5.0 to 5.5.1 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5.5.0 to 5.5.1. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](https://github.com/docker/metadata-action/compare/dbef88086f6cef02e264edb7dbf63250c17cef6c...8e5442c4ef9f78752691e2d8f8d19755c6f78e81) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 484a951..fa12f05 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -35,7 +35,7 @@ jobs: # https://github.com/docker/metadata-action - name: Extract Docker metadata id: meta - uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: latest=${{ github.ref == 'refs/heads/master' }} From 40718bf6a2aaea999e297a5a04311861064219a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 13:49:46 +0000 Subject: [PATCH 7/8] Bump ubuntu from `e6173d4` to `e9569c2` Bumps ubuntu from `e6173d4` to `e9569c2`. --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c912d92..59ece43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04@sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74 +FROM ubuntu:22.04@sha256:e9569c25505f33ff72e88b2990887c9dcf230f23259da296eb814fc2b41af999 LABEL maintainer="Nicola Corna " # Environment variables From b1dcd2f99318e38967ded38a8fe7efd9ed3bb7e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:23:32 +0000 Subject: [PATCH 8/8] Bump ubuntu from `e9569c2` to `f9d633f` Bumps ubuntu from `e9569c2` to `f9d633f`. --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 59ece43..a60877b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04@sha256:e9569c25505f33ff72e88b2990887c9dcf230f23259da296eb814fc2b41af999 +FROM ubuntu:22.04@sha256:f9d633ff6640178c2d0525017174a688e2c1aef28f0a0130b26bd5554491f0da LABEL maintainer="Nicola Corna " # Environment variables