Extend storage service (#903)

Author: Isti01

backend/src/main/kotlin/hu/bme/sch/cmsch/service/FilesystemStorageService.kt

@@ -10,13 +10,16 @@ import org.springframework.web.multipart.MultipartFile
 import org.springframework.web.util.UriComponentsBuilder
 import java.io.File
 import java.io.IOException
+import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
+import java.nio.file.StandardCopyOption
 import java.util.*
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.exists
 import kotlin.io.path.fileSize
+import kotlin.io.path.inputStream
 
 @Service
 @ConditionalOnExpression("'\${hu.bme.sch.cmsch.startup.storage-implementation}'.equalsIgnoreCase(T(hu.bme.sch.cmsch.config.StorageImplementation).FILESYSTEM.name)")
@@ -53,23 +56,32 @@ class FilesystemStorageService(
         return Optional.empty()
     }
 
-
     override fun saveNamedObject(path: String, name: String, file: MultipartFile): Optional<String> {
         if (file.isEmpty || file.contentType == null)
             return Optional.empty()
 
-        return saveNamedObject(path, name, file.contentType ?: defaultContentType, file.bytes)
+        return saveNamedObject(path, name, file.bytes.inputStream())
     }
 
-    override fun saveNamedObject(path: String, name: String, contentType: String, data: ByteArray): Optional<String> {
+    override fun saveNamedObject(
+        path: String,
+        name: String,
+        contentType: String,
+        data: ByteArray
+    ): Optional<String> = saveNamedObject(path, name, data.inputStream())
+
+    override fun saveNamedObject(path: String, name: String, filesystemPath: Path): Optional<String> =
+        saveNamedObject(path, name, filesystemPath.inputStream())
+
+    fun saveNamedObject(path: String, name: String, data: InputStream): Optional<String> {
         val storagePath = getFileStoragePath()
         val dir = File(storagePath, path)
         dir.mkdirs()
 
         try {
             val filePath = getSanitizedPath(getObjectName(path, name))
             if (filePath != null) {
-                Files.write(filePath, data)
+                Files.copy(data, filePath, StandardCopyOption.REPLACE_EXISTING)
                 return Optional.of(constructObjectUrl(path, name))
             }
         } catch (e: IOException) {

backend/src/main/kotlin/hu/bme/sch/cmsch/service/S3StorageService.kt

@@ -12,7 +12,11 @@ import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.model.*
 import java.net.URI
+import java.nio.file.Files
+import java.nio.file.Path
 import java.util.*
+import kotlin.io.path.exists
+import kotlin.io.path.isReadable
 
 @Service
 @ConditionalOnExpression("'\${hu.bme.sch.cmsch.startup.storage-implementation}'.equalsIgnoreCase(T(hu.bme.sch.cmsch.config.StorageImplementation).S3.name)")
@@ -123,6 +127,30 @@ class S3StorageService(
         return Optional.empty()
     }
 
+    override fun saveNamedObject(
+        path: String,
+        name: String,
+        filesystemPath: Path
+    ): Optional<String> {
+        if (!filesystemPath.exists() || !filesystemPath.isReadable()) return Optional.empty()
+
+        try {
+            val fullName = getObjectName(path, name)
+            val contentType = runCatching { Files.probeContentType(filesystemPath) }.getOrNull()
+
+            val request = PutObjectRequest.builder()
+                .bucket(startupPropertyConfig.s3Bucket)
+                .key(fullName)
+                .contentType(contentType)
+                .build()
+            s3.putObject(request, RequestBody.fromFile(filesystemPath))
+            return Optional.of(getS3PublicUrl(fullName))
+        } catch (error: Throwable) {
+            log.error("Failed to upload file {} {}/{} to S3 bucket", filesystemPath, path, name, error)
+        }
+        return Optional.empty()
+    }
+
     override fun readObject(fullName: String): Optional<ByteArray> {
         try {
             val request = GetObjectRequest.builder()

backend/src/main/kotlin/hu/bme/sch/cmsch/service/StorageService.kt

@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.core.io.ClassPathResource
 import org.springframework.http.MediaType
 import org.springframework.web.multipart.MultipartFile
+import java.nio.file.Path
 import java.util.*
 
 interface StorageService {
@@ -41,10 +42,15 @@ interface StorageService {
         data: ByteArray
     ): Optional<String> = saveNamedObject(path, generateName(fileName), contentType, data)
 
+    fun saveObjectWithRandomName(path: String, fileName: String, filesystemPath: Path): Optional<String> =
+        saveNamedObject(path, generateName(fileName), filesystemPath)
+
     fun saveNamedObject(path: String, name: String, file: MultipartFile): Optional<String>
 
     fun saveNamedObject(path: String, name: String, contentType: String, data: ByteArray): Optional<String>
 
+    fun saveNamedObject(path: String, name: String, filesystemPath: Path): Optional<String>
+
     fun readObject(path: String, name: String): Optional<ByteArray> = readObject(getObjectName(path, name))
 
     fun readObject(fullName: String): Optional<ByteArray>

backend/src/main/kotlin/hu/bme/sch/cmsch/util/Utility.kt

@@ -15,6 +15,10 @@ import org.springframework.core.io.ClassPathResource
 import org.springframework.security.core.Authentication
 import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.awaitBody
+import org.springframework.web.reactive.function.client.bodyToMono
+import java.io.InputStream
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import java.util.*
@@ -55,6 +59,12 @@ fun Map<String, String>.urlEncode(): String = this.entries.joinToString("&") {
     URLEncoder.encode(it.key, StandardCharsets.UTF_8) + "=" + URLEncoder.encode(it.value, StandardCharsets.UTF_8)
 }
 
+fun fetchFile(url: String): Result<ByteArray?> = runCatching {
+    WebClient.create()
+        .get().uri(url)
+        .retrieve().bodyToMono<ByteArray>().block()
+}
+
 private val markdownExtensions = listOf(TablesExtension.create())
 private val markdownParser: Parser = Parser.builder().extensions(markdownExtensions).build()
 private val markdownRenderer = HtmlRenderer.builder().extensions(markdownExtensions).build()