Skip to content

Also trim / cleanup PEM pubcert #46

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
dsbe-ak wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −10
Open

Also trim / cleanup PEM pubcert #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c81f540
also trim / cleanup PEM pubcert
dsbe-ak Aug 5, 2025
46e719c
__doRequest
dsbe-ak Jun 16, 2026
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
5 changes: 2 additions & 3 deletions lib/CybsClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ public function getMerchantId()
return $this->merchantId;
}

#[\ReturnTypeWillChange]
function __doRequest($request, $location, $action, $version, $oneWay = false)
function __doRequest($request, $location, $action, $version, $oneWay = false, ?string $uriParserClass = null): ?string
{
// Load request and add security headers
$requestDom = new DOMDocument('1.0', 'utf-8');
Expand Down Expand Up @@ -135,6 +134,6 @@ function __doRequest($request, $location, $action, $version, $oneWay = false)
// Convert Document to String
$request = $requestDom->saveXML();

return parent::__doRequest($request, $location, $action, $version, $oneWay);
return parent::__doRequest($request, $location, $action, $version, $oneWay, $uriParserClass);
}
}
18 changes: 11 additions & 7 deletions lib/SecurityUtility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@ public function generateSecurityToken($xmlDom, $certificateFilePath, $keyPass, &
// for PKCS12 files
openssl_pkcs12_read($certificate, $certs, $keyPass);
$privateKeyId = openssl_pkey_get_private($certs['pkey']);
$pubcert = explode("\n", $certs['cert']);
array_shift($pubcert);

while (!trim(array_pop($pubcert))) { /* Empty whlie loop */ }

array_walk($pubcert, 'trim');
$pubcert = implode('', $pubcert);
$pubcert = $certs['cert'];
unset($certs);
}
else
Expand All @@ -35,6 +29,16 @@ public function generateSecurityToken($xmlDom, $certificateFilePath, $keyPass, &
openssl_x509_export($tempcert, $pubcert);
}

// trim
$pubcert = explode("\n", $pubcert);
array_shift($pubcert);

while (!trim(array_pop($pubcert))) { /* Empty while loop */ }

array_walk($pubcert, 'trim');
$pubcert = implode('', $pubcert);


// add public key reference to the token
$tokenElement = $xmlDom->createElementNS(self::WSSE_NS, 'wsse:BinarySecurityToken', $pubcert);
$tokenElement->setAttribute('ValueType', 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3');
Expand Down