diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-07-16 11:06:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 11:06:14 +0200 |
| commit | 18c9f07ade56f61223605d86d22284eeef1f3024 (patch) | |
| tree | 2f4444ae54a68c5f124698dfb836741af3c7e097 /apps | |
| parent | 170849b3ff557cee96b3acfcb4555fd125ab6d29 (diff) | |
| parent | bdbeabafa7ee6596934f7a84c4574f434e12fe1f (diff) | |
| download | nextcloud-server-18c9f07ade56f61223605d86d22284eeef1f3024.tar.gz nextcloud-server-18c9f07ade56f61223605d86d22284eeef1f3024.zip | |
Merge pull request #46545 from nextcloud/fix/bring-back-forbidden-names
feat: Add `forbidden_filename_basenames` config option
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/lib/Capabilities.php | 3 | ||||
| -rw-r--r-- | apps/files/openapi.json | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/files/lib/Capabilities.php b/apps/files/lib/Capabilities.php index b024307c25b..fdbbdf63f22 100644 --- a/apps/files/lib/Capabilities.php +++ b/apps/files/lib/Capabilities.php @@ -20,7 +20,7 @@ class Capabilities implements ICapability { /** * Return this classes capabilities * - * @return array{files: array{'$comment': ?string, bigfilechunking: bool, blacklisted_files: array<mixed>, forbidden_filenames: list<string>, forbidden_filename_characters: list<string>, forbidden_filename_extensions: list<string>}} + * @return array{files: array{'$comment': ?string, bigfilechunking: bool, blacklisted_files: array<mixed>, forbidden_filenames: list<string>, forbidden_filename_basenames: list<string>, forbidden_filename_characters: list<string>, forbidden_filename_extensions: list<string>}} */ public function getCapabilities(): array { return [ @@ -28,6 +28,7 @@ class Capabilities implements ICapability { '$comment' => '"blacklisted_files" is deprecated as of Nextcloud 30, use "forbidden_filenames" instead', 'blacklisted_files' => $this->filenameValidator->getForbiddenFilenames(), 'forbidden_filenames' => $this->filenameValidator->getForbiddenFilenames(), + 'forbidden_filename_basenames' => $this->filenameValidator->getForbiddenBasenames(), 'forbidden_filename_characters' => $this->filenameValidator->getForbiddenCharacters(), 'forbidden_filename_extensions' => $this->filenameValidator->getForbiddenExtensions(), diff --git a/apps/files/openapi.json b/apps/files/openapi.json index 7fc6bc3e0b0..6fff32e4854 100644 --- a/apps/files/openapi.json +++ b/apps/files/openapi.json @@ -33,6 +33,7 @@ "bigfilechunking", "blacklisted_files", "forbidden_filenames", + "forbidden_filename_basenames", "forbidden_filename_characters", "forbidden_filename_extensions", "directEditing" @@ -57,6 +58,12 @@ "type": "string" } }, + "forbidden_filename_basenames": { + "type": "array", + "items": { + "type": "string" + } + }, "forbidden_filename_characters": { "type": "array", "items": { |