From ade9af9ecd91effec4fdbbc98e925033e8fef703 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 10 Jun 2020 16:43:23 +0200 Subject: [PATCH] Block list verification --- .../keepass/autofill/KeeAutofillService.kt | 60 ++++++++++++------- .../com/kunzisoft/keepass/model/SearchInfo.kt | 17 ++++++ .../keepass/settings/PreferencesUtil.kt | 12 ++++ ...listAppIdPreferenceDialogFragmentCompat.kt | 12 ++-- ...WebDomainPreferenceDialogFragmentCompat.kt | 15 ++--- 5 files changed, 76 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt index d42e65023..d1744c822 100644 --- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt @@ -30,6 +30,7 @@ import com.kunzisoft.keepass.activities.AutofillLauncherActivity import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.database.search.SearchHelper import com.kunzisoft.keepass.model.SearchInfo +import com.kunzisoft.keepass.settings.PreferencesUtil @RequiresApi(api = Build.VERSION_CODES.O) class KeeAutofillService : AutofillService() { @@ -45,32 +46,45 @@ class KeeAutofillService : AutofillService() { // Check user's settings for authenticating Responses and Datasets. StructureParser(latestStructure).parse()?.let { parseResult -> - val searchInfo = SearchInfo().apply { - applicationId = parseResult.applicationId - webDomain = parseResult.domain + // Build search info only if applicationId or webDomain are not blocked + var searchAllowed = true + parseResult.applicationId?.let { + if (PreferencesUtil.applicationIdBlocklist(this).contains(it)) + searchAllowed = false + } + parseResult.domain?.let { + if (PreferencesUtil.webDomainBlocklist(this).contains(it)) + searchAllowed = false } - SearchHelper.checkAutoSearchInfo(this, - Database.getInstance(), - searchInfo, - { items -> - val responseBuilder = FillResponse.Builder() - AutofillHelper.addHeader(responseBuilder, packageName, - parseResult.domain, parseResult.applicationId) - items.forEach { - responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult)) + if (searchAllowed) { + val searchInfo = SearchInfo().apply { + applicationId = parseResult.applicationId + webDomain = parseResult.domain + } + + SearchHelper.checkAutoSearchInfo(this, + Database.getInstance(), + searchInfo, + { items -> + val responseBuilder = FillResponse.Builder() + AutofillHelper.addHeader(responseBuilder, packageName, + parseResult.domain, parseResult.applicationId) + items.forEach { + responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult)) + } + callback.onSuccess(responseBuilder.build()) + }, + { + // Show UI if no search result + showUIForEntrySelection(parseResult, searchInfo, callback) + }, + { + // Show UI if database not open + showUIForEntrySelection(parseResult, searchInfo, callback) } - callback.onSuccess(responseBuilder.build()) - }, - { - // Show UI if no search result - showUIForEntrySelection(parseResult, searchInfo, callback) - }, - { - // Show UI if database not open - showUIForEntrySelection(parseResult, searchInfo, callback) - } - ) + ) + } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt b/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt index efb05b191..96ab97b4e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt +++ b/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt @@ -8,7 +8,21 @@ import com.kunzisoft.keepass.utils.ObjectNameResource class SearchInfo : ObjectNameResource, Parcelable { var applicationId: String? = null + set(value) { + field = when { + value == null -> null + Regex(APPLICATION_ID_REGEX).matches(value) -> value + else -> null + } + } var webDomain: String? = null + set(value) { + field = when { + value == null -> null + Regex(WEB_DOMAIN_REGEX).matches(value) -> value + else -> null + } + } constructor() @@ -59,6 +73,9 @@ class SearchInfo : ObjectNameResource, Parcelable { } companion object { + // https://gist.github.com/rishabhmhjn/8663966 + const val APPLICATION_ID_REGEX = "^(?:[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)(?:\\.[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)+\$" + const val WEB_DOMAIN_REGEX = "^(?!://)([a-zA-Z0-9-_]+\\.)*[a-zA-Z0-9][a-zA-Z0-9-_]+\\.[a-zA-Z]{2,11}?\$" @JvmField val CREATOR: Parcelable.Creator = object : Parcelable.Creator { diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt index a3208bc15..9b0773e77 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt @@ -366,4 +366,16 @@ object PreferencesUtil { return prefs.getBoolean(context.getString(R.string.autofill_auto_search_key), context.resources.getBoolean(R.bool.autofill_auto_search_default)) } + + fun applicationIdBlocklist(context: Context): Set { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getStringSet(context.getString(R.string.autofill_application_id_blocklist_key), null) + ?: emptySet() + } + + fun webDomainBlocklist(context: Context): Set { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getStringSet(context.getString(R.string.autofill_web_domain_blocklist_key), null) + ?: emptySet() + } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistAppIdPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistAppIdPreferenceDialogFragmentCompat.kt index d24628793..a783b91c3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistAppIdPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistAppIdPreferenceDialogFragmentCompat.kt @@ -26,17 +26,13 @@ class AutofillBlocklistAppIdPreferenceDialogFragmentCompat : AutofillBlocklistPreferenceDialogFragmentCompat() { override fun buildSearchInfoFromString(searchInfoString: String): SearchInfo? { - return if (Regex(APPLICATION_ID_REGEX).matches(searchInfoString)) { - SearchInfo().apply { this.applicationId = searchInfoString } - } else { - null - } + val newSearchInfo = searchInfoString + // remove chars not allowed in application ID + .replace(Regex("[^a-zA-Z0-9_.]+"), "") + return SearchInfo().apply { this.applicationId = newSearchInfo } } companion object { - // https://gist.github.com/rishabhmhjn/8663966 - private const val APPLICATION_ID_REGEX = "^(?:[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)(?:\\.[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)+\$" - fun newInstance(key: String): AutofillBlocklistAppIdPreferenceDialogFragmentCompat { val fragment = AutofillBlocklistAppIdPreferenceDialogFragmentCompat() val bundle = Bundle(1) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.kt index 5a0baaca2..82c7aa0c5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.kt @@ -27,18 +27,15 @@ class AutofillBlocklistWebDomainPreferenceDialogFragmentCompat : AutofillBlocklistPreferenceDialogFragmentCompat() { override fun buildSearchInfoFromString(searchInfoString: String): SearchInfo? { - // remove prefix https:// - val newSearchInfo = searchInfoString.replace(Regex("^.*?://"), "") - return if (Regex(WEB_DOMAIN_REGEX).matches(newSearchInfo)) { - SearchInfo().apply { webDomain = newSearchInfo } - } else { - null - } + val newSearchInfo = searchInfoString + // remove prefix https:// + .replace(Regex("^.*://"), "") + // Remove suffix /login... + .replace(Regex("/.*$"), "") + return SearchInfo().apply { webDomain = newSearchInfo } } companion object { - private const val WEB_DOMAIN_REGEX = "^(?!://)([a-zA-Z0-9-_]+\\.)*[a-zA-Z0-9][a-zA-Z0-9-_]+\\.[a-zA-Z]{2,11}?\$" - fun newInstance(key: String): AutofillBlocklistWebDomainPreferenceDialogFragmentCompat { val fragment = AutofillBlocklistWebDomainPreferenceDialogFragmentCompat() val bundle = Bundle(1)