diff --git a/config/services.yaml b/config/services.yaml index d2eb7df34d..a951097f27 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -23,12 +23,12 @@ services: resource: '../src/Controller' tags: ['controller.service_arguments'] - App\Core\RouteLoader: + App\Core\Router\RouteLoader: tags: ['routing.loader'] # Wrapper arround Doctrine's StaticPHP metadata driver app.core.schemadef_driver: - class: App\Core\SchemaDefDriver + class: App\Core\DB\SchemaDefDriver arguments: - '%kernel.project_dir%/src/Entity' diff --git a/src/Controller/AdminConfigController.php b/src/Controller/AdminConfigController.php index 09dbee461a..ccbc8b832b 100644 --- a/src/Controller/AdminConfigController.php +++ b/src/Controller/AdminConfigController.php @@ -32,7 +32,7 @@ namespace App\Controller; // use App\Core\GSEvent as Event; // use App\Util\Common; -use App\Core\DefaultSettings; +use App\Core\DB\DefaultSettings; use App\Core\I18n; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; diff --git a/src/Core/DB.php b/src/Core/DB/DB.php similarity index 98% rename from src/Core/DB.php rename to src/Core/DB/DB.php index 47258b54e0..54cbc82962 100644 --- a/src/Core/DB.php +++ b/src/Core/DB/DB.php @@ -17,7 +17,6 @@ // along with GNU social. If not, see . // }}} - /** * Doctrine entity manager static wrapper * @@ -29,7 +28,7 @@ * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -namespace App\Core; +namespace App\Core\DB; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/Core/DB/DefaultSettings.php b/src/Core/DB/DefaultSettings.php new file mode 100644 index 0000000000..88173e6695 --- /dev/null +++ b/src/Core/DB/DefaultSettings.php @@ -0,0 +1,307 @@ +. + +// }}} + +/** + * Write the default settings to the database + * + * @package GNUsocial + * @category DB + * + * @author Hugo Sales + * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later + */ + +namespace App\Core\DB; + +use App\Core\I18n; +use App\Util\Common; + +abstract class DefaultSettings +{ + public static array $defaults; + public static function setDefaults() + { + self::$defaults = ['site' => ['name' => $_ENV['SOCIAL_SITENAME'] ?? 'Another social instance', + 'server' => $_ENV['SOCIAL_DOMAIN'] ?? 'localhost', + 'notice' => null, // site wide notice text + 'theme' => 'default', + 'logo' => null, + 'language' => 'en', + 'detect_language' => true, + 'languages' => I18n::get_all_languages(), + 'email' => $_ENV['SERVER_ADMIN'] ?? $_ENV['SOCIAL_ADMIN_EMAIL'] ?? null, + 'recovery_disclose' => false, // Whether to not say that we found the email in the database, when asking for recovery + 'timezone' => 'UTC', + 'brought_by' => null, + 'brought_by_url' => null, + 'closed' => false, + 'invite_only' => true, + 'private' => false, + 'ssl' => 'always', + 'ssl_proxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it) + 'duplicate_time_limit' => 60, // default for same person saying the same thing + 'text_limit' => 1000, // in chars; 0 == no limit + 'x-static-delivery' => null, + ], + '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 + 'fix' => ['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 + ], + 'queue' => ['enabled' => true, + 'daemon' => false, // Use queuedaemon. Default to false + 'threads' => null, // an empty value here uses processor count to determine + 'subsystem' => false, // default to database, or 'stomp' + 'basename' => '/queue/gnusocial/', + 'control_channel' => '/topic/gnusocial/control', // broadcasts to all queue daemons + 'monitor' => null, // URL to monitor ping endpoint (work in progress) + 'soft_limit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully + 'spawn_delay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup + 'debug_memory' => false, // true to spit memory usage to log + 'stomp_server' => null, + 'stomp_username' => null, + 'stomp_password' => null, + 'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled + 'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all) + 'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all) + 'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all) + '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) + ], + 'avatar' => ['server' => null, + 'url_base' => '/avatar/', + 'ssl' => null, + 'dir' => INSTALLDIR . '/file/avatar/', + 'max_size_px' => 300, + ], + 'javascript' => ['server' => null, + 'url_base' => '/js/', + 'ssl' => null, + 'bust_frames' => true, + ], + 'attachments' => ['server' => null, + 'url_base' => '/file/', + 'ssl' => null, + 'dir' => INSTALLDIR . '/file/uploads/', + 'supported' => ['application/vnd.oasis.opendocument.chart' => 'odc', + 'application/vnd.oasis.opendocument.formula' => 'odf', + 'application/vnd.oasis.opendocument.graphics' => 'odg', + 'application/vnd.oasis.opendocument.graphics-template' => 'otg', + 'application/vnd.oasis.opendocument.image' => 'odi', + 'application/vnd.oasis.opendocument.presentation' => 'odp', + 'application/vnd.oasis.opendocument.presentation-template' => 'otp', + 'application/vnd.oasis.opendocument.spreadsheet' => 'ods', + 'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots', + 'application/vnd.oasis.opendocument.text' => 'odt', + 'application/vnd.oasis.opendocument.text-master' => 'odm', + 'application/vnd.oasis.opendocument.text-template' => 'ott', + 'application/vnd.oasis.opendocument.text-web' => 'oth', + 'application/pdf' => 'pdf', + 'application/zip' => 'zip', + 'application/x-bzip2' => 'bz2', + 'application/x-go-sgf' => 'sgf', + 'application/xml' => 'xml', + 'application/gpx+xml' => 'gpx', + image_type_to_mime_type(IMAGETYPE_PNG) => image_type_to_extension(IMAGETYPE_PNG), + image_type_to_mime_type(IMAGETYPE_JPEG) => image_type_to_extension(IMAGETYPE_JPEG), + image_type_to_mime_type(IMAGETYPE_GIF) => image_type_to_extension(IMAGETYPE_GIF), + image_type_to_mime_type(IMAGETYPE_ICO) => image_type_to_extension(IMAGETYPE_ICO), + 'image/svg+xml' => 'svg', // No built-in constant + 'audio/ogg' => 'ogg', + 'audio/mpeg' => 'mpg', + 'audio/x-speex' => 'spx', + 'application/ogg' => 'ogx', + 'text/plain' => 'txt', + 'video/mpeg' => 'mpeg', + 'video/mp4' => 'mp4', + 'video/ogg' => 'ogv', + 'video/quicktime' => 'mov', + 'video/webm' => 'webm', + ], + 'file_quota' => Common::get_preferred_php_upload_limit(), + 'user_quota' => Common::size_str_to_int('200M'), + 'monthly_quota' => Common::size_str_to_int('20M'), + 'uploads' => true, + 'show_html' => true, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls. + 'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info + 'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages. + 'ext_blacklist' => [], + 'filename' => 'hash', + 'memory_limit' => '1024M', // PHP memory limit to use temporarily when handling images + ], + 'thumbnail' => ['server' => null, + 'url_base' => '/thumb/', + 'ssl' => null, + 'dir' => INSTALLDIR . '/file/thumbnails/', // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/') + 'crop' => false, // overridden to true if thumb height === null + 'max_size_px' => 1000, // thumbs with an edge larger than this will not be generated + 'width' => 450, + 'height' => 600, + 'upscale' => false, + 'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true="allow animated" + ], + 'theme' => ['server' => null, + 'url_base' => '/theme/', + 'ssl' => null, + 'dir' => INSTALLDIR . '/public/theme/', + ], + 'plugins' => ['server' => null, + 'url_base' => null, + 'ssl' => null, + 'core' => [], + 'default' => [], + 'locale_path' => null, // Set to a path to use *instead of* each plugin's own locale subdirectories + ], + 'license' => ['type' => 'cc', // can be 'cc', 'allrightsreserved', 'private' + 'owner' => null, // can be name of content owner e.g. for enterprise + 'url' => 'https://creativecommons.org/licenses/by/4.0/', + 'title' => 'Creative Commons Attribution 4.0', + 'image' => '/theme/licenses/cc_by_4.0.png', + ], + 'mail' => ['backend' => 'mail', + 'params' => null, + 'domain_check' => true, + ], + 'nickname' => ['blacklist' => ['doc', 'main', 'avatar', 'theme'], + 'featured' => [], + ], + 'profile' => ['banned' => [], + 'bio_text_limit' => null, + 'allow_nick_change' => false, + 'allow_private_stream' => true, // whether to allow setting stream to private ("only followers can read") + 'backup' => false, // can cause DoS, so should be done via CLI + 'restore' => false, + 'delete' => false, + 'move' => false, + ], + 'image' => ['jpegquality' => 85], + 'theme_upload' => ['enabled' => true, + 'formats' => ['zip', 'tar', 'gz', 'tar.gz'], ], + 'foaf' => ['mbox_sha1sum' => false], + 'public' => ['local_only' => false, + 'blacklist' => [], + 'exclude_sources' => [], + ], + 'throttle' => ['enabled' => true, // whether to throttle posting dents + 'count' => 20, // number of allowed messages in timespan + 'timespan' => 600, // timespan for throttling + ], + 'invite' => ['enabled' => true], + 'tag' => ['dropoff' => 86400 * 10, // controls weighting based on age + 'cutoff' => 86400 * 90, // only look at notices posted in last 90 days + ], + 'popular' => ['dropoff' => 86400 * 10, // controls weighting based on age + 'cutoff' => 86400 * 90, // only look at notices favorited in last 90 days + ], + 'daemon' => ['piddir' => sys_get_temp_dir(), + 'user' => false, + 'group' => false, + ], + 'ping' => ['notify' => [], + 'timeout' => 2, + ], + 'new_users' => ['default_subscriptions' => null, + 'welcome_user' => null, + ], + 'linkify' => // "bare" below means "without schema", like domain.com vs. https://domain.com + ['bare_domains' => false, // convert domain.com to domain.com ? + 'linkify_ipv4' => false, // convert IPv4 addresses to hyperlinks? + 'linkify_ipv6' => false, // convert IPv6 addresses to hyperlinks? + ], + 'group' => ['max_aliases' => 3, + 'description_limit' => null, + ], + 'people_tag' => ['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 + 'allow_tagging' => ['local' => true, 'remote' => true], // equivalent to array() + 'description_limit' => null, + ], + 'search' => ['type' => 'like'], + 'html_filter' => ['tags' => ['img', 'video', 'audio', 'script']], + 'notice' => ['content_limit' => null, + '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 + ], + 'message' => ['content_limit' => null], + 'location' => ['share' => 'user'], + 'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins']], + 'single_user' => ['enabled' => $_ENV['SOCIAL_SITE_PROFILE'] ?? '' == 'single_user', + 'nickname' => null, + ], + 'robots_txt' => ['crawl_delay' => 0, + 'disallow' => ['main', 'settings', 'admin', 'search', 'message'], + ], + 'nofollow' => ['subscribers' => true, + 'members' => true, + 'peopletag' => true, + 'external' => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes' + ], + 'url_shortener' => ['service' => 'internal', + 'max_url_length' => 100, + 'max_notice_length' => null, + ], + 'http' => // HTTP client settings when contacting other sites + ['ssl_ca_file' => '/docker/certbot/files/live/', + 'timeout' => (int) (ini_get('default_socket_timeout')), // effectively should be this by default already, but this makes it more explicitly configurable for you users .) + 'proxy_host' => null, + 'proxy_port' => null, + 'proxy_user' => null, + 'proxy_password' => null, + 'proxy_auth_scheme' => null, + ], + '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 + 'login_command' => ['enabled' => false], + ]; + + self::loadDefaults(!$_ENV['APP_DEBUG']); + } + + public static function loadDefaults(bool $optimize = false) + { + if ($optimize || !isset($_ENV['HTTPS']) || !isset($_ENV['HTTP_HOST'])) { + return; + } + + // In debug mode, delete everything and reinsert, in case + // defaults changed + if ($_ENV['APP_DEBUG']) { + 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'; + foreach (self::$defaults as $section => $def) { + foreach ($def as $setting => $value) { + $v = serialize($value); + $sql .= " ('{$section}', '{$setting}', '{$v}'),"; + } + } + $sql = preg_replace('/,$/', ';', $sql); + DB::getConnection()->executeQuery($sql); + } + } +} diff --git a/src/Core/SchemaDefDriver.php b/src/Core/DB/SchemaDefDriver.php similarity index 99% rename from src/Core/SchemaDefDriver.php rename to src/Core/DB/SchemaDefDriver.php index 8e71260b0f..b4575efe16 100644 --- a/src/Core/SchemaDefDriver.php +++ b/src/Core/DB/SchemaDefDriver.php @@ -17,7 +17,6 @@ // along with GNU social. If not, see . // }}} - /** * Doctrine metadata driver which implements our old `schemaDef` interface * @@ -29,7 +28,7 @@ * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -namespace App\Core; +namespace App\Core\DB; use Doctrine\Persistence\Mapping\ClassMetadata; use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver; diff --git a/src/Core/DefaultSettings.php b/src/Core/DefaultSettings.php deleted file mode 100644 index b61194669a..0000000000 --- a/src/Core/DefaultSettings.php +++ /dev/null @@ -1,306 +0,0 @@ -. - -// }}} - -/** - * Write the default settings to the database - * - * @package GNUsocial - * @category DB - * - * @author Hugo Sales - * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org - * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later - */ - -namespace App\Core; - -use App\Util\Common; - -abstract class DefaultSettings -{ - public static array $defaults; - public static function setDefaults() - { - self::$defaults = ['site' => ['name' => $_ENV['SOCIAL_SITENAME'] ?? 'Another social instance', - 'server' => $_ENV['SOCIAL_DOMAIN'] ?? 'localhost', - 'notice' => null, // site wide notice text - 'theme' => 'default', - 'logo' => null, - 'language' => 'en', - 'detect_language' => true, - 'languages' => I18n::get_all_languages(), - 'email' => $_ENV['SERVER_ADMIN'] ?? $_ENV['SOCIAL_ADMIN_EMAIL'] ?? null, - 'recovery_disclose' => false, // Whether to not say that we found the email in the database, when asking for recovery - 'timezone' => 'UTC', - 'brought_by' => null, - 'brought_by_url' => null, - 'closed' => false, - 'invite_only' => true, - 'private' => false, - 'ssl' => 'always', - 'ssl_proxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it) - 'duplicate_time_limit' => 60, // default for same person saying the same thing - 'text_limit' => 1000, // in chars; 0 == no limit - 'x-static-delivery' => null, - ], - '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 - 'fix' => ['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 - ], - 'queue' => ['enabled' => true, - 'daemon' => false, // Use queuedaemon. Default to false - 'threads' => null, // an empty value here uses processor count to determine - 'subsystem' => false, // default to database, or 'stomp' - 'basename' => '/queue/gnusocial/', - 'control_channel' => '/topic/gnusocial/control', // broadcasts to all queue daemons - 'monitor' => null, // URL to monitor ping endpoint (work in progress) - 'soft_limit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully - 'spawn_delay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup - 'debug_memory' => false, // true to spit memory usage to log - 'stomp_server' => null, - 'stomp_username' => null, - 'stomp_password' => null, - 'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled - 'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all) - 'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all) - 'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all) - '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) - ], - 'avatar' => ['server' => null, - 'url_base' => '/avatar/', - 'ssl' => null, - 'dir' => INSTALLDIR . '/file/avatar/', - 'max_size_px' => 300, - ], - 'javascript' => ['server' => null, - 'url_base' => '/js/', - 'ssl' => null, - 'bust_frames' => true, - ], - 'attachments' => ['server' => null, - 'url_base' => '/file/', - 'ssl' => null, - 'dir' => INSTALLDIR . '/file/uploads/', - 'supported' => ['application/vnd.oasis.opendocument.chart' => 'odc', - 'application/vnd.oasis.opendocument.formula' => 'odf', - 'application/vnd.oasis.opendocument.graphics' => 'odg', - 'application/vnd.oasis.opendocument.graphics-template' => 'otg', - 'application/vnd.oasis.opendocument.image' => 'odi', - 'application/vnd.oasis.opendocument.presentation' => 'odp', - 'application/vnd.oasis.opendocument.presentation-template' => 'otp', - 'application/vnd.oasis.opendocument.spreadsheet' => 'ods', - 'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots', - 'application/vnd.oasis.opendocument.text' => 'odt', - 'application/vnd.oasis.opendocument.text-master' => 'odm', - 'application/vnd.oasis.opendocument.text-template' => 'ott', - 'application/vnd.oasis.opendocument.text-web' => 'oth', - 'application/pdf' => 'pdf', - 'application/zip' => 'zip', - 'application/x-bzip2' => 'bz2', - 'application/x-go-sgf' => 'sgf', - 'application/xml' => 'xml', - 'application/gpx+xml' => 'gpx', - image_type_to_mime_type(IMAGETYPE_PNG) => image_type_to_extension(IMAGETYPE_PNG), - image_type_to_mime_type(IMAGETYPE_JPEG) => image_type_to_extension(IMAGETYPE_JPEG), - image_type_to_mime_type(IMAGETYPE_GIF) => image_type_to_extension(IMAGETYPE_GIF), - image_type_to_mime_type(IMAGETYPE_ICO) => image_type_to_extension(IMAGETYPE_ICO), - 'image/svg+xml' => 'svg', // No built-in constant - 'audio/ogg' => 'ogg', - 'audio/mpeg' => 'mpg', - 'audio/x-speex' => 'spx', - 'application/ogg' => 'ogx', - 'text/plain' => 'txt', - 'video/mpeg' => 'mpeg', - 'video/mp4' => 'mp4', - 'video/ogg' => 'ogv', - 'video/quicktime' => 'mov', - 'video/webm' => 'webm', - ], - 'file_quota' => Common::get_preferred_php_upload_limit(), - 'user_quota' => Common::size_str_to_int('200M'), - 'monthly_quota' => Common::size_str_to_int('20M'), - 'uploads' => true, - 'show_html' => true, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls. - 'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info - 'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages. - 'ext_blacklist' => [], - 'filename' => 'hash', - 'memory_limit' => '1024M', // PHP memory limit to use temporarily when handling images - ], - 'thumbnail' => ['server' => null, - 'url_base' => '/thumb/', - 'ssl' => null, - 'dir' => INSTALLDIR . '/file/thumbnails/', // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/') - 'crop' => false, // overridden to true if thumb height === null - 'max_size_px' => 1000, // thumbs with an edge larger than this will not be generated - 'width' => 450, - 'height' => 600, - 'upscale' => false, - 'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true="allow animated" - ], - 'theme' => ['server' => null, - 'url_base' => '/theme/', - 'ssl' => null, - 'dir' => INSTALLDIR . '/public/theme/', - ], - 'plugins' => ['server' => null, - 'url_base' => null, - 'ssl' => null, - 'core' => [], - 'default' => [], - 'locale_path' => null, // Set to a path to use *instead of* each plugin's own locale subdirectories - ], - 'license' => ['type' => 'cc', // can be 'cc', 'allrightsreserved', 'private' - 'owner' => null, // can be name of content owner e.g. for enterprise - 'url' => 'https://creativecommons.org/licenses/by/4.0/', - 'title' => 'Creative Commons Attribution 4.0', - 'image' => '/theme/licenses/cc_by_4.0.png', - ], - 'mail' => ['backend' => 'mail', - 'params' => null, - 'domain_check' => true, - ], - 'nickname' => ['blacklist' => ['doc', 'main', 'avatar', 'theme'], - 'featured' => [], - ], - 'profile' => ['banned' => [], - 'bio_text_limit' => null, - 'allow_nick_change' => false, - 'allow_private_stream' => true, // whether to allow setting stream to private ("only followers can read") - 'backup' => false, // can cause DoS, so should be done via CLI - 'restore' => false, - 'delete' => false, - 'move' => false, - ], - 'image' => ['jpegquality' => 85], - 'theme_upload' => ['enabled' => true, - 'formats' => ['zip', 'tar', 'gz', 'tar.gz'], ], - 'foaf' => ['mbox_sha1sum' => false], - 'public' => ['local_only' => false, - 'blacklist' => [], - 'exclude_sources' => [], - ], - 'throttle' => ['enabled' => true, // whether to throttle posting dents - 'count' => 20, // number of allowed messages in timespan - 'timespan' => 600, // timespan for throttling - ], - 'invite' => ['enabled' => true], - 'tag' => ['dropoff' => 86400 * 10, // controls weighting based on age - 'cutoff' => 86400 * 90, // only look at notices posted in last 90 days - ], - 'popular' => ['dropoff' => 86400 * 10, // controls weighting based on age - 'cutoff' => 86400 * 90, // only look at notices favorited in last 90 days - ], - 'daemon' => ['piddir' => sys_get_temp_dir(), - 'user' => false, - 'group' => false, - ], - 'ping' => ['notify' => [], - 'timeout' => 2, - ], - 'new_users' => ['default_subscriptions' => null, - 'welcome_user' => null, - ], - 'linkify' => // "bare" below means "without schema", like domain.com vs. https://domain.com - ['bare_domains' => false, // convert domain.com to domain.com ? - 'linkify_ipv4' => false, // convert IPv4 addresses to hyperlinks? - 'linkify_ipv6' => false, // convert IPv6 addresses to hyperlinks? - ], - 'group' => ['max_aliases' => 3, - 'description_limit' => null, - ], - 'people_tag' => ['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 - 'allow_tagging' => ['local' => true, 'remote' => true], // equivalent to array() - 'description_limit' => null, - ], - 'search' => ['type' => 'like'], - 'html_filter' => ['tags' => ['img', 'video', 'audio', 'script']], - 'notice' => ['content_limit' => null, - '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 - ], - 'message' => ['content_limit' => null], - 'location' => ['share' => 'user'], - 'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins']], - 'single_user' => ['enabled' => $_ENV['SOCIAL_SITE_PROFILE'] ?? '' == 'single_user', - 'nickname' => null, - ], - 'robots_txt' => ['crawl_delay' => 0, - 'disallow' => ['main', 'settings', 'admin', 'search', 'message'], - ], - 'nofollow' => ['subscribers' => true, - 'members' => true, - 'peopletag' => true, - 'external' => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes' - ], - 'url_shortener' => ['service' => 'internal', - 'max_url_length' => 100, - 'max_notice_length' => null, - ], - 'http' => // HTTP client settings when contacting other sites - ['ssl_ca_file' => '/docker/certbot/files/live/', - 'timeout' => (int) (ini_get('default_socket_timeout')), // effectively should be this by default already, but this makes it more explicitly configurable for you users .) - 'proxy_host' => null, - 'proxy_port' => null, - 'proxy_user' => null, - 'proxy_password' => null, - 'proxy_auth_scheme' => null, - ], - '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 - 'login_command' => ['enabled' => false], - ]; - - self::loadDefaults(!$_ENV['APP_DEBUG']); - } - - public static function loadDefaults(bool $optimize = false) - { - if ($optimize || !isset($_ENV['HTTPS']) || !isset($_ENV['HTTP_HOST'])) { - return; - } - - // In debug mode, delete everything and reinsert, in case - // defaults changed - if ($_ENV['APP_DEBUG']) { - 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'; - foreach (self::$defaults as $section => $def) { - foreach ($def as $setting => $value) { - $v = serialize($value); - $sql .= " ('{$section}', '{$setting}', '{$v}'),"; - } - } - $sql = preg_replace('/,$/', ';', $sql); - DB::getConnection()->executeQuery($sql); - } - } -} diff --git a/src/Core/GNUsocial.php b/src/Core/GNUsocial.php index 254447fa10..89f62c5198 100644 --- a/src/Core/GNUsocial.php +++ b/src/Core/GNUsocial.php @@ -17,7 +17,6 @@ // along with GNU social. If not, see . // }}} - /** * Main GNU social entry point * @@ -41,6 +40,9 @@ namespace App\Core; +use App\Core\DB\DB; +use App\Core\DB\DefaultSettings; +use App\Core\Router\Router; use Doctrine\ORM\EntityManagerInterface; use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; @@ -49,14 +51,16 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\KernelEvents; +use Symfony\Component\Routing\RouterInterface; use Symfony\Contracts\Translation\TranslatorInterface; class GNUsocial implements EventSubscriberInterface { - protected ContainerInterface $container; - protected LoggerInterface $logger; - protected TranslatorInterface $translator; + protected ContainerInterface $container; + protected LoggerInterface $logger; + protected TranslatorInterface $translator; protected EntityManagerInterface $entity_manager; + protected RouterInterface $router; /** * Symfony dependency injection gives us access to these services @@ -64,12 +68,14 @@ class GNUsocial implements EventSubscriberInterface public function __construct(ContainerInterface $container, LoggerInterface $logger, TranslatorInterface $translator, - EntityManagerInterface $em) + EntityManagerInterface $em, + RouterInterface $router) { $this->container = $container; $this->logger = $logger; $this->translator = $translator; $this->entity_manager = $em; + $this->router = $router; } /** @@ -83,6 +89,7 @@ class GNUsocial implements EventSubscriberInterface GSEvent::setDispatcher($event_dispatcher); I18n::setTranslator($this->translator); DB::setManager($this->entity_manager); + Router::setRouter($this->router); DefaultSettings::setDefaults(); ModulesManager::loadModules(); diff --git a/src/Core/RouteLoader.php b/src/Core/Router/RouteLoader.php similarity index 99% rename from src/Core/RouteLoader.php rename to src/Core/Router/RouteLoader.php index a9e8344ec6..48be638b74 100644 --- a/src/Core/RouteLoader.php +++ b/src/Core/Router/RouteLoader.php @@ -17,7 +17,6 @@ // along with GNU social. If not, see . // }}} - /** * Dynamic router loader and URLMapper interface atop Symfony's router * @@ -31,7 +30,7 @@ * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -namespace App\Core; +namespace App\Core\Router; use Symfony\Component\Config\Loader\Loader; use Symfony\Component\Routing\Route; diff --git a/src/Routes/Main.php b/src/Routes/Main.php index 0e039770f9..cccd3e556e 100644 --- a/src/Routes/Main.php +++ b/src/Routes/Main.php @@ -31,7 +31,7 @@ namespace App\Routes; use App\Controller as C; -use App\Core\RouteLoader; +use App\Core\Router\RouteLoader; abstract class Main { diff --git a/src/Util/Common.php b/src/Util/Common.php index 6a0d23a812..67fd615986 100644 --- a/src/Util/Common.php +++ b/src/Util/Common.php @@ -30,7 +30,7 @@ namespace App\Util; -use App\Core\DB; +use App\Core\DB\DB; abstract class Common { @@ -59,7 +59,8 @@ abstract class Common * $size is empty (the value is not set in php.ini), returns a default * value (5000000) * - * @param string|bool $size + * @param bool|string $size + * * @return int the php.ini upload limit in machine-readable format */ public static function size_str_to_int($size): int @@ -105,5 +106,4 @@ abstract class Common self::size_str_to_int(ini_get('memory_limit')) ); } - }