Merge pull request #240 from code-freak/fix/file-upload-path

Fix invalid names for file uploads

src/main/kotlin/de/code_freak/codefreak/util/TarUtil.kt

@@ -174,11 +174,17 @@ object TarUtil {
 
   private fun wrapUploadInTar(file: MultipartFile, out: OutputStream) {
     val outputStream = TarArchiveOutputStream(out)
-    val entry = TarArchiveEntry(file.originalFilename)
+    val entry = TarArchiveEntry(basename(file.originalFilename ?: "file"))
     entry.size = file.size
     outputStream.putArchiveEntry(entry)
     file.inputStream.use { StreamUtils.copy(it, outputStream) }
     outputStream.closeArchiveEntry()
     outputStream.finish()
   }
+
+  private fun basename(path: String): String {
+    path.split("[\\\\/]".toRegex()).apply {
+      return if (isEmpty()) "" else last()
+    }
+  }
 }

src/test/kotlin/de/code_freak/codefreak/util/TarUtilTest.kt

@@ -4,8 +4,10 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.containsInAnyOrder
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Test
 import org.springframework.core.io.ClassPathResource
+import org.springframework.mock.web.MockMultipartFile
 import java.io.ByteArrayOutputStream
 
 internal class TarUtilTest {
@@ -30,4 +32,15 @@ internal class TarUtilTest {
       assertThat(result.mode, `is`(33252))
     }
   }
+
+  @Test
+  fun `file uploads are wrapped in tar`() {
+    val file = MockMultipartFile("file", "C:\\Users\\jdoe\\main.c", "text/plain", "".toByteArray())
+    val out = ByteArrayOutputStream()
+    TarUtil.writeUploadAsTar(file, out)
+    TarArchiveInputStream(out.toByteArray().inputStream()).use {
+      val result = generateSequence { it.nextTarEntry }.filter { it.name == "main.c" }.firstOrNull()
+      assertThat(result, notNullValue())
+    }
+  }
 }