D3Public
/
oxtotp
8
0
Fork 1
Code Pull Requests Releases Activity

The module is now compatible with all: 

- bacon/bacon-qr-code: ^1.0 || ^2.0
- oxid-esales/oxideshop-metapackage-ce: "~6.0.3 || ~6.1.0 || ~6.2.0 || ~6.3.0  || ~6.4.0  || ~6.5.0"
This commit is contained in:
Tobias Matthaiou 2022-09-12 15:16:14 +02:00
parent 219427fb75
commit 96f6de6300
4 changed files with 108 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
composer.json
View File

@ -1,51 +1,52 @@
{ {
"name": "d3/oxtotp", "name": "d3/oxtotp",
"description": "Two-factor authentication via time-based one-time password for OXID eSales shop", "description": "Two-factor authentication via time-based one-time password for OXID eSales shop",
"type": "oxideshop-module", "type": "oxideshop-module",
"keywords": [ "keywords": [
"oxid", "oxid",
"modules", "modules",
"eShop", "eShop",
"d3", "d3",
"2FA" "2FA"
], ],
"authors": [ "authors": [
{ {
"name": "D3 Data Development (Inh. Thomas Dartsch)", "name": "D3 Data Development (Inh. Thomas Dartsch)",
"email": "info@shopmodule.com", "email": "info@shopmodule.com",
"homepage": "http://www.d3data.de", "homepage": "http://www.d3data.de",
"role": "Owner" "role": "Owner"
}, },
{ {
"name": "Tobi Matthaiou", "name": "Tobi Matthaiou",
"email": "tm@loberon.com", "email": "tm@loberon.com",
"homepage": "http://www.loberon.de", "homepage": "http://www.loberon.de",
"role": "Contributor" "role": "Contributor"
} }
], ],
"support": { "support": {
"email": "support@shopmodule.com" "email": "support@shopmodule.com"
}, },
"homepage": "https://www.oxidmodule.com/", "homepage": "https://www.oxidmodule.com/",
"license": [ "license": [
"GPL-3.0-only" "GPL-3.0-only"
], ],
"extra": { "extra": {
"oxideshop": { "oxideshop": {
"source-directory": "/src", "source-directory": "/src",
"target-directory": "d3/totp" "target-directory": "d3/totp"
} }
}, },
"require": { "require": {
"php": ">=5.6", "php": ">=5.6",
"oxid-esales/oxideshop-metapackage-ce": "~6.0.3 || ~6.1.0 || ~6.2.0", "ext-xmlwriter": "*",
"spomky-labs/otphp": "^8.3", "oxid-esales/oxideshop-metapackage-ce": "~6.0.3 || ~6.1.0 || ~6.2.0 || ~6.3.0 || ~6.4.0 || ~6.5.0",
"bacon/bacon-qr-code": "^1.0 || ^2.0", "spomky-labs/otphp": "^8.3",
"zendframework/zend-math": "^3.2" "bacon/bacon-qr-code": "^1.0 || ^2.0",
}, "zendframework/zend-math": "^3.2"
"autoload": { },
"psr-4": { "autoload": {
"D3\\Totp\\": "../../../source/modules/d3/totp" "psr-4": {
} "D3\\Totp\\": "../../../source/modules/d3/totp"
} }
} }
}

47
src/Application/Factory/BaconQrCodeFactory.php Normal file
View File

@ -0,0 +1,47 @@
<?php
declare(strict_types=1);
namespace D3\Totp\Application\Factory;
use BaconQrCode\Renderer\RendererInterface;
use BaconQrCode\Renderer\Image\Svg; // v1.0.3
use BaconQrCode\Renderer\ImageRenderer; // v2.0.0
use BaconQrCode\Renderer\Image\SvgImageBackEnd; // v2.0.0
use BaconQrCode\Renderer\RendererStyle\RendererStyle; // v2.0.0
class BaconQrCodeFactory
{
/**
* @return RendererInterface
*/
public static function renderer($size)
{
if (class_exists(Svg::class)) {
return self::v100($size);
}
return self::v200($size);
}
private static function v200($size)
{
$renderer = oxNew(
ImageRenderer::class,
oxNew(RendererStyle::class, $size),
oxNew(SvgImageBackEnd::class),
);
return $renderer;
}
private static function v100($size)
{
$renderer = oxNew(Svg::class);
$renderer->setHeight($size);
$renderer->setWidth($size);
return $renderer;
}
}

7
src/Application/Model/d3totp.php
View File

@ -15,9 +15,9 @@
namespace D3\Totp\Application\Model; namespace D3\Totp\Application\Model;
use BaconQrCode\Renderer\Image\Svg;
use BaconQrCode\Renderer\RendererInterface; use BaconQrCode\Renderer\RendererInterface;
use BaconQrCode\Writer; use BaconQrCode\Writer;
use D3\Totp\Application\Factory\BaconQrCodeFactory;
use D3\Totp\Application\Model\Exceptions\d3totp_wrongOtpException; use D3\Totp\Application\Model\Exceptions\d3totp_wrongOtpException;
use Doctrine\DBAL\DBALException; use Doctrine\DBAL\DBALException;
use OTPHP\TOTP; use OTPHP\TOTP;
@ -177,10 +177,7 @@ class d3totp extends BaseModel
*/ */
public function getQrCodeElement() public function getQrCodeElement()
{ {
$renderer = oxNew(Svg::class); $renderer = BaconQrCodeFactory::renderer(200);
$renderer->setHeight(200);
$renderer->setWidth(200);
$writer = $this->d3GetWriter($renderer); $writer = $this->d3GetWriter($renderer);
return $writer->writeString($this->getTotp()->getProvisioningUri()); return $writer->writeString($this->getTotp()->getProvisioningUri());
} }

14
src/tests/unit/Application/Model/d3totpTest.php
View File

@ -17,8 +17,8 @@
namespace D3\Totp\tests\unit\Application\Model; namespace D3\Totp\tests\unit\Application\Model;
use BaconQrCode\Renderer\Image\Svg;
use BaconQrCode\Writer; use BaconQrCode\Writer;
use D3\Totp\Application\Factory\BaconQrCodeFactory;
use D3\Totp\Application\Model\d3backupcodelist; use D3\Totp\Application\Model\d3backupcodelist;
use D3\Totp\Application\Model\d3totp; use D3\Totp\Application\Model\d3totp;
use D3\Totp\Application\Model\Exceptions\d3totp_wrongOtpException; use D3\Totp\Application\Model\Exceptions\d3totp_wrongOtpException;
@ -484,7 +484,7 @@ class d3totpTest extends d3TotpUnitTestCase
'getFieldData', 'getFieldData',
)); ));
$oUserMock->method('getFieldData')->willReturn('username'); $oUserMock->method('getFieldData')->willReturn('username');
/** @var d3totp|PHPUnit_Framework_MockObject_MockObject $oModelMock */ /** @var d3totp|PHPUnit_Framework_MockObject_MockObject $oModelMock */
$oModelMock = $this->getMock(d3totp::class, array( $oModelMock = $this->getMock(d3totp::class, array(
'getUser', 'getUser',
@ -544,7 +544,7 @@ class d3totpTest extends d3TotpUnitTestCase
'getQrCodeUri' 'getQrCodeUri'
)); ));
$oTotpMock->expects($this->once())->method('getQrCodeUri')->willReturn(true); $oTotpMock->expects($this->once())->method('getQrCodeUri')->willReturn(true);
/** @var d3totp|PHPUnit_Framework_MockObject_MockObject $oModelMock */ /** @var d3totp|PHPUnit_Framework_MockObject_MockObject $oModelMock */
$oModelMock = $this->getMock(d3totp::class, array( $oModelMock = $this->getMock(d3totp::class, array(
'getTotp' 'getTotp'
@ -562,7 +562,7 @@ class d3totpTest extends d3TotpUnitTestCase
*/ */
public function getQrCodeElement() public function getQrCodeElement()
{ {
$renderer = oxNew(Svg::class); $renderer = BaconQrCodeFactory::renderer(200);
/** @var d3totp|PHPUnit_Framework_MockObject_MockObject $oTotpMock */ /** @var d3totp|PHPUnit_Framework_MockObject_MockObject $oTotpMock */
$oTotpMock = $this->getMock(d3totp::class, array( $oTotpMock = $this->getMock(d3totp::class, array(
@ -595,14 +595,14 @@ class d3totpTest extends d3TotpUnitTestCase
*/ */
public function d3GetWriterReturnsRightInstance() public function d3GetWriterReturnsRightInstance()
{ {
$renderer = oxNew(Svg::class); $renderer = BaconQrCodeFactory::renderer(200);;
$this->assertInstanceOf( $this->assertInstanceOf(
Writer::class, Writer::class,
$this->callMethod($this->_oModel, 'd3GetWriter', [$renderer]) $this->callMethod($this->_oModel, 'd3GetWriter', [$renderer])
); );
} }
/** /**
* @test * @test
* @throws ReflectionException * @throws ReflectionException
@ -878,4 +878,4 @@ class d3totpTest extends d3TotpUnitTestCase
$this->callMethod($this->_oModel, 'delete') $this->callMethod($this->_oModel, 'delete')
); );
} }
} }