bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8899 from annando/item-fields

Browse source 
Ensure to only store valid item fields
This commit is contained in:
Hypolite Petovan 2020-07-19 12:19:53 -04:00 committed by GitHub
parent 0bdd635b50 35db33bcd2
commit 68c86e423b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Model/Item.php
View file

@ -31,6 +31,7 @@ use Friendica\Core\Session;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Post\Category; use Friendica\Model\Post\Category;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
@ -118,8 +119,22 @@ class Item
const PRIVATE = 1; const PRIVATE = 1;
const UNLISTED = 2; const UNLISTED = 2;
const TABLES = ['item', 'user-item', 'item-content', 'post-delivery-data', 'diaspora-interaction'];
private static $legacy_mode = null; private static $legacy_mode = null;
private static function getItemFields()
{
$definition = DBStructure::definition('', false);
$postfields = [];
foreach (self::TABLES as $table) {
$postfields[$table] = array_keys($definition[$table]['fields']);
}
return $postfields;
}
public static function isLegacyMode() public static function isLegacyMode()
{ {
if (is_null(self::$legacy_mode)) { if (is_null(self::$legacy_mode)) {
@ -1572,6 +1587,8 @@ class Item
public static function insert($item, $notify = false, $dontcache = false) public static function insert($item, $notify = false, $dontcache = false)
{ {
$structure = self::getItemFields();
$orig_item = $item; $orig_item = $item;
$priority = PRIORITY_HIGH; $priority = PRIORITY_HIGH;
@ -1839,6 +1856,13 @@ class Item
Tag::storeFromBody($item['uri-id'], $body); Tag::storeFromBody($item['uri-id'], $body);
} }
// Remove all fields that aren't part of the item table
foreach ($item as $field => $value) {
if (!in_array($field, $structure['item'])) {
unset($item[$field]);
}
}
$ret = DBA::insert('item', $item); $ret = DBA::insert('item', $item);
// When the item was successfully stored we fetch the ID of the item. // When the item was successfully stored we fetch the ID of the item.