meta-tech/pws-client
meta-tech/pws-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manage headerResponse

Browse Source
This commit is contained in:
a-sansara 2017-03-21 01:20:29 +01:00
parent 8cecfa057f
commit 20399c4ae7
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/MetaTech/Ws/Client.php
View File

@ -42,6 +42,9 @@ class Client
/*! @protected @var Mtc\Core\Auth\Authenticator $authenticator */ /*! @protected @var Mtc\Core\Auth\Authenticator $authenticator */
protected $authenticator; protected $authenticator;
/*! @protected @var str $responseToken */
protected $responseToken;
/*! /*!
* desc * desc
* *
@ -173,6 +176,8 @@ class Client
private function _buildHeader($sessid=null) private function _buildHeader($sessid=null)
{ {
$header = $this->authenticator->generateHeader($this->config['login'], $this->config['key'], $sessid); $header = $this->authenticator->generateHeader($this->config['login'], $this->config['key'], $sessid);
$token = $this->authenticator->getToken($this->authenticator->readHeader($header));
$this->responseToken = $this->authenticator->generateResponseHeader($token, $this->config['login']);
return $header; return $header;
} }
@ -262,14 +267,32 @@ class Client
} }
if (count($header) > 0) curl_setopt($curl, CURLOPT_HTTPHEADER, $header); if (count($header) > 0) curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
// curl_setopt($curl, CURLOPT_HEADERFUNCTION, array($this, "HandleHeaderLine")); // curl_setopt($curl, CURLOPT_HEADERFUNCTION, array($this, "HandleHeaderLine"));
$rs = curl_exec($curl); $rs = curl_exec($curl);
$exectime = number_format(((microtime(true)-$stime)),5); $exectime = number_format(((microtime(true)-$stime)),5);
$status = curl_getinfo($curl, CURLINFO_HTTP_CODE); $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
$size = curl_getinfo($curl, CURLINFO_HEADER_SIZE); $size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
$respheader = substr($rs, 0, $size); $respheader = substr($rs, 0, $size);
$body = substr($rs, $size); $authresponse = false;
$response = json_decode($body); try {
$url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); $lines = explode(PHP_EOL, $respheader);
var_dump(compact('lines'));
$arrheader = [];
foreach($lines as $line) {
$match = preg_split('/:/', $line, 1);
if (count($match)==2) {
$arrheader[$match[0]] = trim($arrheader[$match[1]]);
}
}
$h = $this->authenticator->readHeader($arrheader);
var_dump(compact('h'));
$authresponse = isset($h['Pws-Response']) && $h['Pws-Response'] == $this->responseToken;
}
catch(\Exception $e) {
}
$body = substr($rs, $size);
$response = json_decode($body);
$url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
if ($status == 0) { if ($status == 0) {
throw new \Exception(curl_error($curl)); throw new \Exception(curl_error($curl));
} }
@ -328,7 +351,7 @@ class Client
$this->formatter->writeTags($tags); $this->formatter->writeTags($tags);
break; break;
} }
return compact('date', 'uri', 'response', 'status', 'exectime'); return compact('date', 'uri', 'response', 'status', 'exectime', 'authresponse');
} }
} }