mirror of
https://github.com/bitwarden/android.git
synced 2025-02-22 16:49:13 +03:00
Apply local patch
This commit is contained in:
parent
1095b391df
commit
208fca8b7d
1 changed files with 10 additions and 23 deletions
|
@ -48,8 +48,9 @@ class Fido2CredentialManagerImpl(
|
||||||
fido2CreateCredentialRequest: Fido2CreateCredentialRequest,
|
fido2CreateCredentialRequest: Fido2CreateCredentialRequest,
|
||||||
selectedCipherView: CipherView,
|
selectedCipherView: CipherView,
|
||||||
): Fido2RegisterCredentialResult {
|
): Fido2RegisterCredentialResult {
|
||||||
val requestedFromBrowser = fido2CreateCredentialRequest.callingAppInfo.isOriginPopulated()
|
val isRequestFromPrivilegedApp =
|
||||||
val clientData = if (requestedFromBrowser) {
|
fido2CreateCredentialRequest.callingAppInfo.isOriginPopulated()
|
||||||
|
val clientData = if (isRequestFromPrivilegedApp) {
|
||||||
fido2CreateCredentialRequest
|
fido2CreateCredentialRequest
|
||||||
.callingAppInfo
|
.callingAppInfo
|
||||||
.getAppSigningSignatureFingerprint()
|
.getAppSigningSignatureFingerprint()
|
||||||
|
@ -62,28 +63,12 @@ class Fido2CredentialManagerImpl(
|
||||||
.packageName,
|
.packageName,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
val requestJsonOrigin = fido2CreateCredentialRequest
|
val assetLinkUrl = fido2CreateCredentialRequest
|
||||||
.origin
|
.origin
|
||||||
?: getOriginUrlFromAttestationOptionsOrNull(fido2CreateCredentialRequest.requestJson)
|
?: getOriginUrlFromAttestationOptionsOrNull(fido2CreateCredentialRequest.requestJson)
|
||||||
?: return Fido2RegisterCredentialResult.Error
|
?: return Fido2RegisterCredentialResult.Error
|
||||||
// val relyingPartyId = json
|
|
||||||
// .decodeFromStringOrNull<PasskeyAssertionOptions>(fido2CreateCredentialRequest.requestJson)
|
|
||||||
// ?.relyingPartyId
|
|
||||||
// ?: return Fido2RegisterCredentialResult.Error
|
|
||||||
//
|
|
||||||
// val validateOriginResult = validateOrigin(
|
|
||||||
// callingAppInfo = fido2CreateCredentialRequest.callingAppInfo,
|
|
||||||
// relyingPartyId = relyingPartyId,
|
|
||||||
// )
|
|
||||||
//
|
|
||||||
// if(validateOriginResult is Fido2ValidateOriginResult.Error)
|
|
||||||
// {
|
|
||||||
// return Fido2RegisterCredentialResult.Error
|
|
||||||
// }
|
|
||||||
|
|
||||||
val origin = if (requestedFromBrowser) {
|
val origin = if (!isRequestFromPrivilegedApp) {
|
||||||
Origin.Web(requestJsonOrigin)
|
|
||||||
} else {
|
|
||||||
Origin.Android(
|
Origin.Android(
|
||||||
UnverifiedAssetLink(
|
UnverifiedAssetLink(
|
||||||
packageName = fido2CreateCredentialRequest.packageName,
|
packageName = fido2CreateCredentialRequest.packageName,
|
||||||
|
@ -91,12 +76,14 @@ class Fido2CredentialManagerImpl(
|
||||||
.callingAppInfo
|
.callingAppInfo
|
||||||
.getSignatureFingerprintAsHexString()
|
.getSignatureFingerprintAsHexString()
|
||||||
?: return Fido2RegisterCredentialResult.Error,
|
?: return Fido2RegisterCredentialResult.Error,
|
||||||
host = requestJsonOrigin,
|
host = assetLinkUrl.toHostOrPathOrNull()
|
||||||
assetLinkUrl = null // will be generated
|
?: return Fido2RegisterCredentialResult.Error,
|
||||||
|
assetLinkUrl = assetLinkUrl,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
Origin.Web(assetLinkUrl)
|
||||||
}
|
}
|
||||||
|
|
||||||
return vaultSdkSource
|
return vaultSdkSource
|
||||||
.registerFido2Credential(
|
.registerFido2Credential(
|
||||||
request = RegisterFido2CredentialRequest(
|
request = RegisterFido2CredentialRequest(
|
||||||
|
|
Loading…
Add table
Reference in a new issue