mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Log failure on parsing 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-12-17 17:28:19 +01:00
parent d4652bbe8f
commit 65e667adf2
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/dav/appinfo/v1/carddav.php
View File

@ -84,7 +84,10 @@ if ($debugging) {
$server->addPlugin(new \Sabre\DAV\Sync\Plugin()); $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin()); $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
$server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\PhotoCache(\OC::$server->getAppDataDir('dav-photocache')))); $server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\PhotoCache(
\OC::$server->getAppDataDir('dav-photocache'),
\OC::$server->getLogger()
)));
$server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger())); $server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger()));
// And off we go! // And off we go!

3
apps/dav/lib/AppInfo/Application.php
View File

@ -54,7 +54,8 @@ class Application extends App {
$container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) { $container->registerService(PhotoCache::class, function(SimpleContainer $s) use ($server) {
return new PhotoCache( return new PhotoCache(
$server->getAppDataDir('dav-photocache') $server->getAppDataDir('dav-photocache'),
$server->getLogger()
); );
}); });

1
apps/dav/lib/CardDAV/ImageExportPlugin.php
View File

@ -108,7 +108,6 @@ class ImageExportPlugin extends ServerPlugin {
$response->setBody($file->getContent()); $response->setBody($file->getContent());
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
var_dump($e);
$response->setStatus(404); $response->setStatus(404);
} }

29
apps/dav/lib/CardDAV/PhotoCache.php
View File

@ -24,27 +24,32 @@
namespace OCA\DAV\CardDAV; namespace OCA\DAV\CardDAV;
use OCP\Files\IAppData; use OCP\Files\IAppData;
use OCP\ILogger;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException; use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Files\SimpleFS\ISimpleFolder;
use Sabre\CardDAV\Card; use Sabre\CardDAV\Card;
use Sabre\VObject\Property\Binary; use Sabre\VObject\Property\Binary;
use Sabre\VObject\Property\Uri;
use Sabre\VObject\Reader; use Sabre\VObject\Reader;
class PhotoCache { class PhotoCache {
/** @var IAppData $appData */ /** @var IAppData */
protected $appData; protected $appData;
/** @var ILogger */
protected $logger;
/** /**
* PhotoCache constructor. * PhotoCache constructor.
* *
* @param IAppData $appData * @param IAppData $appData
* @param ILogger $logger
*/ */
public function __construct(IAppData $appData) { public function __construct(IAppData $appData, ILogger $logger) {
$this->appData = $appData; $this->appData = $appData;
$this->logger = $logger;
} }
/** /**
@ -135,13 +140,14 @@ class PhotoCache {
$ratio = $photo->width() / $photo->height(); $ratio = $photo->width() / $photo->height();
if ($ratio < 1) { if ($ratio < 1) {
$ratio = 1/$ratio; $ratio = 1 / $ratio;
} }
$size = (int)($size * $ratio);
$size = (int) ($size * $ratio);
if ($size !== -1) { if ($size !== -1) {
$photo->resize($size); $photo->resize($size);
} }
try { try {
$file = $folder->newFile($path); $file = $folder->newFile($path);
$file->putContent($photo->data()); $file->putContent($photo->data());
@ -153,7 +159,6 @@ class PhotoCache {
return $file; return $file;
} }
/** /**
* @param int $addressBookId * @param int $addressBookId
* @param string $cardUri * @param string $cardUri
@ -205,7 +210,7 @@ class PhotoCache {
return false; return false;
} }
if (substr_count($parsed['path'], ';') === 1) { if (substr_count($parsed['path'], ';') === 1) {
list($type,) = explode(';', $parsed['path']); list($type) = explode(';', $parsed['path']);
} }
$val = file_get_contents($val); $val = file_get_contents($val);
} else { } else {
@ -219,16 +224,18 @@ class PhotoCache {
'image/gif', 'image/gif',
]; ];
if(!in_array($type, $allowedContentTypes, true)) { if (!in_array($type, $allowedContentTypes, true)) {
$type = 'application/octet-stream'; $type = 'application/octet-stream';
} }
return [ return [
'Content-Type' => $type, 'Content-Type' => $type,
'body' => $val 'body' => $val
]; ];
} catch(\Exception $ex) { } catch (\Exception $e) {
$this->logger->logException($ex, [
'message' => 'Exception during vcard photo parsing'
]);
} }
return false; return false;
} }

5
apps/dav/lib/Server.php
View File

@ -162,7 +162,10 @@ class Server {
$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest())); $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin()); $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
$this->server->addPlugin(new VCFExportPlugin()); $this->server->addPlugin(new VCFExportPlugin());
$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache')))); $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(
\OC::$server->getAppDataDir('dav-photocache'),
\OC::$server->getLogger())
));
} }
// system tags plugins // system tags plugins