yanglc
/
OneManager-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try fix: ShareLink get cookie in php8(Set-Cookie/set-cookie)

pull/282/head
qkqpttgf 2021-03-30 16:16:07 +08:00 committed by GitHub
parent c0852bc979
commit 449ead425a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
disk/Sharelink.php
View File

@ -21,13 +21,14 @@ class Sharelink extends Onedrive {
if (!($this->access_token = getcache('access_token', $this->disktag))) { if (!($this->access_token = getcache('access_token', $this->disktag))) {
$shareurl = getConfig('shareurl', $this->disktag); $shareurl = getConfig('shareurl', $this->disktag);
if (!($this->sharecookie = getcache('sharecookie', $this->disktag))) { if (!($this->sharecookie = getcache('sharecookie', $this->disktag))) {
$this->sharecookie = curl('GET', $shareurl, false, [], 1)['returnhead']['Set-Cookie']; $res = curl('GET', $shareurl, '', [], 1);
//$tmp = curl_request($shareurl, false, [], 1); error_log1(json_encode($res, JSON_PRETTY_PRINT));
//$tmp['body'] .= json_encode($tmp['returnhead'],JSON_PRETTY_PRINT); if (isset($res['returnhead']['Set-Cookie'])) $this->sharecookie = $res['returnhead']['Set-Cookie'];
//return $tmp; if (isset($res['returnhead']['set-cookie'])) $this->sharecookie = $res['returnhead']['set-cookie'];
//$_SERVER['sharecookie'] = $tmp['returnhead']['Set-Cookie']; if ($this->sharecookie=='') {
//if ($tmp['stat']==302) $url = $tmp['returnhead']['Location']; $this->error = $res;
//return curl('GET', $url, [ 'Accept' => 'application/json;odata=verbose', 'Content-Type' => 'application/json;odata=verbose', 'Cookie' => $_SERVER['sharecookie'] ]); return false;
}
savecache('sharecookie', $this->sharecookie, $this->disktag); savecache('sharecookie', $this->sharecookie, $this->disktag);
} }
$tmp1 = splitlast($shareurl, '/')[0]; $tmp1 = splitlast($shareurl, '/')[0];
@ -44,9 +45,11 @@ class Sharelink extends Onedrive {
if (!$this->access_token) { if (!$this->access_token) {
error_log1($domain . "/personal/" . $account . "/_api/web/GetListUsingPath(DecodedUrl=@a1)/RenderListDataAsStream?@a1='" . urlencode("/personal/" . $account . "/Documents") . "'&RootFolder=" . urlencode("/personal/" . $account . "/Documents/") . "&TryNewExperienceSingle=TRUE"); error_log1($domain . "/personal/" . $account . "/_api/web/GetListUsingPath(DecodedUrl=@a1)/RenderListDataAsStream?@a1='" . urlencode("/personal/" . $account . "/Documents") . "'&RootFolder=" . urlencode("/personal/" . $account . "/Documents/") . "&TryNewExperienceSingle=TRUE");
error_log1('failed to get share access_token. response' . json_encode($ret)); error_log1('failed to get share access_token. response' . json_encode($ret));
$response['body'] = json_encode(json_decode($response['body']), JSON_PRETTY_PRINT); //$response['body'] = json_encode(json_decode($response['body']), JSON_PRETTY_PRINT);
$response['body'] .= '\nfailed to get shareurl access_token.'; $response['body'] .= '<br>' .json_decode($response['body'], true)['error']['message']['value'];
return $response; $response['body'] .= '<br>failed to get shareurl access_token.';
$this->error = $response;
return false;
//throw new Exception($response['stat'].', failed to get share access_token.'.$response['body']); //throw new Exception($response['stat'].', failed to get share access_token.'.$response['body']);
} }
//$tmp = $ret; //$tmp = $ret;
@ -56,7 +59,7 @@ class Sharelink extends Onedrive {
$tmp1 = null; $tmp1 = null;
if (getConfig('shareapiurl', $this->disktag)!=$this->api_url) $tmp1['shareapiurl'] = $this->api_url; if (getConfig('shareapiurl', $this->disktag)!=$this->api_url) $tmp1['shareapiurl'] = $this->api_url;
//if (getConfig('sharecookie', $this->disktag)!=$this->sharecookie) $tmp1['sharecookie'] = $this->sharecookie; //if (getConfig('sharecookie', $this->disktag)!=$this->sharecookie) $tmp1['sharecookie'] = $this->sharecookie;
if (!!$tmp1) setConfig($tmp1); if (!!$tmp1) setConfig($tmp1, $this->disktag);
return true; return true;
} }
return true; return true;