Skip to content
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

Add posibility HTTPS without apikey signature #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add posibility HTTPS without apikey signature #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67816d0
Add posibility HTTPS without apikey signature
munikes Mar 17, 2016
e8629d0
add {} in some ifs, and add rand clientid for https requests
munikes Mar 18, 2016
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
19 changes: 14 additions & 5 deletions src/Yubikey/Validate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Validate
* @param array $hosts Set of hostnames (overwrites current)
* @throws \DomainException If curl is not enabled
*/
public function __construct($apiKey, $clientId, array $hosts = array())
public function __construct($apiKey = null, $clientId = null, array $hosts = array())
{
if ($this->checkCurlSupport() === false) {
throw new \DomainException('cURL support is required and is not enabled!');
Expand Down Expand Up @@ -269,7 +269,10 @@ public function check($otp, $multi = false)

$clientId = $this->getClientId();
if ($clientId === null) {
throw new \InvalidArgumentException('Client ID cannot be null');
if (!$this->getUseSecure()){
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should have the white space before {.

throw new \InvalidArgumentException('Client ID cannot be null');
}
$clientId = rand(1,9999);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it proper to generate the random $clientId in that method?
I think it should use the original approach is appropriate 👍 .

}

$nonce = $this->generateNonce();
Expand All @@ -281,7 +284,11 @@ public function check($otp, $multi = false)
);
ksort($params);

$url = '/wsapi/2.0/verify?'.http_build_query($params).'&h='.$this->generateSignature($params);
if (!$this->getUseSecure()){
$url = '/wsapi/2.0/verify?'.http_build_query($params).'&h='.$this->generateSignature($params);
}else{
$url = '/wsapi/2.0/verify?'.http_build_query($params);
}
$hosts = ($multi === false) ? array(array_shift($this->hosts)) : $this->hosts;

return $this->request($url, $hosts, $otp, $nonce);
Expand Down Expand Up @@ -328,8 +335,10 @@ public function request($url, array $hosts, $otp, $nonce)
for ($i = 0; $i < $responseCount; $i++) {
$responses[$i]->setInputOtp($otp)->setInputNonce($nonce);

if ($this->validateResponseSignature($responses[$i]) === false) {
unset($responses[$i]);
if ($this->getApiKey() and $this->getClientId()){
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should do that as the previous commit mentioned.

if ($this->validateResponseSignature($responses[$i]) === false) {
unset($responses[$i]);
}
}
}

Expand Down