makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 17:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14431] Remote avatar uploading

Browse source 
replace the 3.1 way with guzzle
Adds guzzle as a dependency
Removed a test as it wont wont with guzzle (as far as I know)

PHPBB3-14431
This commit is contained in:
Scott Dutton 2016-01-25 21:45:43 +00:00 • committed by Marc Alexander
parent 013d4d4633
commit cec63974c3
2 changed files with 20 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/composer.json
View file

@ -28,6 +28,7 @@
"php": ">=5.4,<7.1", "php": ">=5.4,<7.1",
"bantu/ini-get-wrapper": "1.0.*", "bantu/ini-get-wrapper": "1.0.*",
"google/recaptcha": "~1.1", "google/recaptcha": "~1.1",
"guzzle/guzzle": "~5.3",
"lusitanian/oauth": "^0.8.1", "lusitanian/oauth": "^0.8.1",
"marc1706/fast-image-size": "1.1.*", "marc1706/fast-image-size": "1.1.*",
"patchwork/utf8": "1.1.*", "patchwork/utf8": "1.1.*",

122
phpBB/phpbb/files/types/remote.php
View file

@ -86,19 +86,6 @@ class remote extends base
$url = parse_url($upload_url); $url = parse_url($upload_url);
$default_port = 80;
$hostname = $url['host'];
if ($url['scheme'] == 'https')
{
$default_port = 443;
$hostname = 'tls://' . $url['host'];
}
$host = $url['host'];
$path = $url['path'];
$port = (!empty($url['port'])) ? (int) $url['port'] : $default_port;
$upload_ary['type'] = 'application/octet-stream'; $upload_ary['type'] = 'application/octet-stream';
$url['path'] = explode('.', $url['path']); $url['path'] = explode('.', $url['path']);
@ -110,103 +97,32 @@ class remote extends base
$remote_max_filesize = $this->get_max_file_size(); $remote_max_filesize = $this->get_max_file_size();
$errno = 0; $client = new \Guzzle\Http\Client([
$errstr = ''; 'timeout' => $this->upload->upload_timeout,
'connect_timeout' => $this->upload->upload_timeout,
]);
if (!($fsock = @fsockopen($hostname, $port, $errno, $errstr))) try {
{ $response = $client->get($upload_url)->send();
} catch (\Guzzle\Http\Exception\ClientErrorResponseException $responseException) {
return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'URL_NOT_FOUND');
} catch (\Guzzle\Http\Exception\CurlException $curlException) {
//curl exceptions are when the DNS fails etc
return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED'));
} catch (\Guzzle\Http\Exception\RequestException $requestException) {
return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'REMOTE_UPLOAD_TIMEOUT');
} catch (\Exception $e) {
return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED')); return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED'));
} }
// Make sure $path not beginning with / if ($remote_max_filesize && $response->getContentType() > $remote_max_filesize)
if (strpos($path, '/') === 0)
{ {
$path = substr($path, 1); $max_filesize = get_formatted_filesize($remote_max_filesize, false);
return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']));
} }
fputs($fsock, 'GET /' . $path . " HTTP/1.1\r\n"); $data = $response->getBody();
fputs($fsock, "HOST: " . $host . "\r\n");
fputs($fsock, "Connection: close\r\n\r\n");
// Set a proper timeout for the socket
socket_set_timeout($fsock, $this->upload->upload_timeout);
$get_info = false;
$data = '';
$length = false;
$timer_stop = time() + $this->upload->upload_timeout;
while ((!$length || $filesize < $length) && !@feof($fsock))
{
if ($get_info)
{
if ($length)
{
// Don't attempt to read past end of file if server indicated length
$block = @fread($fsock, min($length - $filesize, 1024));
}
else
{
$block = @fread($fsock, 1024);
}
$filesize += strlen($block);
if ($remote_max_filesize && $filesize > $remote_max_filesize)
{
$max_filesize = get_formatted_filesize($remote_max_filesize, false);
return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']));
}
$data .= $block;
}
else
{
$line = @fgets($fsock, 1024);
if ($line == "\r\n")
{
$get_info = true;
}
else
{
if (stripos($line, 'content-type: ') !== false)
{
$upload_ary['type'] = rtrim(str_replace('content-type: ', '', strtolower($line)));
}
else if ($this->upload->max_filesize && stripos($line, 'content-length: ') !== false)
{
$length = (int) str_replace('content-length: ', '', strtolower($line));
if ($remote_max_filesize && $length && $length > $remote_max_filesize)
{
$max_filesize = get_formatted_filesize($remote_max_filesize, false);
return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']));
}
}
else if (stripos($line, '404 not found') !== false)
{
return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'URL_NOT_FOUND');
}
}
}
$stream_meta_data = stream_get_meta_data($fsock);
// Cancel upload if we exceed timeout
if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
{
return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'REMOTE_UPLOAD_TIMEOUT');
}
}
@fclose($fsock);
if (empty($data))
{
return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'EMPTY_REMOTE_DATA');
}
$filename = tempnam(sys_get_temp_dir(), unique_id() . '-'); $filename = tempnam(sys_get_temp_dir(), unique_id() . '-');