Catch all bundletool exceptions when matching device APKs

GetAppDownloadInfo and GetAppUpdateInfo pass a fully client-controlled
device spec to bundletool's ApkMatcher. Only the spec's presence is
validated (the appstore-api DeviceAttributes.spec field is required, but
its contents are not), so arbitrary device specs reach bundletool.

getMatchingApkPaths only caught IncompatibleDeviceException, but
bundletool rejects specs it cannot interpret with other sibling
BundleToolException subtypes. For example, an app whose bundle has
multi-ABI variant targeting causes MultiAbiMatcher to throw an
InvalidCommandException for an unrecognized ABI in the device spec.
Those escaped uncaught instead of being treated as an incompatible
device.

Catch the common BundleToolException base instead so any device spec
bundletool cannot match or interpret yields an empty match set.

Author: thomasbuilds

directory/src/main/kotlin/app/accrescent/server/directory/ApkMatchingUtils.kt

@@ -8,7 +8,7 @@ import app.accrescent.appstore.v1.DeviceAttributes
 import app.accrescent.bundletool.android.bundle.Commands
 import app.accrescent.bundletool.android.bundle.Devices
 import com.android.tools.build.bundletool.device.ApkMatcher
-import com.android.tools.build.bundletool.model.exceptions.IncompatibleDeviceException
+import com.android.tools.build.bundletool.model.exceptions.BundleToolException
 import java.util.Optional
 
 /**
@@ -17,7 +17,7 @@ import java.util.Optional
  * @param appMetadata the `BuildApksResult` of the app
  * @param deviceAttributes the device attributes of the device
  * @return a list of APK paths in the APK set associated with [appMetadata] and matching the given
- * device, or an empty list if none match
+ * device, or an empty list if none match or bundletool rejects [deviceAttributes]
  */
 fun getMatchingApkPaths(
     appMetadata: Commands.BuildApksResult,
@@ -31,7 +31,7 @@ fun getMatchingApkPaths(
             false,
             true,
         ).getMatchingApks(appMetadata)
-    } catch (_: IncompatibleDeviceException) {
+    } catch (_: BundleToolException) {
         emptyList()
     }.map { it.path.toString() }
 

directory/src/test/kotlin/app/accrescent/server/directory/AppServiceImplTest.kt

@@ -271,6 +271,32 @@ class AppServiceImplImplTest {
         )
     }
 
+    @Test
+    fun getAppDownloadInfoWithUnrecognizedDeviceAbiReturnsFailedPrecondition() {
+        KafkaHelper.publishApps(kafka, TestDataHelper.validMultiAbiAppPublicationRequested)
+
+        val request = getAppDownloadInfoRequest {
+            appId = "com.example.nativeapp"
+            deviceAttributes = deviceAttributesWithUnrecognizedAbi
+        }
+
+        val status = CompletableFuture<Status.Code>()
+        appService.getAppDownloadInfo(request)
+            .subscribe()
+            .with(
+                { status.complete(Status.Code.OK) },
+                {
+                    require(it is StatusRuntimeException)
+                    status.complete(it.status.code)
+                },
+            )
+
+        assertEquals(
+            Status.Code.FAILED_PRECONDITION,
+            status.get(REQUEST_TIMEOUT_SECS, TimeUnit.SECONDS),
+        )
+    }
+
     private fun getExpectedAppDownloadInfoResponse() = getAppDownloadInfoResponse {
         appDownloadInfo = appDownloadInfo {
             splitDownloadInfo.addAll(
@@ -307,6 +333,11 @@ class AppServiceImplImplTest {
             }
             .build()
 
+        private val deviceAttributesWithUnrecognizedAbi: DeviceAttributes = validDeviceAttributes
+            .toBuilder()
+            .setSpec(validDeviceAttributes.spec.toBuilder().addSupportedAbis("definitely-not-an-abi"))
+            .build()
+
         private val validGetAppListingRequest = getAppListingRequest {
             appId = "app.accrescent.client"
             preferredLanguages.add("en-US")

directory/src/test/kotlin/app/accrescent/server/directory/TestDataHelper.kt

@@ -54,6 +54,19 @@ object TestDataHelper {
         }
         .build()
 
+    val validMultiAbiApp: App = TestDataHelper::class.java
+        .classLoader
+        .getResourceAsStream("valid-app-multi-abi.txtpb")!!
+        .use {
+            val builder = App.newBuilder()
+            it.reader().use { TextFormat.merge(it, builder) }
+            builder
+        }
+        .build()
+    val validMultiAbiAppPublicationRequested: AppPublicationRequested = appPublicationRequested {
+        app = validMultiAbiApp
+    }
+
     val invalidAppEditPublicationRequested = validAppEditPublicationRequested.copy { clearEdit() }
     val invalidAppPublicationRequested = validAppPublicationRequested.copy { clearApp() }
 }

directory/src/test/resources/valid-app-multi-abi.txtpb

@@ -0,0 +1,84 @@
+# Copyright 2025 Logan Magee
+#
+# SPDX-License-Identifier: AGPL-3.0-only
+
+# proto-file: accrescent/server/events/v1/app.proto
+# proto-message: App
+
+# A minimal app whose bundle contains a standalone variant with multi-ABI variant targeting. Unlike
+# the split-only apps used elsewhere, this shape causes bundletool's MultiAbiMatcher to run, which
+# rejects an unrecognized ABI in the device spec with an InvalidCommandException rather than an
+# IncompatibleDeviceException.
+app_id: "com.example.nativeapp"
+default_listing_language: "en"
+listings {
+  language: "en"
+  name: "Native App"
+  short_description: "An app whose bundle has multi-ABI variant targeting"
+  icon {
+    object_id: "57297a7-6f2c-4a04-9656-497af21bf6b2"
+  }
+}
+package_metadata {
+  release_channel {
+    well_known: WELL_KNOWN_STABLE
+  }
+  package_metadata {
+    version_code: 1
+    version_name: "1.0.0"
+    build_apks_result {
+      bundletool {
+        version: "1.18.2"
+      }
+      variant {
+        targeting {
+          sdk_version_targeting {
+            value {
+              min {
+                value: 19
+              }
+            }
+          }
+          multi_abi_targeting {
+            value {
+              abi {
+                alias: ARM64_V8A
+              }
+            }
+          }
+        }
+        apk_set {
+          module_metadata {
+            name: "base"
+            targeting {
+            }
+            delivery_type: INSTALL_TIME
+            module_type: FEATURE_MODULE
+          }
+          apk_description {
+            targeting {
+              multi_abi_targeting {
+                value {
+                  abi {
+                    alias: ARM64_V8A
+                  }
+                }
+              }
+            }
+            path: "standalones/standalone-arm64_v8a.apk"
+            standalone_apk_metadata {
+              fused_module_name: "base"
+            }
+          }
+        }
+      }
+    }
+    apk_object_metadata {
+      key: "standalones/standalone-arm64_v8a.apk"
+      value {
+        id: "00000000-0000-0000-0000-000000000001"
+        uncompressed_size: 1000
+      }
+    }
+  }
+}