Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-02-03 20:58:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14673 from annando/issue-14275

Browse source 
Issue 14275: Avoid "Data too long" error
This commit is contained in:
Philipp 2025-01-05 22:03:55 +00:00 • committed by GitHub
commit 07c4e606e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 58 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
src/Model/Photo.php
View file

@ -101,7 +101,7 @@ class Photo
public static function getPhotosForUser(int $uid, string $resourceid, array $conditions = [], array $params = []) public static function getPhotosForUser(int $uid, string $resourceid, array $conditions = [], array $params = [])
{ {
$conditions['resource-id'] = $resourceid; $conditions['resource-id'] = $resourceid;
$conditions['uid'] = $uid; $conditions['uid'] = $uid;
return self::selectToArray([], $conditions, $params); return self::selectToArray([], $conditions, $params);
} }
@ -123,8 +123,8 @@ class Photo
public static function getPhotoForUser(int $uid, $resourceid, $scale = 0, array $conditions = [], array $params = []) public static function getPhotoForUser(int $uid, $resourceid, $scale = 0, array $conditions = [], array $params = [])
{ {
$conditions['resource-id'] = $resourceid; $conditions['resource-id'] = $resourceid;
$conditions['uid'] = $uid; $conditions['uid'] = $uid;
$conditions['scale'] = $scale; $conditions['scale'] = $scale;
return self::selectFirst([], $conditions, $params); return self::selectFirst([], $conditions, $params);
} }
@ -161,8 +161,8 @@ class Photo
} }
$conditions = ["`resource-id` = ? AND `scale` <= ? " . $sql_acl, $resourceid, $scale]; $conditions = ["`resource-id` = ? AND `scale` <= ? " . $sql_acl, $resourceid, $scale];
$params = ['order' => ['scale' => true]]; $params = ['order' => ['scale' => true]];
$photo = self::selectFirst([], $conditions, $params); $photo = self::selectFirst([], $conditions, $params);
return $photo; return $photo;
} }
@ -208,7 +208,7 @@ class Photo
if (!empty($album)) { if (!empty($album)) {
$sqlExtra = "AND `album` = ? "; $sqlExtra = "AND `album` = ? ";
$values[] = $album; $values[] = $album;
$sqlExtra2 = ""; $sqlExtra2 = "";
} else { } else {
$sqlExtra = ''; $sqlExtra = '';
@ -303,7 +303,7 @@ class Photo
private static function getFields(): array private static function getFields(): array
{ {
$allfields = DI::dbaDefinition()->getAll(); $allfields = DI::dbaDefinition()->getAll();
$fields = array_keys($allfields['photo']['fields']); $fields = array_keys($allfields['photo']['fields']);
array_splice($fields, array_search('data', $fields), 1); array_splice($fields, array_search('data', $fields), 1);
return $fields; return $fields;
} }
@ -322,10 +322,11 @@ class Photo
$fields = self::getFields(); $fields = self::getFields();
$values = array_fill(0, count($fields), ''); $values = array_fill(0, count($fields), '');
$photo = array_combine($fields, $values); $photo = array_combine($fields, $values);
$photo['data'] = $image_data;
$photo['type'] = $mimetype ?: Images::getMimeTypeByData($image_data); $photo['data'] = $image_data;
$photo['cacheable'] = false; $photo['type'] = $mimetype ?: Images::getMimeTypeByData($image_data);
$photo['cacheable'] = false;
return $photo; return $photo;
} }
@ -384,7 +385,7 @@ class Photo
$photo['backend-class'] = ExternalResource::NAME; $photo['backend-class'] = ExternalResource::NAME;
$photo['backend-ref'] = json_encode(['url' => $url, 'uid' => $uid]); $photo['backend-ref'] = json_encode(['url' => $url, 'uid' => $uid]);
$photo['type'] = $mimetype; $photo['type'] = $mimetype;
$photo['filename'] = basename(parse_url($url, PHP_URL_PATH)); $photo['filename'] = basename(parse_url($url, PHP_URL_PATH));
$photo['cacheable'] = true; $photo['cacheable'] = true;
$photo['blurhash'] = $blurhash; $photo['blurhash'] = $blurhash;
$photo['width'] = $width; $photo['width'] = $width;
@ -423,7 +424,7 @@ class Photo
} }
$existing_photo = self::selectFirst(['id', 'created', 'backend-class', 'backend-ref'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]); $existing_photo = self::selectFirst(['id', 'created', 'backend-class', 'backend-ref'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
$created = DateTimeFormat::utcNow(); $created = DateTimeFormat::utcNow();
if (DBA::isResult($existing_photo)) { if (DBA::isResult($existing_photo)) {
$created = $existing_photo['created']; $created = $existing_photo['created'];
} }
@ -449,33 +450,35 @@ class Photo
} }
$fields = [ $fields = [
'uid' => $uid, 'uid' => $uid,
'contact-id' => $cid, 'contact-id' => $cid,
'guid' => $guid, 'guid' => $guid,
'resource-id' => $rid, 'resource-id' => $rid,
'hash' => md5($img_str), 'hash' => md5($img_str),
'created' => $created, 'created' => $created,
'edited' => DateTimeFormat::utcNow(), 'edited' => DateTimeFormat::utcNow(),
'filename' => basename($filename), 'filename' => basename($filename),
'type' => $image->getType(), 'type' => $image->getType(),
'album' => $album, 'album' => $album,
'height' => $image->getHeight(), 'height' => $image->getHeight(),
'width' => $image->getWidth(), 'width' => $image->getWidth(),
'datasize' => strlen($img_str), 'datasize' => strlen($img_str),
'blurhash' => $image->getBlurHash($img_str), 'blurhash' => $image->getBlurHash($img_str),
'data' => $data, 'data' => $data,
'scale' => $scale, 'scale' => $scale,
'photo-type' => $type, 'photo-type' => $type,
'profile' => false, 'profile' => false,
'allow_cid' => $allow_cid, 'allow_cid' => $allow_cid,
'allow_gid' => $allow_gid, 'allow_gid' => $allow_gid,
'deny_cid' => $deny_cid, 'deny_cid' => $deny_cid,
'deny_gid' => $deny_gid, 'deny_gid' => $deny_gid,
'desc' => $desc, 'desc' => $desc,
'backend-class' => (string)$storage, 'backend-class' => (string)$storage,
'backend-ref' => $backend_ref 'backend-ref' => $backend_ref
]; ];
$fields = DI::dbaDefinition()->truncateFieldsForTable('photo', $fields);
if (DBA::isResult($existing_photo)) { if (DBA::isResult($existing_photo)) {
$r = DBA::update('photo', $fields, ['id' => $existing_photo['id']]); $r = DBA::update('photo', $fields, ['id' => $existing_photo['id']]);
} else { } else {
@ -594,10 +597,10 @@ class Photo
} }
Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]); Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]);
$img_str = $ret->getBodyString(); $img_str = $ret->getBodyString();
$type = $ret->getContentType(); $type = $ret->getContentType();
} else { } else {
$img_str = ''; $img_str = '';
$type = ''; $type = '';
} }
if ($quit_on_error && ($img_str == '')) { if ($quit_on_error && ($img_str == '')) {
@ -608,7 +611,7 @@ class Photo
if ($image->isValid()) { if ($image->isValid()) {
$image->scaleToSquare(300); $image->scaleToSquare(300);
$filesize = strlen($image->asString()); $filesize = strlen($image->asString());
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize && ($filesize > $maximagesize)) { if ($maximagesize && ($filesize > $maximagesize)) {
@ -657,8 +660,8 @@ class Photo
$suffix = '?ts=' . time(); $suffix = '?ts=' . time();
$image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4' . $image->getExt() . $suffix; $image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4' . $image->getExt() . $suffix;
$thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5' . $image->getExt() . $suffix; $thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5' . $image->getExt() . $suffix;
$micro = DI::baseUrl() . '/photo/' . $resource_id . '-6' . $image->getExt() . $suffix; $micro = DI::baseUrl() . '/photo/' . $resource_id . '-6' . $image->getExt() . $suffix;
} else { } else {
$photo_failure = true; $photo_failure = true;
} }
@ -668,10 +671,10 @@ class Photo
} }
if ($photo_failure) { if ($photo_failure) {
$contact = Contact::getById($cid) ?: []; $contact = Contact::getById($cid) ?: [];
$image_url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL); $image_url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
$thumb = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB); $thumb = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
$micro = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO); $micro = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
} }
$photo = DBA::selectFirst( $photo = DBA::selectFirst(
@ -740,7 +743,7 @@ class Photo
$avatar_type = (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $uid)) ? self::USER_AVATAR : self::DEFAULT; $avatar_type = (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $uid)) ? self::USER_AVATAR : self::DEFAULT;
$banner_type = (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $uid)) ? self::USER_BANNER : self::DEFAULT; $banner_type = (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $uid)) ? self::USER_BANNER : self::DEFAULT;
$key = 'photo_albums:' . $uid . ':' . DI::userSession()->getLocalUserId() . ':' . DI::userSession()->getRemoteUserId(); $key = 'photo_albums:' . $uid . ':' . DI::userSession()->getLocalUserId() . ':' . DI::userSession()->getRemoteUserId();
$albums = DI::cache()->get($key); $albums = DI::cache()->get($key);
if (is_null($albums) || $update) { if (is_null($albums) || $update) {
@ -860,7 +863,7 @@ class Photo
$srch = '<' . intval($original_contact_id) . '>'; $srch = '<' . intval($original_contact_id) . '>';
$condition = [ $condition = [
'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
'resource-id' => $image_rid, 'uid' => $uid 'resource-id' => $image_rid, 'uid' => $uid
]; ];
if (!self::exists($condition)) { if (!self::exists($condition)) {
@ -901,8 +904,8 @@ class Photo
public static function setPermissionForResource(string $image_rid, int $uid, string $str_contact_allow, string $str_circle_allow, string $str_contact_deny, string $str_circle_deny) public static function setPermissionForResource(string $image_rid, int $uid, string $str_contact_allow, string $str_circle_allow, string $str_contact_deny, string $str_circle_deny)
{ {
$fields = [ $fields = [
'allow_cid' => $str_contact_allow, 'allow_gid' => $str_circle_allow, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_circle_allow,
'deny_cid' => $str_contact_deny, 'deny_gid' => $str_circle_deny, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_circle_deny,
'accessible' => DI::pConfig()->get($uid, 'system', 'accessible-photos', false) 'accessible' => DI::pConfig()->get($uid, 'system', 'accessible-photos', false)
]; ];
@ -1010,8 +1013,8 @@ class Photo
Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]);
$image->scaleDown($pixels); $image->scaleDown($pixels);
$filesize = strlen($image->asString()); $filesize = strlen($image->asString());
$width = $image->getWidth(); $width = $image->getWidth();
$height = $image->getHeight(); $height = $image->getHeight();
} }
} }
} }
@ -1054,10 +1057,10 @@ class Photo
} }
Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]); Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]);
$img_str = $ret->getBodyString(); $img_str = $ret->getBodyString();
$type = $ret->getContentType(); $type = $ret->getContentType();
} else { } else {
$img_str = ''; $img_str = '';
$type = ''; $type = '';
} }
if (empty($img_str)) { if (empty($img_str)) {
@ -1138,7 +1141,7 @@ class Photo
Logger::info('File upload', ['src' => $src, 'filename' => $filename, 'size' => $filesize, 'type' => $filetype]); Logger::info('File upload', ['src' => $src, 'filename' => $filename, 'size' => $filesize, 'type' => $filetype]);
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$image = new Image($imagedata, $filetype, $filename); $image = new Image($imagedata, $filetype, $filename);
if (!$image->isValid()) { if (!$image->isValid()) {
Logger::notice('Image is unvalid', ['files' => $files]); Logger::notice('Image is unvalid', ['files' => $files]);
return []; return [];
@ -1203,7 +1206,7 @@ class Photo
} }
$condition = ['resource-id' => $resource_id]; $condition = ['resource-id' => $resource_id];
$photo = self::selectFirst(['id', 'datasize', 'width', 'height', 'type'], $condition, ['order' => ['width' => true]]); $photo = self::selectFirst(['id', 'datasize', 'width', 'height', 'type'], $condition, ['order' => ['width' => true]]);
if (empty($photo)) { if (empty($photo)) {
Logger::notice('Photo not found', ['condition' => $condition]); Logger::notice('Photo not found', ['condition' => $condition]);
return []; return [];