GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DATABASE][CONFIG] Loading defaults into database, doctrine static wrapper

This commit is contained in:
Hugo Sales 2020-05-14 21:55:04 +00:00 committed by Hugo Sales
parent cdb863ba17
commit b9bc88ddbf
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
5 changed files with 378 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Controller/NetworkPublic.php
View File

@ -31,6 +31,7 @@
namespace App\Controller; namespace App\Controller;
use App\Core\GSEvent as Event; use App\Core\GSEvent as Event;
use App\Util\Common;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
class NetworkPublic extends AbstractController class NetworkPublic extends AbstractController
@ -39,6 +40,8 @@ class NetworkPublic extends AbstractController
{ {
Event::handle('Test', ['foobar']); Event::handle('Test', ['foobar']);
Common::config('url', 'shortener');
return $this->render('network/public.html.twig', []); return $this->render('network/public.html.twig', []);
} }
} }

10
src/Core/DB.php
View File

@ -30,18 +30,18 @@
namespace App\Core; namespace App\Core;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface;
abstract class DB abstract class DB
{ {
private static ?EntityManager $em; private static ?EntityManagerInterface $em;
public static function setEntityManager($m): void public static function setManager($m): void
{ {
self::$em = $m; self::$em = $m;
} }
public static function __call($method, array $args = []) public static function __callStatic(string $name, array $args)
{ {
$em->{$method}(...$args); return self::$em->{$name}(...$args);
} }
} }

145
src/Core/DefaultSettings.php
View File

@ -33,16 +33,12 @@ namespace App\Core;
abstract class DefaultSettings abstract class DefaultSettings
{ {
public static array $defaults; public static array $defaults;
public function setDefaults() public static function setDefaults()
{ {
$this->defaults = self::$defaults = ['site' => ['name' => 'Just another GNU social node',
['site' =>
['name' => 'Just another GNU social node',
'nickname' => 'gnusocial', 'nickname' => 'gnusocial',
'wildcard' => null, 'wildcard' => null,
'server' => $_server,
'theme' => 'neo-gnu', 'theme' => 'neo-gnu',
'path' => $_path,
'logfile' => null, 'logfile' => null,
'logdebug' => false, 'logdebug' => false,
'logo' => null, 'logo' => null,
@ -73,8 +69,7 @@ abstract class DefaultSettings
'build' => 1, // build number, for code-dependent cache 'build' => 1, // build number, for code-dependent cache
], ],
'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' => 'db' => ['database' => null, // must be set
['database' => null, // must be set
'schema_location' => INSTALLDIR . '/classes', 'schema_location' => INSTALLDIR . '/classes',
'class_location' => INSTALLDIR . '/classes', 'class_location' => INSTALLDIR . '/classes',
'require_prefix' => 'classes/', 'require_prefix' => 'classes/',
@ -90,20 +85,17 @@ abstract class DefaultSettings
'log_queries' => false, // true to log all DB queries 'log_queries' => false, // true to log all DB queries
'log_slow_queries' => 0, // if set, log queries taking over N seconds 'log_slow_queries' => 0, // if set, log queries taking over N seconds
'mysql_foreign_keys' => false, ], // if set, enables experimental foreign key support on MySQL 'mysql_foreign_keys' => false, ], // if set, enables experimental foreign key support on MySQL
'fix' => 'fix' => ['fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
['fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'legacy_http' => false, // set this to true if you have upgraded your site from http=>https 'legacy_http' => false, // set this to true if you have upgraded your site from http=>https
], ],
'log' => [ 'log' => [
'debugtrace' => false, // index.php handleError function, whether to include exception backtrace in log 'debugtrace' => false, // index.php handleError function, whether to include exception backtrace in log
], ],
'syslog' => 'syslog' => ['appname' => 'statusnet', // for syslog
['appname' => 'statusnet', // for syslog
'priority' => 'debug', // XXX: currently ignored 'priority' => 'debug', // XXX: currently ignored
'facility' => LOG_USER, 'facility' => LOG_USER,
], ],
'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' => 'db', // default to database, or 'stomp' 'subsystem' => 'db', // default to database, or 'stomp'
@ -130,23 +122,20 @@ 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)
], ],
'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/3.0/', 'url' => 'https://creativecommons.org/licenses/by/3.0/',
'title' => 'Creative Commons Attribution 3.0', 'title' => 'Creative Commons Attribution 3.0',
'image' => $_path . '/theme/licenses/cc_by_3.0_80x15.png', ], // 'image' => $_path . '/theme/licenses/cc_by_3.0_80x15.png',
'mail' => ],
['backend' => 'mail', 'mail' => ['backend' => 'mail',
'params' => null, 'params' => null,
'domain_check' => true, 'domain_check' => true,
], ],
'nickname' => 'nickname' => ['blacklist' => [],
['blacklist' => [],
'featured' => [], 'featured' => [],
], ],
'profile' => 'profile' => ['banned' => [],
['banned' => [],
'biolimit' => null, 'biolimit' => null,
'changenick' => false, 'changenick' => false,
'allowprivate' => false, // whether to allow setting stream to private ("only followers can read") 'allowprivate' => false, // whether to allow setting stream to private ("only followers can read")
@ -156,32 +145,27 @@ abstract class DefaultSettings
'move' => true, 'move' => true,
], ],
'image' => ['jpegquality' => 85], 'image' => ['jpegquality' => 85],
'avatar' => 'avatar' => ['server' => null,
['server' => null,
'dir' => INSTALLDIR . '/file/avatar/', 'dir' => INSTALLDIR . '/file/avatar/',
'url_base' => $_path . '/avatar/', // 'url_base' => $_path . '/avatar/',
'ssl' => null, 'ssl' => null,
'maxsize' => 300, 'maxsize' => 300,
], ],
'foaf' => ['mbox_sha1sum' => false], 'foaf' => ['mbox_sha1sum' => false],
'public' => 'public' => ['localonly' => false,
['localonly' => false,
'blacklist' => [], 'blacklist' => [],
'autosource' => [], 'autosource' => [],
], ],
'theme' => 'theme' => ['server' => null,
['server' => null,
'dir' => null, 'dir' => null,
'path' => null, 'path' => null,
'ssl' => null, 'ssl' => null,
], ],
'usertheme' => 'usertheme' => ['linkcolor' => 'black',
['linkcolor' => 'black',
'backgroundcolor' => 'black', 'backgroundcolor' => 'black',
], ],
'theme_upload' => ['enabled' => extension_loaded('zip')], 'theme_upload' => ['enabled' => extension_loaded('zip')],
'javascript' => 'javascript' => ['server' => null,
['server' => null,
'path' => null, 'path' => null,
'ssl' => null, 'ssl' => null,
'bustframes' => true, 'bustframes' => true,
@ -192,45 +176,37 @@ abstract class DefaultSettings
'path' => null, 'path' => null,
'ssl' => null, 'ssl' => null,
], ],
'throttle' => 'throttle' => ['enabled' => false, // whether to throttle edits; false by default
['enabled' => false, // whether to throttle edits; false by default
'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' => 864000.0, // controls weighting based on age
['dropoff' => 864000.0, // 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' => 864000.0, // controls weighting based on age
['dropoff' => 864000.0, // 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,
], ],
'emailpost' => ['enabled' => false], 'emailpost' => ['enabled' => false],
'sms' => ['enabled' => false], 'sms' => ['enabled' => false],
'twitterimport' => ['enabled' => false], 'twitterimport' => ['enabled' => false],
'integration' => 'integration' => ['source' => 'StatusNet', // source attribute for Twitter
['source' => 'StatusNet', // source attribute for Twitter
'taguri' => null, // base for tag URIs 'taguri' => null, // base for tag URIs
], ],
'twitter' => 'twitter' => ['signin' => true,
['signin' => true,
'consumer_key' => null, 'consumer_key' => null,
'consumer_secret' => null, 'consumer_secret' => null,
], ],
'cache' => ['base' => null], 'cache' => ['base' => null],
'ping' => 'ping' => ['notify' => [],
['notify' => [],
'timeout' => 2, 'timeout' => 2,
], ],
'inboxes' => ['enabled' => true], // ignored after 0.9.x 'inboxes' => ['enabled' => true], // ignored after 0.9.x
'newuser' => 'newuser' => ['default' => null,
['default' => null,
'welcome' => null, 'welcome' => 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
@ -238,15 +214,13 @@ abstract class DefaultSettings
'bare_ipv4' => false, // convert IPv4 addresses to hyperlinks? 'bare_ipv4' => false, // convert IPv4 addresses to hyperlinks?
'bare_ipv6' => false, // convert IPv6 addresses to hyperlinks? 'bare_ipv6' => false, // convert IPv6 addresses to hyperlinks?
], ],
'attachments' => 'attachments' => ['server' => null,
['server' => null,
'dir' => INSTALLDIR . '/file/', 'dir' => INSTALLDIR . '/file/',
'path' => $_path . '/file/', // 'path' => $_path . '/file/',
'sslserver' => null, 'sslserver' => null,
'sslpath' => null, 'sslpath' => null,
'ssl' => null, 'ssl' => null,
'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',
@ -281,7 +255,7 @@ abstract class DefaultSettings
'video/quicktime' => 'mov', 'video/quicktime' => 'mov',
'video/webm' => 'webm', 'video/webm' => 'webm',
], ],
'file_quota' => common_get_preferred_php_upload_limit(), // 'file_quota' => common_get_preferred_php_upload_limit(),
'user_quota' => 50000000, 'user_quota' => 50000000,
'monthly_quota' => 15000000, 'monthly_quota' => 15000000,
'uploads' => true, 'uploads' => true,
@ -291,8 +265,7 @@ abstract class DefaultSettings
'extblacklist' => [], 'extblacklist' => [],
'memory_limit' => '1024M', // PHP's memory limit to use temporarily when handling images 'memory_limit' => '1024M', // PHP's memory limit to use temporarily when handling images
], ],
'thumbnail' => 'thumbnail' => ['dir' => null, // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/')
['dir' => null, // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/')
'path' => null, // falls back to generating a URL with File::url('thumb/$filename') (equivalent to ['attachments']['path'] . '/thumb/') 'path' => null, // falls back to generating a URL with File::url('thumb/$filename') (equivalent to ['attachments']['path'] . '/thumb/')
'server' => null, // Only used if ['thumbnail']['path'] is NOT empty, and then it falls back to ['site']['server'], schema is decided from GNUsocial::useHTTPS() 'server' => null, // Only used if ['thumbnail']['path'] is NOT empty, and then it falls back to ['site']['server'], schema is decided from GNUsocial::useHTTPS()
'crop' => false, // overridden to true if thumb height === null 'crop' => false, // overridden to true if thumb height === null
@ -303,20 +276,17 @@ abstract class DefaultSettings
'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin 'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
], ],
'application' => ['desclimit' => null], 'application' => ['desclimit' => null],
'group' => 'group' => ['maxaliases' => 3,
['maxaliases' => 3,
'desclimit' => null, 'desclimit' => null,
'addtag' => true, 'addtag' => true,
], ],
'peopletag' => 'peopletag' => ['maxtags' => 100, // maximum number of tags a user can create.
['maxtags' => 100, // maximum number of tags a user can create.
'maxpeople' => 500, // maximum no. of people with the same tag by the same user 'maxpeople' => 500, // maximum no. of people with the same tag by the same user
'allow_tagging' => ['all' => true], // equivalent to array('local' => true, 'remote' => true) 'allow_tagging' => ['all' => true], // equivalent to array('local' => true, 'remote' => true)
'desclimit' => null, 'desclimit' => null,
], ],
'search' => ['type' => 'like'], 'search' => ['type' => 'like'],
'sessions' => 'sessions' => ['handle' => false, // whether to handle sessions ourselves
['handle' => false, // whether to handle sessions ourselves
'debug' => false, // debugging output for sessions 'debug' => false, // debugging output for sessions
'gc_limit' => 1000, // max sessions to expire at a time 'gc_limit' => 1000, // max sessions to expire at a time
], ],
@ -329,20 +299,16 @@ abstract class DefaultSettings
['Cache.DefinitionImpl' => 'Serializer', ['Cache.DefinitionImpl' => 'Serializer',
'Cache.SerializerPath' => implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'gnusocial']), 'Cache.SerializerPath' => implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'gnusocial']),
], ],
'notice' => 'notice' => ['contentlimit' => null,
['contentlimit' => null,
'allowprivate' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers. 'allowprivate' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers.
'defaultscope' => null, // null means 1 if site/private, 0 otherwise 'defaultscope' => null, // null means 1 if site/private, 0 otherwise
'hidespam' => true, // Whether to hide silenced users from timelines 'hidespam' => true, // Whether to hide silenced users from timelines
], ],
'message' => ['contentlimit' => null], 'message' => ['contentlimit' => null],
'location' => 'location' => ['share' => 'user', // whether to share location; 'always', 'user', 'never'
['share' => 'user', // whether to share location; 'always', 'user', 'never'
'sharedefault' => false, ], 'sharedefault' => false, ],
'logincommand' => ['disabled' => true], 'logincommand' => ['disabled' => true],
'plugins' => 'plugins' => ['core' => ['Activity' => [],
['core' =>
['Activity' => [],
'ActivityModeration' => [], 'ActivityModeration' => [],
'ActivityVerb' => [], 'ActivityVerb' => [],
'ActivityVerbPost' => [], 'ActivityVerbPost' => [],
@ -354,8 +320,7 @@ abstract class DefaultSettings
'protocols' => ['ActivityPub' => 'Activitypub_profile', 'OStatus' => 'Ostatus_profile'], 'protocols' => ['ActivityPub' => 'Activitypub_profile', 'OStatus' => 'Ostatus_profile'],
], ],
], ],
'default' => 'default' => ['AccountManager' => [],
['AccountManager' => [],
'AntiBrute' => [], 'AntiBrute' => [],
'Blacklist' => [], 'Blacklist' => [],
'Bookmark' => [], 'Bookmark' => [],
@ -387,28 +352,22 @@ abstract class DefaultSettings
'path' => null, 'path' => null,
'sslpath' => null, 'sslpath' => null,
], ],
'admin' => 'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins',
['panels' =>
['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins',
]
], ],
'singleuser' => ],
['enabled' => false, 'singleuser' => ['enabled' => false,
'nickname' => null, 'nickname' => null,
], ],
'robotstxt' => 'robotstxt' => ['crawldelay' => 0,
['crawldelay' => 0,
'disallow' => ['main', 'settings', 'admin', 'search', 'message'], 'disallow' => ['main', 'settings', 'admin', 'search', 'message'],
], ],
'api' => ['realm' => null], 'api' => ['realm' => null],
'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' => 'url' => ['shortener' => 'internal',
['shortener' => 'internal',
'maxurllength' => 100, 'maxurllength' => 100,
'maxnoticelength' => -1, 'maxnoticelength' => -1,
], ],
@ -428,5 +387,21 @@ abstract class DefaultSettings
'discovery' => ['cors' => false], // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) 'discovery' => ['cors' => false], // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
'performance' => ['high' => false], // disable some features for higher performance; default false 'performance' => ['high' => false], // disable some features for higher performance; default false
]; ];
if ($_ENV['APP_DEBUG']) {
$config = DB::getRepository('\App\Entity\Config')->findAll();
if (count($config) < count(self::$defaults)) {
foreach (self::$defaults as $section => $def) {
foreach ($def as $setting => $value) {
if (!isset($config[$section][$setting])) {
$config[$section][$setting]
= DB::getReference('\App\Entity\Config', ['section' => $section, 'setting' => $setting]);
DB::persist($config[$section][$setting]->setValue(serialize($value)));
}
}
}
DB::flush();
}
}
} }
} }

6
src/Core/GNUsocial.php
View File

@ -63,7 +63,7 @@ class GNUsocial implements EventSubscriberInterface
public function __construct(ContainerInterface $container, public function __construct(ContainerInterface $container,
LoggerInterface $logger, LoggerInterface $logger,
TranslatorInterface $translator, TranslatorInterface $translator,
EntityManager $em) EntityManagerInterface $em)
{ {
$this->container = $container; $this->container = $container;
$this->logger = $logger; $this->logger = $logger;
@ -81,9 +81,9 @@ class GNUsocial implements EventSubscriberInterface
Log::setLogger($this->logger); Log::setLogger($this->logger);
GSEvent::setDispatcher($event_dispatcher); GSEvent::setDispatcher($event_dispatcher);
I18n::setTranslator($this->translator); I18n::setTranslator($this->translator);
DB::setEntityManager($this->entity_manager); DB::setManager($this->entity_manager);
DefaultSettings::setDefault(); DefaultSettings::setDefaults();
ModulesManager::loadModules(); ModulesManager::loadModules();
} }

2
src/Util/Common.php
View File

@ -44,6 +44,6 @@ abstract class Common
*/ */
public static function config(string $section, string $setting) public static function config(string $section, string $setting)
{ {
return DB::find('\App\Entity\Config', [$section, $setting]); return DB::find('\App\Entity\Config', ['section' => $section, 'setting' => $setting]);
} }
} }