From 704ddb3572f1a457f1539371cb35b88dda6bf369 Mon Sep 17 00:00:00 2001 From: Emile Sonneveld Date: Thu, 17 Oct 2024 05:35:23 +0200 Subject: [PATCH] Fix file permissions problem. https://github.com/Open-EO/openeo-geotrellis-extensions/issues/329 --- .../main/scala/org/openeo/geotrellis/geotiff/package.scala | 2 +- .../src/main/scala/org/openeo/geotrellis/package.scala | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala index 7fb433c12..2067799fb 100644 --- a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala +++ b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala @@ -836,7 +836,7 @@ package object geotiff { uploadToS3(tempFile, correctS3Path) } else { - val tempFile = Files.createTempFile(null, ".tif") + val tempFile = getTempFile(null, ".tif") // TODO: Try to run fsync on the file opened by GeoTrellis (without the temporary copy) geoTiff.write(tempFile.toString, optimizedOrder = true) diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/package.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/package.scala index 685f6781a..73fac17fd 100644 --- a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/package.scala +++ b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/package.scala @@ -128,7 +128,9 @@ package object geotrellis { } /** - * Inspired on 'Files.createTempFile' + * Inspired on 'Files.createTempFile', but does not create an empty file. + * The default permissions of 'createTempFile' are a bit too strict too: 600, which is not accessible by other users. + * This function could have default 664 for example. */ def getTempFile(prefix: String, suffix: String): Path = { val prefixNonNull = if (prefix == null) "" else suffix