Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/files/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
'OCA\\Files\\Migration\\Version12101Date20221011153334' => $baseDir . '/../lib/Migration/Version12101Date20221011153334.php',
'OCA\\Files\\Migration\\Version2003Date20241021095629' => $baseDir . '/../lib/Migration/Version2003Date20241021095629.php',
'OCA\\Files\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
'OCA\\Files\\PublicCapabilities' => $baseDir . '/../lib/PublicCapabilities.php',
'OCA\\Files\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
'OCA\\Files\\Search\\FileAccountScopedSearchProvider' => $baseDir . '/../lib/Search/FileAccountScopedSearchProvider.php',
'OCA\\Files\\Search\\FilesSearchProvider' => $baseDir . '/../lib/Search/FilesSearchProvider.php',
Expand Down
1 change: 1 addition & 0 deletions apps/files/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ class ComposerStaticInitFiles
'OCA\\Files\\Migration\\Version12101Date20221011153334' => __DIR__ . '/..' . '/../lib/Migration/Version12101Date20221011153334.php',
'OCA\\Files\\Migration\\Version2003Date20241021095629' => __DIR__ . '/..' . '/../lib/Migration/Version2003Date20241021095629.php',
'OCA\\Files\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
'OCA\\Files\\PublicCapabilities' => __DIR__ . '/..' . '/../lib/PublicCapabilities.php',
'OCA\\Files\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
'OCA\\Files\\Search\\FileAccountScopedSearchProvider' => __DIR__ . '/..' . '/../lib/Search/FileAccountScopedSearchProvider.php',
'OCA\\Files\\Search\\FilesSearchProvider' => __DIR__ . '/..' . '/../lib/Search/FilesSearchProvider.php',
Expand Down
2 changes: 2 additions & 0 deletions apps/files/lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
use OCA\Files\Listener\SyncLivePhotosListener;
use OCA\Files\Listener\UserFirstTimeLoggedInListener;
use OCA\Files\Notification\Notifier;
use OCA\Files\PublicCapabilities;
use OCA\Files\Search\FileAccountScopedSearchProvider;
use OCA\Files\Search\FilesSearchProvider;
use OCA\Files\Sharing\Permission\NodeCreateSharePermissionType;
Expand Down Expand Up @@ -79,6 +80,7 @@ public function register(IRegistrationContext $context): void {
$context->registerCapability(Capabilities::class);
$context->registerCapability(AdvancedCapabilities::class);
$context->registerCapability(DirectEditingCapabilities::class);
$context->registerCapability(PublicCapabilities::class);

$context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
$context->registerEventListener(RenderReferenceEvent::class, RenderReferenceEventListener::class);
Expand Down
11 changes: 1 addition & 10 deletions apps/files/lib/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

namespace OCA\Files;

use OC\Files\FilenameValidator;
use OCA\Files\Service\ChunkedUploadConfig;
use OCP\Capabilities\ICapability;
use OCP\Files\Conversion\ConversionMimeProvider;
Expand All @@ -19,27 +18,19 @@
class Capabilities implements ICapability {

public function __construct(
protected FilenameValidator $filenameValidator,
protected IConversionManager $fileConversionManager,
) {
}

/**
* Return this classes capabilities
*
* @return array{files: array{'$comment': ?string, bigfilechunking: bool, blacklisted_files: list<mixed>, forbidden_filenames: list<string>, forbidden_filename_basenames: list<string>, forbidden_filename_characters: list<string>, forbidden_filename_extensions: list<string>, chunked_upload: array{max_size: int, max_parallel_count: int}, file_conversions: list<array{from: string, to: string, extension: string, displayName: string}>}}
* @return array{files: array{bigfilechunking: bool, chunked_upload: array{max_size: int, max_parallel_count: int}, file_conversions: list<array{from: string, to: string, extension: string, displayName: string}>}}
*/
#[\Override]
public function getCapabilities(): array {
return [
'files' => [
'$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(),

'bigfilechunking' => true,
'chunked_upload' => [
'max_size' => ChunkedUploadConfig::getMaxChunkSize(),
Expand Down
40 changes: 40 additions & 0 deletions apps/files/lib/PublicCapabilities.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Files;

use OC\Files\FilenameValidator;
use OCP\Capabilities\IPublicCapability;

class PublicCapabilities implements IPublicCapability {

public function __construct(
protected FilenameValidator $filenameValidator,
) {
}

/**
* Return this classes capabilities
*
* @return array{files: array{'$comment': ?string, blacklisted_files: list<mixed>, forbidden_filenames: list<string>, forbidden_filename_basenames: list<string>, forbidden_filename_characters: list<string>, forbidden_filename_extensions: list<string>}}
*/
#[\Override]
public function getCapabilities(): array {
return [
'files' => [
'$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(),
],
];
}
}
95 changes: 55 additions & 40 deletions apps/files/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,7 @@
"type": "object",
"required": [
"windows_compatible_filenames",
"$comment",
"bigfilechunking",
"blacklisted_files",
"forbidden_filenames",
"forbidden_filename_basenames",
"forbidden_filename_characters",
"forbidden_filename_extensions",
"chunked_upload",
"file_conversions",
"directEditing"
Expand All @@ -45,43 +39,9 @@
"windows_compatible_filenames": {
"type": "boolean"
},
"$comment": {
"type": "string",
"nullable": true
},
"bigfilechunking": {
"type": "boolean"
},
"blacklisted_files": {
"type": "array",
"items": {
"type": "object"
}
},
"forbidden_filenames": {
"type": "array",
"items": {
"type": "string"
}
},
"forbidden_filename_basenames": {
"type": "array",
"items": {
"type": "string"
}
},
"forbidden_filename_characters": {
"type": "array",
"items": {
"type": "string"
}
},
"forbidden_filename_extensions": {
"type": "array",
"items": {
"type": "string"
}
},
"chunked_upload": {
"type": "object",
"required": [
Expand Down Expand Up @@ -201,6 +161,61 @@
}
}
},
"PublicCapabilities": {
"type": "object",
"required": [
"files"
],
"properties": {
"files": {
"type": "object",
"required": [
"$comment",
"blacklisted_files",
"forbidden_filenames",
"forbidden_filename_basenames",
"forbidden_filename_characters",
"forbidden_filename_extensions"
],
"properties": {
"$comment": {
"type": "string",
"nullable": true
},
"blacklisted_files": {
"type": "array",
"items": {
"type": "object"
}
},
"forbidden_filenames": {
"type": "array",
"items": {
"type": "string"
}
},
"forbidden_filename_basenames": {
"type": "array",
"items": {
"type": "string"
}
},
"forbidden_filename_characters": {
"type": "array",
"items": {
"type": "string"
}
},
"forbidden_filename_extensions": {
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
},
"Template": {
"type": "object",
"required": [
Expand Down
49 changes: 49 additions & 0 deletions apps/files/tests/PublicCapabilitiesTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Files;

use OC\Files\FilenameValidator;
use OCP\Capabilities\IPublicCapability;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;

class PublicCapabilitiesTest extends TestCase {

protected FilenameValidator&MockObject $filenameValidator;
protected PublicCapabilities $capabilities;

protected function setUp(): void {
parent::setUp();
$this->filenameValidator = $this->createMock(FilenameValidator::class);
$this->capabilities = new PublicCapabilities($this->filenameValidator);
}

public function testIsPublicCapability(): void {
self::assertInstanceOf(IPublicCapability::class, $this->capabilities);
}

public function testGetCapabilities(): void {
$this->filenameValidator->method('getForbiddenFilenames')->willReturn(['.htaccess']);
$this->filenameValidator->method('getForbiddenBasenames')->willReturn(['con', 'prn']);
$this->filenameValidator->method('getForbiddenCharacters')->willReturn(['/', ':']);
$this->filenameValidator->method('getForbiddenExtensions')->willReturn(['.part']);

self::assertEquals([
'files' => [
'$comment' => '"blacklisted_files" is deprecated as of Nextcloud 30, use "forbidden_filenames" instead',
'blacklisted_files' => ['.htaccess'],
'forbidden_filenames' => ['.htaccess'],
'forbidden_filename_basenames' => ['con', 'prn'],
'forbidden_filename_characters' => ['/', ':'],
'forbidden_filename_extensions' => ['.part'],
],
], $this->capabilities->getCapabilities());
}
}
Loading
Loading