feat: Trust extension by repo

Co-authored-by: AntsyLich <[email protected]>

Author: null2264

CHANGELOG.md

@@ -9,5 +9,11 @@
 -->
 Please backup your data before updating to this version.
 
+## Additions
+- Extensions now can be trusted by repo
+
+## Changes
+- Extensions now required to have `repo.json`
+
 ## Other
 - Migrate to SQLDelight

app/src/main/java/dev/yokai/core/di/AppModule.kt

@@ -8,7 +8,7 @@ import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import dev.yokai.data.AndroidDatabaseHandler
 import dev.yokai.data.DatabaseHandler
 import dev.yokai.domain.SplashState
-import dev.yokai.domain.extension.TrustExtension
+import dev.yokai.domain.extension.interactor.TrustExtension
 import dev.yokai.domain.storage.StorageManager
 import eu.kanade.tachiyomi.core.storage.AndroidStorageFolderProvider
 import eu.kanade.tachiyomi.data.cache.ChapterCache
@@ -124,8 +124,6 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { MangaShortcutManager() }
 
-        addSingletonFactory { TrustExtension() }
-
         addSingletonFactory { AndroidStorageFolderProvider(app) }
         addSingletonFactory { StorageManager(app, get()) }
 

app/src/main/java/dev/yokai/core/di/DomainModule.kt

@@ -2,6 +2,7 @@ package dev.yokai.core.di
 
 import dev.yokai.domain.extension.repo.ExtensionRepoRepository
 import dev.yokai.data.extension.repo.ExtensionRepoRepositoryImpl
+import dev.yokai.domain.extension.interactor.TrustExtension
 import dev.yokai.domain.extension.repo.interactor.CreateExtensionRepo
 import dev.yokai.domain.extension.repo.interactor.DeleteExtensionRepo
 import dev.yokai.domain.extension.repo.interactor.GetExtensionRepo
@@ -23,5 +24,7 @@ class DomainModule : InjektModule {
         addFactory { GetExtensionRepoCount(get()) }
         addFactory { ReplaceExtensionRepo(get()) }
         addFactory { UpdateExtensionRepo(get(), get()) }
+
+        addFactory { TrustExtension(get(), get()) }
     }
 }

app/src/main/java/dev/yokai/domain/extension/TrustExtension.kt

@@ -0,0 +1,32 @@
+package dev.yokai.domain.extension.interactor
+
+import android.content.pm.PackageInfo
+import androidx.core.content.pm.PackageInfoCompat
+import dev.yokai.domain.extension.repo.ExtensionRepoRepository
+import dev.yokai.domain.source.SourcePreferences
+import eu.kanade.tachiyomi.core.preference.getAndSet
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class TrustExtension(
+    private val extensionRepoRepository: ExtensionRepoRepository,
+    private val sourcePreferences: SourcePreferences,
+) {
+    suspend fun isTrusted(pkgInfo: PackageInfo, fingerprints: List<String>): Boolean {
+        val trustedFingerprints = extensionRepoRepository.getAll().map { it.signingKeyFingerprint }.toHashSet()
+        val key = "${pkgInfo.packageName}:${PackageInfoCompat.getLongVersionCode(pkgInfo)}:${fingerprints.last()}"
+        return trustedFingerprints.any { fingerprints.contains(it) } || key in sourcePreferences.trustedExtensions().get()
+    }
+
+    fun trust(pkgName: String, versionCode: Long, signatureHash: String) {
+       sourcePreferences.trustedExtensions().getAndSet { exts ->
+           val removed = exts.filterNot { it.startsWith("$pkgName:") }.toMutableSet()
+
+           removed.also { it += "$pkgName:$versionCode:$signatureHash" }
+       }
+    }
+
+    fun revokeAll() {
+        sourcePreferences.trustedExtensions().delete()
+    }
+}

app/src/main/java/dev/yokai/domain/extension/interactor/TrustExtension.kt

@@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Parcelable
 import dev.yokai.domain.base.BasePreferences
-import dev.yokai.domain.extension.TrustExtension
+import dev.yokai.domain.extension.interactor.TrustExtension
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.api.ExtensionApi
 import eu.kanade.tachiyomi.extension.model.Extension
@@ -316,7 +316,7 @@ class ExtensionManager(
      * @param versionCode the version code of the extension
      * @param signatureHash the signature hash of the extension
      */
-    fun trust(pkgName: String, versionCode: Long, signatureHash: String) {
+    suspend fun trust(pkgName: String, versionCode: Long, signatureHash: String) {
         val untrustedPkgName = untrustedExtensionsFlow.value.map { it.pkgName }.toSet()
         if (pkgName !in untrustedPkgName) return
 

app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt

@@ -10,11 +10,14 @@ import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.LoadResult
 import eu.kanade.tachiyomi.util.system.launchNow
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 
 /**
  * Broadcast receiver that listens for the system's packages installed, updated or removed, and only
@@ -25,6 +28,8 @@ import kotlinx.coroutines.async
 internal class ExtensionInstallReceiver(private val listener: Listener) :
     BroadcastReceiver() {
 
+    val scope = CoroutineScope(SupervisorJob())
+
     /**
      * Registers this broadcast receiver
      */
@@ -54,18 +59,18 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
 
         when (intent.action) {
             Intent.ACTION_PACKAGE_ADDED, ACTION_EXTENSION_ADDED -> {
-                if (!isReplacing(intent)) {
-                    launchNow {
-                        when (val result = getExtensionFromIntent(context, intent)) {
-                            is LoadResult.Success -> listener.onExtensionInstalled(result.extension)
-                            is LoadResult.Untrusted -> listener.onExtensionUntrusted(result.extension)
-                            else -> {}
-                        }
+                if (isReplacing(intent)) return
+
+                scope.launch {
+                    when (val result = getExtensionFromIntent(context, intent)) {
+                        is LoadResult.Success -> listener.onExtensionInstalled(result.extension)
+                        is LoadResult.Untrusted -> listener.onExtensionUntrusted(result.extension)
+                        else -> {}
                     }
                 }
             }
             Intent.ACTION_PACKAGE_REPLACED, ACTION_EXTENSION_REPLACED -> {
-                launchNow {
+                scope.launch {
                     when (val result = getExtensionFromIntent(context, intent)) {
                         is LoadResult.Success -> listener.onExtensionUpdated(result.extension)
                         is LoadResult.Untrusted -> listener.onExtensionUntrusted(result.extension)
@@ -74,11 +79,11 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
                 }
             }
             Intent.ACTION_PACKAGE_REMOVED, ACTION_EXTENSION_REMOVED -> {
-                if (!isReplacing(intent)) {
-                    val pkgName = getPackageNameFromIntent(intent)
-                    if (pkgName != null) {
-                        listener.onPackageUninstalled(pkgName)
-                    }
+                if (isReplacing(intent)) return
+
+                val pkgName = getPackageNameFromIntent(intent)
+                if (pkgName != null) {
+                    listener.onPackageUninstalled(pkgName)
                 }
             }
         }

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt

@@ -8,7 +8,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.content.pm.PackageInfoCompat
 import dalvik.system.PathClassLoader
-import dev.yokai.domain.extension.TrustExtension
+import dev.yokai.domain.extension.interactor.TrustExtension
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.model.Extension
@@ -174,7 +174,7 @@ internal object ExtensionLoader {
      * Attempts to load an extension from the given package name. It checks if the extension
      * contains the required feature flag before trying to load it.
      */
-    fun loadExtensionFromPkgName(context: Context, pkgName: String): LoadResult {
+    suspend fun loadExtensionFromPkgName(context: Context, pkgName: String): LoadResult {
         val extensionPackage = getExtensionInfoFromPkgName(context, pkgName)
         if (extensionPackage == null) {
             Timber.e("Extension package is not found ($pkgName)")
@@ -274,7 +274,7 @@ internal object ExtensionLoader {
      * @param context The application context.
      * @param extensionInfo The extension to load.
      */
-    private fun loadExtension(context: Context, extensionInfo: ExtensionInfo): LoadResult {
+    private suspend fun loadExtension(context: Context, extensionInfo: ExtensionInfo): LoadResult {
         val pkgManager = context.packageManager
         val pkgInfo = extensionInfo.packageInfo
         val appInfo = pkgInfo.applicationInfo
@@ -302,7 +302,7 @@ internal object ExtensionLoader {
         if (signatures.isNullOrEmpty()) {
             Timber.w("Package $pkgName isn't signed")
             return LoadResult.Error
-        } else if (!isTrusted(pkgInfo, signatures)) {
+        } else if (!trustExtension.isTrusted(pkgInfo, signatures)) {
             val extension = Extension.Untrusted(
                 extName,
                 pkgName,
@@ -429,10 +429,6 @@ internal object ExtensionLoader {
             ?.toList()
     }
 
-    private fun isTrusted(pkgInfo: PackageInfo, signatures: List<String>): Boolean {
-        return trustExtension.isTrusted(pkgInfo, signatures.last())
-    }
-
     /**
      * On Android 13+ the ApplicationInfo generated by getPackageArchiveInfo doesn't
      * have sourceDir which breaks assets loading (used for getting icon here).

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -275,6 +275,8 @@ class ExtensionBottomPresenter : BaseMigrationPresenter<ExtensionBottomSheet>()
     }
 
     fun trustExtension(pkgName: String, versionCode: Long, signatureHash: String) {
-        extensionManager.trust(pkgName, versionCode, signatureHash)
+        presenterScope.launch {
+            extensionManager.trust(pkgName, versionCode, signatureHash)
+        }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt

@@ -18,7 +18,7 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import com.hippo.unifile.UniFile
 import dev.yokai.domain.base.BasePreferences.ExtensionInstaller
-import dev.yokai.domain.extension.TrustExtension
+import dev.yokai.domain.extension.interactor.TrustExtension
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.cache.ChapterCache