Merge pull request #1943 from pixelfed/staging

Add BANNED_USERNAMES env var support to RestrictedNames

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.7...dev)
 ### Added
+- Added ```BANNED_USERNAMES``` .env var, an optional comma separated string to ban specific usernames from being used ([6cdd64c6](https://github.com/pixelfed/pixelfed/commit/6cdd64c6))
 
 ### Fixed
 - Fixed Story Compose bug affecting postgres instances ([#1918](https://github.com/pixelfed/pixelfed/pull/1918))

app/Util/Lexer/RestrictedNames.php

@@ -4,7 +4,7 @@ namespace App\Util\Lexer;
 
 class RestrictedNames
 {
-    public static $blacklist = [
+	public static $additional = [
 		'autoconfig',
 		'blog',
 		'broadcasthost',
@@ -294,16 +294,18 @@ class RestrictedNames
 
 	public static function get()
 	{
-        $reserved = $blacklist = [];
+		$banned = [];
 
-        if (true == config('pixelfed.restricted_names.use_blacklist')) {
+		if(config('instance.username.banned')) {
-            $blacklist = self::$blacklist;
+			$banned = array_map('trim', explode(',', config('instance.username.banned')));
 		}
 
-        if (true == config('pixelfed.restricted_names.reserved_routes')) {
+		$additional = self::$additional;
 		$reserved = self::$reserved;
-        }
 
-        return array_merge($blacklist, $reserved);
+		$res = array_merge($additional, $reserved, $banned);
+		sort($res);
+		
+		return $res;
 	}
 }

config/instance.php

@@ -41,6 +41,7 @@ return [
 		]
 	],
 	'username' => [
+		'banned' => env('BANNED_USERNAMES'),
 		'remote' => [
 			'formats' => ['@', 'from', 'custom'],
 			'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@',

config/pixelfed.php

@@ -48,20 +48,6 @@ return [
     */
     'memory_limit' => env('MEMORY_LIMIT', '1024M'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Restricted Usernames
-    |--------------------------------------------------------------------------
-    |
-    | Optional blacklist to prevent registering usernames that could
-    | be confused for admin or system services.
-    |
-    */
-    'restricted_names' => [
-      'reserved_routes' => true,
-      'use_blacklist'   => env('USERNAME_BLACKLIST', false),
-    ],
-
     /*
     |--------------------------------------------------------------------------
     | Allow New Registrations
@@ -278,4 +264,6 @@ return [
     'admin' => [
         'env_editor' => env('ADMIN_ENV_EDITOR', false)
     ],
+
+    'links_per_post' => env('MAX_LINKS_PER_POST', 0) 
 ];