CB-6011 fix read from s3

dbeaver · Dec 4, 2024 · ef78f5a · ef78f5a
1 parent 0b5af36
commit ef78f5a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...er/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java b/...er/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java
@@ -30,8 +30,10 @@
 import org.jkiss.dbeaver.model.navigator.fs.DBNFileSystems;
 import org.jkiss.dbeaver.model.navigator.fs.DBNPathBase;
 import org.jkiss.dbeaver.registry.fs.FileSystemProviderRegistry;
+import org.jkiss.utils.IOUtils;
 
-import java.nio.charset.StandardCharsets;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.MessageFormat;
@@ -128,8 +130,10 @@ public String readFileContent(@NotNull WebSession webSession, @NotNull String no
         throws DBWebException {
         try {
             Path filePath = FSUtils.getPathFromNode(webSession, nodePath);
-            var data = Files.readAllBytes(filePath);
-            return new String(data, StandardCharsets.UTF_8);
+            // Files.readAllBytes doesn't work for s3 if user doesn't have PutObject permission (need for S3SeekableByteChannel#seek)
+            try (Reader reader = new InputStreamReader(Files.newInputStream(filePath))) {
+                return IOUtils.readToString(reader);
+            }
         } catch (Exception e) {
             throw new DBWebException("Failed to read file content: " + e.getMessage(), e);
         }