Skip to content

Fix TypeError on null TransactionKey in multi-segment BTD download (v3.2.x regression from v3.0.1) #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noppel wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Fix TypeError on null TransactionKey in multi-segment BTD download (v3.2.x regression from v3.0.1) #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Handlers/ResponseHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function retrieveH000ReportText(DOMDocument $xml): string
public function extractInitializationSegment(Response $response, Keyring $keyring): InitializationSegment
{
$transactionKeyEncoded = $this->retrieveH00XTransactionKey($response);
$transactionKey = $this->base64Service->decode($transactionKeyEncoded);
$transactionKey = $transactionKeyEncoded !== null ? $this->base64Service->decode($transactionKeyEncoded) : '';
$orderDataEncrypted = $this->base64Service->decode($this->retrieveH00XOrderData($response));

$orderDataCompressed = $this->cryptService->decryptOrderDataCompressed(
Expand All @@ -154,7 +154,7 @@ public function extractDownloadSegment(Response $response): DownloadSegment
$transactionId = $this->retrieveH00XTransactionId($response);
$transactionPhase = $this->retrieveH00XTransactionPhase($response);
$transactionKeyEncoded = $this->retrieveH00XTransactionKey($response);
$transactionKey = $this->base64Service->decode($transactionKeyEncoded);
$transactionKey = $transactionKeyEncoded !== null ? $this->base64Service->decode($transactionKeyEncoded) : '';
$numSegments = $this->retrieveH00XNumSegments($response);
$segmentNumber = $this->retrieveH00XSegmentNumber($response);
$orderDataEncrypted = $this->retrieveH00XOrderData($response);
Expand Down
8 changes: 4 additions & 4 deletions src/Services/Processor/Base64Encoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
final class Base64Encoder implements Base64EncoderInterface
{
/** Max encoded length = 10 * 1024 * 1024 (10 MB) */
private const MAX_ENCODED_LENGTH = 10485760;
/** Max raw length = MAX_ENCODED_LENGTH * 3 / 4 (~7.5 MB) */
private const MAX_RAW_LENGTH = 7864320;
/** Max encoded length = 512 * 1024 * 1024 (512 MB) */
private const MAX_ENCODED_LENGTH = 536870912;
/** Max raw length = MAX_ENCODED_LENGTH * 3 / 4 (~384 MB) */
private const MAX_RAW_LENGTH = 402653184;

public function encode(string $data): string
{
Expand Down