forked from lineageos4microg/docker-lineage-cicd
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/lineage-20'
- Loading branch information
Showing
8 changed files
with
169 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM ubuntu:20.04@sha256:8ae9bafbb64f63a50caab98fd3a5e37b3eb837a3e0780b78e5218e63193961f9 | ||
| FROM ubuntu:22.04@sha256:20fa2d7bb4de7723f542be5923b06c4d704370f0390e4ae9e1c833c8785644c1 | ||
| LABEL maintainer="Nicola Corna <[email protected]>" | ||
|
|
||
| # Environment variables | ||
|
|
@@ -146,8 +146,8 @@ RUN apt-get -qq update && \ | |
| cron curl flex g++-multilib gcc-multilib git gnupg gperf imagemagick \ | ||
| kmod lib32ncurses5-dev lib32readline-dev lib32z1-dev liblz4-tool \ | ||
| libncurses5 libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \ | ||
| libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush procps \ | ||
| python rsync schedtool squashfs-tools wget xdelta3 xsltproc yasm zip \ | ||
| libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush procps python3 \ | ||
| python-is-python3 rsync schedtool squashfs-tools wget xdelta3 xsltproc yasm zip \ | ||
| zlib1g-dev \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
src/signature_spoofing_patches/android_frameworks_base-Android13.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| diff --git a/core/api/current.txt b/core/api/current.txt | ||
| --- a/core/api/current.txt | ||
| +++ b/core/api/current.txt | ||
| @@ -87,6 +87,7 @@ package android { | ||
| field public static final String DUMP = "android.permission.DUMP"; | ||
| 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 GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; | ||
| field public static final String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; | ||
| @@ -222,6 +223,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 | ||
| --- a/core/res/AndroidManifest.xml | ||
| +++ b/core/res/AndroidManifest.xml | ||
| @@ -3542,6 +3542,21 @@ | ||
| android:description="@string/permdesc_getPackageSize" | ||
| android:protectionLevel="normal" /> | ||
|
|
||
| + <!-- Dummy user-facing group for faking package signature --> | ||
| + <permission-group android:name="android.permission-group.FAKE_PACKAGE" | ||
| + android:label="@string/permgrouplab_fake_package_signature" | ||
| + android:description="@string/permgroupdesc_fake_package_signature" | ||
| + android:request="@string/permgrouprequest_fake_package_signature" | ||
| + android:priority="100" /> | ||
| + | ||
| + <!-- Allows an application to change the package signature as | ||
| + seen by applications --> | ||
| + <permission android:name="android.permission.FAKE_PACKAGE_SIGNATURE" | ||
| + android:permissionGroup="android.permission-group.UNDEFINED" | ||
| + android:protectionLevel="dangerous" | ||
| + android:label="@string/permlab_fakePackageSignature" | ||
| + android:description="@string/permdesc_fakePackageSignature" /> | ||
| + | ||
| <!-- @deprecated No longer useful, see | ||
| {@link android.content.pm.PackageManager#addPackageToPreferred} | ||
| for details. --> | ||
| diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml | ||
| --- a/core/res/res/values/strings.xml | ||
| +++ b/core/res/res/values/strings.xml | ||
| @@ -974,6 +974,18 @@ | ||
|
|
||
| <!-- Permissions --> | ||
|
|
||
| + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> | ||
| + <string name="permlab_fakePackageSignature">Spoof package signature</string> | ||
| + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> | ||
| + <string name="permdesc_fakePackageSignature">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!</string> | ||
| + <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> | ||
| + <string name="permgrouplab_fake_package_signature">Spoof package signature</string> | ||
| + <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> | ||
| + <string name="permgroupdesc_fake_package_signature">allow to spoof package signature</string> | ||
| + <!-- Message shown to the user when the apps requests permission from this group. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] --> | ||
| + <string name="permgrouprequest_fake_package_signature">Allow | ||
| + <b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to spoof package signature?</string> | ||
| + | ||
| <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> | ||
| <string name="permlab_statusBar">disable or modify status bar</string> | ||
| <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> | ||
| diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java | ||
| --- a/services/core/java/com/android/server/pm/ComputerEngine.java | ||
| +++ b/services/core/java/com/android/server/pm/ComputerEngine.java | ||
| @@ -1603,6 +1603,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<String> 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; | ||
| @@ -1632,13 +1655,15 @@ public class ComputerEngine implements Computer { | ||
| final int[] gids = (flags & PackageManager.GET_GIDS) == 0 ? EMPTY_INT_ARRAY | ||
| : mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.getAppId())); | ||
| // Compute granted permissions only if package has requested permissions | ||
| - final Set<String> permissions = ((flags & PackageManager.GET_PERMISSIONS) == 0 | ||
| + final Set<String> permissions = (((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.getFirstInstallTime(), ps.getLastUpdateTime(), permissions, state, userId, | ||
| - ps); | ||
| + ps), | ||
| + permissions); | ||
|
|
||
| if (packageInfo == null) { | ||
| return null; |
21 changes: 21 additions & 0 deletions
21
src/signature_spoofing_patches/packages_modules_Permission-Android13.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java | ||
| index 48793ab51..d75a58360 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; | ||
| @@ -341,6 +342,8 @@ public final class Utils { | ||
| PLATFORM_PERMISSIONS.put(Manifest.permission.BODY_SENSORS_BACKGROUND, SENSORS); | ||
| } | ||
|
|
||
| + PLATFORM_PERMISSIONS.put(Manifest.permission.FAKE_PACKAGE_SIGNATURE, FAKE_PACKAGE); | ||
| + | ||
| PLATFORM_PERMISSION_GROUPS = new ArrayMap<>(); | ||
| int numPlatformPermissions = PLATFORM_PERMISSIONS.size(); | ||
| for (int i = 0; i < numPlatformPermissions; i++) { |