eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[DEFAULTS] Fix default config loading logic

Browse Source
This commit is contained in:
Hugo Sales 2020-06-04 20:34:31 +00:00 committed by Hugo Sales
parent ce00acdb39
commit 27bb76706c
1 changed files with 251 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/Core/DefaultSettings.php
View File

@ -1,6 +1,7 @@
<?php <?php
// {{{ License // {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social // This file is part of GNU social - https://www.gnu.org/software/social
// //
// GNU social is free software: you can redistribute it and/or modify // GNU social is free software: you can redistribute it and/or modify
@ -15,8 +16,8 @@
// //
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>. // along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
// }}}
/** /**
* Write the default settings to the database * Write the default settings to the database
@ -31,18 +32,14 @@
namespace App\Core; namespace App\Core;
use App\Entity\Config;
use App\Util\Common; use App\Util\Common;
use Symfony\Component\Config\Definition\Exception\Exception;
abstract class DefaultSettings abstract class DefaultSettings
{ {
public static array $defaults; public static array $defaults;
public static function setDefaults() public static function setDefaults()
{ {
self::$defaults = self::$defaults = ['site' => ['name' => $_ENV['SOCIAL_SITENAME'] ?? 'Another social instance',
['site' =>
['name' => $_ENV['SOCIAL_SITENAME'] ?? 'Another social instance',
'server' => $_ENV['SOCIAL_DOMAIN'] ?? 'localhost', 'server' => $_ENV['SOCIAL_DOMAIN'] ?? 'localhost',
'notice' => null, // site wide notice text 'notice' => null, // site wide notice text
'theme' => 'default', 'theme' => 'default',
@ -66,12 +63,10 @@ abstract class DefaultSettings
], ],
'security' => ['hash_algos' => ['sha1', 'sha256', 'sha512']], // set to null for anything that hash_hmac() can handle (and is in hash_algos()) 'security' => ['hash_algos' => ['sha1', 'sha256', 'sha512']], // set to null for anything that hash_hmac() can handle (and is in hash_algos())
'db' => ['mirror' => null], // TODO implement 'db' => ['mirror' => null], // TODO implement
'fix' => 'fix' => ['fancy_urls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
['fancy_urls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'http' => true, // set this to true if you have upgraded your site from http=>https 'http' => true, // set this to true if you have upgraded your site from http=>https
], ],
'queue' => 'queue' => ['enabled' => true,
['enabled' => true,
'daemon' => false, // Use queuedaemon. Default to false 'daemon' => false, // Use queuedaemon. Default to false
'threads' => null, // an empty value here uses processor count to determine 'threads' => null, // an empty value here uses processor count to determine
'subsystem' => false, // default to database, or 'stomp' 'subsystem' => false, // default to database, or 'stomp'
@ -91,26 +86,22 @@ abstract class DefaultSettings
'max_retries' => 10, // drop messages after N failed attempts to process (Stomp) 'max_retries' => 10, // drop messages after N failed attempts to process (Stomp)
'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp) 'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp)
], ],
'avatar' => 'avatar' => ['server' => null,
['server' => null,
'url_base' => '/avatar/', 'url_base' => '/avatar/',
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/file/avatar/', 'dir' => INSTALLDIR . '/file/avatar/',
'max_size_px' => 300, 'max_size_px' => 300,
], ],
'javascript' => 'javascript' => ['server' => null,
['server' => null,
'url_base' => '/js/', 'url_base' => '/js/',
'ssl' => null, 'ssl' => null,
'bust_frames' => true, 'bust_frames' => true,
], ],
'attachments' => 'attachments' => ['server' => null,
['server' => null,
'url_base' => '/file/', 'url_base' => '/file/',
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/file/uploads/', 'dir' => INSTALLDIR . '/file/uploads/',
'supported' => 'supported' => ['application/vnd.oasis.opendocument.chart' => 'odc',
['application/vnd.oasis.opendocument.chart' => 'odc',
'application/vnd.oasis.opendocument.formula' => 'odf', 'application/vnd.oasis.opendocument.formula' => 'odf',
'application/vnd.oasis.opendocument.graphics' => 'odg', 'application/vnd.oasis.opendocument.graphics' => 'odg',
'application/vnd.oasis.opendocument.graphics-template' => 'otg', 'application/vnd.oasis.opendocument.graphics-template' => 'otg',
@ -156,8 +147,7 @@ abstract class DefaultSettings
'filename' => 'hash', 'filename' => 'hash',
'memory_limit' => '1024M', // PHP memory limit to use temporarily when handling images 'memory_limit' => '1024M', // PHP memory limit to use temporarily when handling images
], ],
'thumbnail' => 'thumbnail' => ['server' => null,
['server' => null,
'url_base' => '/thumb/', 'url_base' => '/thumb/',
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/file/thumbnails/', // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/') 'dir' => INSTALLDIR . '/file/thumbnails/', // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/')
@ -168,38 +158,32 @@ abstract class DefaultSettings
'upscale' => false, 'upscale' => false,
'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true="allow animated" 'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true="allow animated"
], ],
'theme' => 'theme' => ['server' => null,
['server' => null,
'url_base' => '/theme/', 'url_base' => '/theme/',
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/public/theme/' 'dir' => INSTALLDIR . '/public/theme/',
], ],
'plugins' => 'plugins' => ['server' => null,
['server' => null,
'url_base' => null, 'url_base' => null,
'ssl' => null, 'ssl' => null,
'core' => [], 'core' => [],
'default' => [], 'default' => [],
'locale_path' => null, // Set to a path to use *instead of* each plugin's own locale subdirectories 'locale_path' => null, // Set to a path to use *instead of* each plugin's own locale subdirectories
], ],
'license' => 'license' => ['type' => 'cc', // can be 'cc', 'allrightsreserved', 'private'
['type' => 'cc', // can be 'cc', 'allrightsreserved', 'private'
'owner' => null, // can be name of content owner e.g. for enterprise 'owner' => null, // can be name of content owner e.g. for enterprise
'url' => 'https://creativecommons.org/licenses/by/4.0/', 'url' => 'https://creativecommons.org/licenses/by/4.0/',
'title' => 'Creative Commons Attribution 4.0', 'title' => 'Creative Commons Attribution 4.0',
'image' => '/theme/licenses/cc_by_4.0.png', 'image' => '/theme/licenses/cc_by_4.0.png',
], ],
'mail' => 'mail' => ['backend' => 'mail',
['backend' => 'mail',
'params' => null, 'params' => null,
'domain_check' => true, 'domain_check' => true,
], ],
'nickname' => 'nickname' => ['blacklist' => ['doc', 'main', 'avatar', 'theme'],
['blacklist' => ['doc', 'main', 'avatar', 'theme'],
'featured' => [], 'featured' => [],
], ],
'profile' => 'profile' => ['banned' => [],
['banned' => [],
'bio_text_limit' => null, 'bio_text_limit' => null,
'allow_nick_change' => false, 'allow_nick_change' => false,
'allow_private_stream' => true, // whether to allow setting stream to private ("only followers can read") 'allow_private_stream' => true, // whether to allow setting stream to private ("only followers can read")
@ -209,40 +193,32 @@ abstract class DefaultSettings
'move' => false, 'move' => false,
], ],
'image' => ['jpegquality' => 85], 'image' => ['jpegquality' => 85],
'theme_upload' => 'theme_upload' => ['enabled' => true,
['enabled' => true, 'formats' => ['zip', 'tar', 'gz', 'tar.gz'], ],
'formats' => ['zip', 'tar', 'gz', 'tar.gz']],
'foaf' => ['mbox_sha1sum' => false], 'foaf' => ['mbox_sha1sum' => false],
'public' => 'public' => ['local_only' => false,
['local_only' => false,
'blacklist' => [], 'blacklist' => [],
'exclude_sources' => [], 'exclude_sources' => [],
], ],
'throttle' => 'throttle' => ['enabled' => true, // whether to throttle posting dents
['enabled' => true, // whether to throttle posting dents
'count' => 20, // number of allowed messages in timespan 'count' => 20, // number of allowed messages in timespan
'timespan' => 600, // timespan for throttling 'timespan' => 600, // timespan for throttling
], ],
'invite' => ['enabled' => true], 'invite' => ['enabled' => true],
'tag' => 'tag' => ['dropoff' => 86400 * 10, // controls weighting based on age
['dropoff' => 86400 * 10, // controls weighting based on age
'cutoff' => 86400 * 90, // only look at notices posted in last 90 days 'cutoff' => 86400 * 90, // only look at notices posted in last 90 days
], ],
'popular' => 'popular' => ['dropoff' => 86400 * 10, // controls weighting based on age
['dropoff' => 86400 * 10, // controls weighting based on age
'cutoff' => 86400 * 90, // only look at notices favorited in last 90 days 'cutoff' => 86400 * 90, // only look at notices favorited in last 90 days
], ],
'daemon' => 'daemon' => ['piddir' => sys_get_temp_dir(),
['piddir' => sys_get_temp_dir(),
'user' => false, 'user' => false,
'group' => false, 'group' => false,
], ],
'ping' => 'ping' => ['notify' => [],
['notify' => [],
'timeout' => 2, 'timeout' => 2,
], ],
'new_users' => 'new_users' => ['default_subscriptions' => null,
['default_subscriptions' => null,
'welcome_user' => null, 'welcome_user' => null,
], ],
'linkify' => // "bare" below means "without schema", like domain.com vs. https://domain.com 'linkify' => // "bare" below means "without schema", like domain.com vs. https://domain.com
@ -250,42 +226,35 @@ abstract class DefaultSettings
'linkify_ipv4' => false, // convert IPv4 addresses to hyperlinks? 'linkify_ipv4' => false, // convert IPv4 addresses to hyperlinks?
'linkify_ipv6' => false, // convert IPv6 addresses to hyperlinks? 'linkify_ipv6' => false, // convert IPv6 addresses to hyperlinks?
], ],
'group' => 'group' => ['max_aliases' => 3,
['max_aliases' => 3,
'description_limit' => null, 'description_limit' => null,
], ],
'people_tag' => 'people_tag' => ['max_tags' => 100, // maximum number of tags a user can create.
['max_tags' => 100, // maximum number of tags a user can create.
'max_people' => 500, // maximum no. of people with the same tag by the same user 'max_people' => 500, // maximum no. of people with the same tag by the same user
'allow_tagging' => ['local' => true, 'remote' => true], // equivalent to array() 'allow_tagging' => ['local' => true, 'remote' => true], // equivalent to array()
'description_limit' => null, 'description_limit' => null,
], ],
'search' => ['type' => 'like'], 'search' => ['type' => 'like'],
'html_filter' => ['tags' => ['img', 'video', 'audio', 'script']], 'html_filter' => ['tags' => ['img', 'video', 'audio', 'script']],
'notice' => 'notice' => ['content_limit' => null,
['content_limit' => null,
'allow_private' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers. 'allow_private' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers.
'hide_banned' => true, // Whether to hide silenced users from timelines 'hide_banned' => true, // Whether to hide silenced users from timelines
], ],
'message' => ['content_limit' => null], 'message' => ['content_limit' => null],
'location' => ['share' => 'user'], 'location' => ['share' => 'user'],
'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins']], 'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins']],
'single_user' => 'single_user' => ['enabled' => $_ENV['SOCIAL_SITE_PROFILE'] ?? '' == 'single_user',
['enabled' => $_ENV['SOCIAL_SITE_PROFILE'] ?? '' == 'single_user',
'nickname' => null, 'nickname' => null,
], ],
'robots_txt' => 'robots_txt' => ['crawl_delay' => 0,
['crawl_delay' => 0,
'disallow' => ['main', 'settings', 'admin', 'search', 'message'], 'disallow' => ['main', 'settings', 'admin', 'search', 'message'],
], ],
'nofollow' => 'nofollow' => ['subscribers' => true,
['subscribers' => true,
'members' => true, 'members' => true,
'peopletag' => true, 'peopletag' => true,
'external' => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes' 'external' => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes'
], ],
'url_shortener' => 'url_shortener' => ['service' => 'internal',
['service' => 'internal',
'max_url_length' => 100, 'max_url_length' => 100,
'max_notice_length' => null, 'max_notice_length' => null,
], ],
@ -308,15 +277,21 @@ abstract class DefaultSettings
public static function loadDefaults(bool $optimize = false) public static function loadDefaults(bool $optimize = false)
{ {
if (!isset($_ENV['HTTPS']) || !isset($_ENV['HTTP_HOST']) || $optimize) { if ($optimize || !isset($_ENV['HTTPS']) || !isset($_ENV['HTTP_HOST'])) {
return; return;
} }
// So, since not all DBMSs support multi row inserts, doctrine doesn't implement it. // In debug mode, delete everything and reinsert, in case
// The difference between this and the below version is that the one bellow does 221 queries in 30 to 50ms, // defaults changed
// this does 2 in 10 to 15 ms if ($_ENV['APP_DEBUG']) {
// In debug mode, delete everything and reinsert, in case defaults changed
DB::getConnection()->executeQuery('delete from config;'); DB::getConnection()->executeQuery('delete from config;');
}
// So, since not all DBMSs support multi row inserts, doctrine
// doesn't implement it. The difference between this and the
// normal version is that that one does 221 queries in 30 to
// 50ms, while this does 2 in 10 to 15 ms.
if (DB::getRepository('\App\Entity\Config')->count([]) == 0) {
$sql = 'insert into config (section, setting, value) values'; $sql = 'insert into config (section, setting, value) values';
foreach (self::$defaults as $section => $def) { foreach (self::$defaults as $section => $def) {
foreach ($def as $setting => $value) { foreach ($def as $setting => $value) {
@ -326,14 +301,6 @@ abstract class DefaultSettings
} }
$sql = preg_replace('/,$/', ';', $sql); $sql = preg_replace('/,$/', ';', $sql);
DB::getConnection()->executeQuery($sql); DB::getConnection()->executeQuery($sql);
}
// $repo = DB::getRepository('\App\Entity\Config');
// $repo->findAll();
// foreach (self::$defaults as $section => $def) {
// foreach ($def as $setting => $value) {
// DB::persist(new Config($section, $setting, serialize($value)));
// }
// }
// DB::flush();
} }
} }