Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add UserManager.getUserCount for versions with signature permissions #68

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

add UserManager.getUserCount for versions with signature permissions #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.MANAGE_USERS"/>

<application android:label="@string/app_name"
android:useEmbeddedDex="true"
Expand Down
17 changes: 15 additions & 2 deletions app/src/main/java/app/attestation/auditor/AttestationProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.util.Log;
import android.view.accessibility.AccessibilityManager;

import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager;

import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -790,7 +791,7 @@ private static VerificationResult verify(final Context context, final byte[] fin
final boolean accessibility, final boolean deviceAdmin,
final boolean deviceAdminNonSystem, final boolean adbEnabled,
final boolean addUsersWhenLocked, final boolean enrolledFingerprints,
final boolean denyNewUsb, final boolean oemUnlockAllowed, final boolean systemUser)
final boolean denyNewUsb, final boolean oemUnlockAllowed, final boolean systemUser, final byte userCount)
throws GeneralSecurityException, IOException {
final String fingerprintHex = BaseEncoding.base16().encode(fingerprint);
final byte[] currentFingerprint = getFingerprint(attestationCertificates[0]);
Expand Down Expand Up @@ -945,6 +946,9 @@ private static VerificationResult verify(final Context context, final byte[] fin
osEnforced.append(context.getString(R.string.system_user,
toYesNoString(context, systemUser)));
}
if (userCount != 0) {
osEnforced.append(context.getString(R.string.user_count) +userCount);
}

return new VerificationResult(hasPersistentKey, teeEnforced.toString(), osEnforced.toString());
}
Expand Down Expand Up @@ -1006,6 +1010,8 @@ static VerificationResult verifySerialized(final Context context, final byte[] a
final boolean oemUnlockAllowed = (osEnforcedFlags & OS_ENFORCED_FLAGS_OEM_UNLOCK_ALLOWED) != 0;
final boolean systemUser = (osEnforcedFlags & OS_ENFORCED_FLAGS_SYSTEM_USER) != 0;

final byte userCount = deserializer.get();

if (deviceAdminNonSystem && !deviceAdmin) {
throw new GeneralSecurityException("invalid device administrator state");
}
Expand All @@ -1023,7 +1029,7 @@ static VerificationResult verifySerialized(final Context context, final byte[] a
return verify(context, fingerprint, challenge, deserializer.asReadOnlyBuffer(), signature,
certificates, userProfileSecure, accessibility, deviceAdmin, deviceAdminNonSystem,
adbEnabled, addUsersWhenLocked, enrolledFingerprints, denyNewUsb, oemUnlockAllowed,
systemUser);
systemUser, userCount);
}

static class AttestationResult {
Expand Down Expand Up @@ -1261,6 +1267,13 @@ static AttestationResult generateSerialized(final Context context, final byte[]
}
serializer.putInt(osEnforcedFlags);

byte userCount = 0;
if (ContextCompat.checkSelfPermission(context, "android.permission.MANAGE_USERS")
== PackageManager.PERMISSION_GRANTED){
userCount = (byte) userManager.getUserCount();
}
serializer.put(userCount);

final ByteBuffer message = serializer.duplicate();
message.flip();

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<string name="deny_new_usb">Disallow new USB peripherals when locked: %s\n</string>
<string name="oem_unlock_allowed">OEM unlocking allowed: %s\n</string>
<string name="system_user">Main user account: %s\n</string>
<string name="user_count">User count:&#160;</string>

<string name="no">no</string>
<string name="yes">yes</string>
Expand Down