From 788e381db259019a6f221b54f67cc69bcaacf368 Mon Sep 17 00:00:00 2001 From: invario <67800603+invario@users.noreply.github.com> Date: Fri, 5 Sep 2025 11:04:05 -0400 Subject: [PATCH 1/3] feat(previews): allow ffmpeg to connect direct for AWS S3 buckets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> Signed-off-by: invario <67800603+invario@users.noreply.github.com> --- .../lib/Lib/Storage/AmazonS3.php | 31 +++++++++++++++++++ lib/private/Preview/Movie.php | 20 ++++++++++++ 2 files changed, 51 insertions(+) diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 1a866e8c22bf2..848df1a24b9c5 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -755,4 +755,35 @@ public function writeStream(string $path, $stream, ?int $size = null): int { return $size; } + + /** + * Generates and returns a presigned URL that expires after set duration + * + */ + public function getDirectDownload(string $path): array|false { + $command = $this->getConnection()->getCommand('GetObject', [ + 'Bucket' => $this->bucket, + 'Key' => $path, + ]); + $duration = '+10 minutes'; + $expiration = new \DateTime(); + $expiration->modify($duration); + + // generate a presigned URL that expires after $duration time + $request = $this->getConnection()->createPresignedRequest($command, $duration, []); + try { + $presignedUrl = (string)$request->getUri(); + } catch (S3Exception $exception) { + $this->logger->error($exception->getMessage(), [ + 'app' => 'files_external', + 'exception' => $exception, + ]); + } + $result = [ + 'url' => $presignedUrl, + 'presigned' => true, + 'expiration' => $expiration, + ]; + return $result; + } } diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 00192674a6403..df781723ae743 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -53,6 +53,26 @@ public function isAvailable(FileInfo $file): bool { return is_string($this->binary); } + private function connectDirect(File $file): string|false { + if (stream_get_meta_data($file->fopen('r'))['seekable'] !== true) { + return false; + } + + // Checks for availability to access the video file directly via HTTP/HTTPS. + // Returns a string containing URL if available. Only implemented and tested + // with Amazon S3 currently. In all other cases, return false. ffmpeg + // supports other protocols so this function may expand in the future. + $gddValues = $file->getStorage()->getDirectDownload($file->getName()); + + if (is_array($gddValues)) { + if (array_key_exists('url', $gddValues) && array_key_exists('presigned', $gddValues)) { + $directUrl = (str_starts_with($gddValues['url'], 'http') && ($gddValues['presigned'] === true)) ? $gddValues['url'] : false; + return $directUrl; + } + } + return false; + } + /** * {@inheritDoc} */ From a5461320cff4202ed4154edf452eeb30e72e8079 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 2 Jan 2026 11:05:10 +0100 Subject: [PATCH 2/3] feat(movie-preview): Use getDirectDownloadById for generating preview Allow to speed-up considerably the creation of previews for movies stored on S3. Signed-off-by: Carl Schwan --- .../lib/Lib/Storage/AmazonS3.php | 38 ++++++++++++------- lib/private/Preview/Movie.php | 13 +++---- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 848df1a24b9c5..ef43939191fd2 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -21,6 +21,7 @@ use OCP\ICache; use OCP\ICacheFactory; use OCP\Server; +use Override; use Psr\Log\LoggerInterface; class AmazonS3 extends Common { @@ -756,34 +757,43 @@ public function writeStream(string $path, $stream, ?int $size = null): int { return $size; } - /** - * Generates and returns a presigned URL that expires after set duration - * - */ + #[Override] public function getDirectDownload(string $path): array|false { + if (!$this->isUsePresignedUrl()) { + return false; + } + $command = $this->getConnection()->getCommand('GetObject', [ 'Bucket' => $this->bucket, 'Key' => $path, ]); - $duration = '+10 minutes'; - $expiration = new \DateTime(); - $expiration->modify($duration); + $expiration = new \DateTimeImmutable('+60 minutes'); - // generate a presigned URL that expires after $duration time - $request = $this->getConnection()->createPresignedRequest($command, $duration, []); try { - $presignedUrl = (string)$request->getUri(); + // generate a presigned URL that expires after $expiration time + $presignedUrl = (string)$this->getConnection()->createPresignedRequest($command, $expiration, [ + 'signPayload' => true, + ])->getUri(); } catch (S3Exception $exception) { $this->logger->error($exception->getMessage(), [ 'app' => 'files_external', 'exception' => $exception, ]); + return false; } - $result = [ + return [ 'url' => $presignedUrl, - 'presigned' => true, - 'expiration' => $expiration, + 'expiration' => $expiration->getTimestamp(), ]; - return $result; + } + + #[Override] + public function getDirectDownloadById(string $fileId): array|false { + if (!$this->isUsePresignedUrl()) { + return false; + } + + $entry = $this->getCache()->get((int)$fileId); + return $this->getDirectDownload($entry->getPath()); } } diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index df781723ae743..9e312c6176b34 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -54,21 +54,18 @@ public function isAvailable(FileInfo $file): bool { } private function connectDirect(File $file): string|false { - if (stream_get_meta_data($file->fopen('r'))['seekable'] !== true) { + if ($file->isEncrypted()) { return false; } // Checks for availability to access the video file directly via HTTP/HTTPS. // Returns a string containing URL if available. Only implemented and tested - // with Amazon S3 currently. In all other cases, return false. ffmpeg + // with Amazon S3 currently. In all other cases, return false. ffmpeg // supports other protocols so this function may expand in the future. - $gddValues = $file->getStorage()->getDirectDownload($file->getName()); + $gddValues = $file->getStorage()->getDirectDownloadById((string)$file->getId()); - if (is_array($gddValues)) { - if (array_key_exists('url', $gddValues) && array_key_exists('presigned', $gddValues)) { - $directUrl = (str_starts_with($gddValues['url'], 'http') && ($gddValues['presigned'] === true)) ? $gddValues['url'] : false; - return $directUrl; - } + if (is_array($gddValues) && array_key_exists('url', $gddValues)) { + return str_starts_with($gddValues['url'], 'http') ? $gddValues['url'] : false; } return false; } From a362816337ba54a81a87ff24258415c2f297ef8f Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 2 Jan 2026 11:46:54 +0100 Subject: [PATCH 3/3] feat(external-s3): Expose config option to enable direct s3 preview Signed-off-by: Carl Schwan [skip ci] --- apps/files_external/lib/Lib/Backend/AmazonS3.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/files_external/lib/Lib/Backend/AmazonS3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php index ea518df12e727..606aee0b09d8b 100644 --- a/apps/files_external/lib/Lib/Backend/AmazonS3.php +++ b/apps/files_external/lib/Lib/Backend/AmazonS3.php @@ -27,6 +27,8 @@ public function __construct(IL10N $l, AccessKey $legacyAuth) { ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('port', $l->t('Port'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), + (new DefinitionParameter('proxy', $l->t('Proxy'))) + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('region', $l->t('Region'))) ->setFlag(DefinitionParameter::FLAG_OPTIONAL), (new DefinitionParameter('storageClass', $l->t('Storage Class'))) @@ -41,6 +43,9 @@ public function __construct(IL10N $l, AccessKey $legacyAuth) { (new DefinitionParameter('useMultipartCopy', $l->t('Enable multipart copy'))) ->setType(DefinitionParameter::VALUE_BOOLEAN) ->setDefaultValue(true), + (new DefinitionParameter('use_presigned_url', $l->t('Use presigned S3 url'))) + ->setType(DefinitionParameter::VALUE_BOOLEAN) + ->setDefaultValue(false), (new DefinitionParameter('sse_c_key', $l->t('SSE-C encryption key'))) ->setType(DefinitionParameter::VALUE_PASSWORD) ->setFlag(DefinitionParameter::FLAG_OPTIONAL),