fix: ensure proper lock release and error handling in objectfs manipu…

…lator
catalyst · Jan 23, 2025 · 06ac446 · 06ac446
1 parent 0c2b62d
commit 06ac446
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/classes/local/store/object_file_system.php b/classes/local/store/object_file_system.php
@@ -178,11 +178,13 @@ protected function get_mimetype_from_hash(string $contenthash): string {
 
         // We limit 1 because multiple files can have the same contenthash.
         // However, they all have the same mimetype so it does not matter which one we query.
-        return $DB->get_field_sql('SELECT mimetype
+        $mimetype = $DB->get_field_sql('SELECT mimetype
                               FROM {files}
                              WHERE contenthash = :hash
                              LIMIT 1',
                         ['hash' => $contenthash]);
+
+        return $mimetype ?? '';                   
     }
 
     /**

diff --git a/classes/local/store/s3/client.php b/classes/local/store/s3/client.php
@@ -513,7 +513,7 @@ public function upload_to_s3($localpath, $contenthash, string $mimetype) {
                 $this->client, $this->bucket,
                 $this->bucketkeyprefix . $externalpath,
                 $filehandle,
-                'private',
+                'bucket-owner-full-control',
                 [
                     'params' => [
                         'ContentType' => $mimetype,