rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Web Origin

Browse Source
This commit is contained in:
J-Jamet
2025-09-08 14:19:30 +02:00
parent 96ed9fc7a6
commit 55e32e4ac5
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/credentialprovider/passkey/util/PasskeyHelper.kt
View File

@@ -374,7 +374,7 @@ object PasskeyHelper {
AppOrigin(verified = false).apply {
addAndroidOrigin(androidOrigin)
},
androidOrigin.toAndroidOrigin()
androidOrigin.toOriginValue()
)
}
}

25
database/src/main/java/com/kunzisoft/keepass/model/AppOrigin.kt
View File

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.model
import android.os.Parcelable
import android.util.Log
import com.kunzisoft.encrypt.Signature.fingerprintToUrlSafeBase64
import com.kunzisoft.keepass.model.WebOrigin.Companion.RELYING_PARTY_DEFAULT_PROTOCOL
import com.kunzisoft.keepass.model.WebOrigin.Companion.WEB_ORIGIN_DEFAULT_SCHEME
import kotlinx.parcelize.Parcelize
/**
@@ -58,7 +58,7 @@ data class AppOrigin(
AndroidOrigin(
packageName = it.packageName,
fingerprint = it.fingerprint
).toAndroidOrigin()
).toOriginValue()
} ?: throw SecurityException("Wrong signature for ${toName()}")
}
@@ -85,7 +85,7 @@ data class AppOrigin(
fun fromOrigin(origin: String, androidOrigin: AndroidOrigin, verified: Boolean): AppOrigin {
val appOrigin = AppOrigin(verified)
if (origin.startsWith(RELYING_PARTY_DEFAULT_PROTOCOL)) {
if (origin.startsWith(WEB_ORIGIN_DEFAULT_SCHEME)) {
appOrigin.apply {
addWebOrigin(WebOrigin(origin))
}
@@ -121,7 +121,7 @@ data class AndroidOrigin(
* @throws IllegalArgumentException if the hex string (after removing colons) has an odd length
* or contains non-hex characters.
*/
fun toAndroidOrigin(): String {
fun toOriginValue(): String {
if (fingerprint == null) {
throw IllegalArgumentException("Fingerprint $fingerprint cannot be null")
}
@@ -138,7 +138,7 @@ data class WebOrigin(
val origin: String
) : Parcelable {
fun toWebOrigin(): String {
fun toOriginValue(): String {
return origin
}
@@ -151,9 +151,16 @@ data class WebOrigin(
}
companion object {
const val RELYING_PARTY_DEFAULT_PROTOCOL = "https"
fun fromRelyingParty(relyingParty: String): WebOrigin = WebOrigin(
origin ="$RELYING_PARTY_DEFAULT_PROTOCOL://$relyingParty"
)
const val WEB_ORIGIN_DEFAULT_SCHEME = "https"
const val WEB_ORIGIN_SCHEME_SEPARATOR = "://"
fun fromDomain(domain: String, scheme: String? = null): WebOrigin {
return if (domain.contains(WEB_ORIGIN_SCHEME_SEPARATOR)) {
WebOrigin(domain)
} else {
val webScheme = if (scheme.isNullOrEmpty()) WEB_ORIGIN_DEFAULT_SCHEME else scheme
WebOrigin("$webScheme$WEB_ORIGIN_SCHEME_SEPARATOR$domain")
}
}
}
}

11
database/src/main/java/com/kunzisoft/keepass/model/AppOriginEntryField.kt
View File

@@ -82,21 +82,16 @@ object AppOriginEntryField {
fun EntryInfo.setWebDomain(webDomain: String?, scheme: String?, customFieldsAllowed: Boolean) {
// If unable to save web domain in custom field or URL not populated, save in URL
webDomain?.let {
val webScheme = if (scheme.isNullOrEmpty()) "https" else scheme
val webDomainToStore = if (webDomain.contains("://")) {
webDomain
} else {
"$webScheme://$webDomain"
}
val webOrigin = WebOrigin.fromDomain(webDomain, scheme).toOriginValue()
if (!containsDomainOrApplicationId(webDomain)) {
if (!customFieldsAllowed || url.isEmpty()) {
url = webDomainToStore
url = webOrigin
} else {
// Save web domain in custom field
addUniqueField(
Field(
WEB_DOMAIN_FIELD_NAME,
ProtectedString(false, webDomainToStore)
ProtectedString(false, webOrigin)
),
1 // Start to one because URL is a standard field name
)