D3Public/webauthn
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

save binary credential data as compact base64 string

Browse Source
This commit is contained in:
Daniel Seifert 2022-11-02 08:23:41 +01:00
parent 521d8e9e6a
commit f62c542d10
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Application/Model/Credential/PublicKeyCredential.php
View File

@ -54,13 +54,13 @@ class PublicKeyCredential extends BaseModel
public function setCredentialId($credentialId)
{
$this->assign([
'credentialid' => bin2hex($credentialId)
'credentialid' => base64_encode($credentialId)
]);
}
public function getCredentialId()
{
return hex2bin($this->__get($this->_getFieldLongName('credentialid'))->rawValue);
return base64_decode($this->__get($this->_getFieldLongName('credentialid'))->rawValue);
}
public function setUserId($userId)
@ -78,13 +78,13 @@ class PublicKeyCredential extends BaseModel
public function setCredential($credential)
{
$this->assign([
'credential' => bin2hex(serialize($credential))
'credential' => base64_encode(serialize($credential))
]);
}
public function getCredential()
{
return unserialize(hex2bin($this->__get($this->_getFieldLongName('credential'))->rawValue));
return unserialize(base64_decode($this->__get($this->_getFieldLongName('credential'))->rawValue));
}
/**
@ -134,7 +134,7 @@ class PublicKeyCredential extends BaseModel
$qb->expr()->and(
$qb->expr()->eq(
'credentialid',
$qb->createNamedParameter(bin2hex($publicKeyCredentialId))
$qb->createNamedParameter(base64_encode($publicKeyCredentialId))
),
$qb->expr()->eq(
'oxshopid',

6
src/Application/Model/Credential/PublicKeyCredentialList.php
View File

@ -58,7 +58,7 @@ class PublicKeyCredentialList extends ListModel implements PublicKeyCredentialSo
$qb->expr()->and(
$qb->expr()->eq(
'credentialid',
$qb->createNamedParameter(bin2hex($publicKeyCredentialId))
$qb->createNamedParameter(base64_encode($publicKeyCredentialId))
),
$qb->expr()->eq(
'oxshopid',
@ -72,7 +72,7 @@ class PublicKeyCredentialList extends ListModel implements PublicKeyCredentialSo
return null;
}
$credential = unserialize(hex2bin($credential));
$credential = unserialize(base64_decode($credential));
return $credential instanceof PublicKeyCredentialSource ? $credential : null;
}
@ -106,7 +106,7 @@ class PublicKeyCredentialList extends ListModel implements PublicKeyCredentialSo
// generate decoded credentials list
return array_map(function (array $fields) {
return unserialize(hex2bin($fields['credential']));
return unserialize(base64_decode($fields['credential']));
}, $qb->execute()->fetchAllAssociative());
}

2
src/Setup/Events.php
View File

@ -45,7 +45,7 @@ class Events
`OXUSERID` char(32) NOT NULL,
`OXSHOPID` int(11) NOT NULL,
`NAME` varchar(100) NOT NULL,
`CREDENTIALID` char(200) NOT NULL,
`CREDENTIALID` char(100) NOT NULL,
`CREDENTIAL` varchar(2000) NOT NULL,
`OXTIMESTAMP` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
PRIMARY KEY (`OXID`),