file previews

Backend/src/main/java/com/gregor_lohaus/gtransfer/GtransferApplication.java

@@ -1,5 +1,6 @@
 package com.gregor_lohaus.gtransfer;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ImportRuntimeHints;
@@ -9,11 +10,17 @@ import com.gregor_lohaus.gtransfer.config.ConfigRuntimeHints;
 import com.gregor_lohaus.gtransfer.model.ModelRuntimeHints;
 import com.gregor_lohaus.gtransfer.native_image.HibernateRuntimeHints;
 import com.gregor_lohaus.gtransfer.native_image.WebRuntimeHints;
+import com.gregor_lohaus.gtransfer.services.filecleanup.FileCleanupService;
+
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @RestController
+@EnableScheduling
 @ImportRuntimeHints({ConfigRuntimeHints.class, HibernateRuntimeHints.class, ModelRuntimeHints.class, WebRuntimeHints.class})
 public class GtransferApplication {
+	@Autowired
+	private FileCleanupService cleanupService;
 	public static void main(String[] args) {
 		SpringApplication.run(GtransferApplication.class, args);
 	}

Backend/src/main/java/com/gregor_lohaus/gtransfer/config/ConfigRuntimeHints.java

@@ -55,6 +55,16 @@ public class ConfigRuntimeHints implements RuntimeHintsRegistrar {
         MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
         MemberCategory.ACCESS_DECLARED_FIELDS,
         MemberCategory.ACCESS_PUBLIC_FIELDS);
+    hints.reflection().registerType(ServerConfig.class,
+        MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+        MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
+        MemberCategory.ACCESS_DECLARED_FIELDS,
+        MemberCategory.ACCESS_PUBLIC_FIELDS);
+    hints.reflection().registerType(SslConfig.class,
+        MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+        MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
+        MemberCategory.ACCESS_DECLARED_FIELDS,
+        MemberCategory.ACCESS_PUBLIC_FIELDS);
     hints.reflection().registerType(TypeAdapter.class,
         MemberCategory.ACCESS_DECLARED_FIELDS,
         MemberCategory.ACCESS_PUBLIC_FIELDS);

Backend/src/main/java/com/gregor_lohaus/gtransfer/config/DefaultConfig.java

@@ -6,8 +6,10 @@ import com.gregor_lohaus.gtransfer.config.types.Config;
 import com.gregor_lohaus.gtransfer.config.types.DataSourceConfig;
 import com.gregor_lohaus.gtransfer.config.types.JpaConfig;
 import com.gregor_lohaus.gtransfer.config.types.MultipartConfig;
+import com.gregor_lohaus.gtransfer.config.types.ServerConfig;
 import com.gregor_lohaus.gtransfer.config.types.ServletConfig;
 import com.gregor_lohaus.gtransfer.config.types.SpringConfig;
+import com.gregor_lohaus.gtransfer.config.types.SslConfig;
 import com.gregor_lohaus.gtransfer.config.types.StorageService;
 import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
 import com.gregor_lohaus.gtransfer.config.types.UploadConfig;
@@ -44,11 +46,17 @@ public class DefaultConfig {
 
     c.springConfig = sc;
 
+    ServerConfig svc2 = new ServerConfig();
+    svc2.port = 8080;
+    SslConfig ssl = new SslConfig();
+    ssl.enabled = false;
+    svc2.sslConfig = ssl;
+    c.serverConfig = svc2;
+
     UploadConfig uc = new UploadConfig();
     uc.maxDownloadLimit = 100;
     uc.maxExpiryDays = 30;
     uc.cleanupEnabled = true;
-    uc.cleanupIntervalMs = 3600000L;
     c.uploadConfig = uc;
 
     config = c;

Backend/src/main/java/com/gregor_lohaus/gtransfer/config/types/Config.java

@@ -9,6 +9,9 @@ public class Config implements TomlSerializable {
   @Nested(name = "spring")
   @NoPrefix
   public SpringConfig springConfig;
+  @Nested(name = "server")
+  @NoPrefix
+  public ServerConfig serverConfig;
   @Nested(name = "storageService")
   public StorageService storageService;
   @Nested(name = "upload")

Backend/src/main/java/com/gregor_lohaus/gtransfer/config/types/ServerConfig.java

@@ -0,0 +1,13 @@
+package com.gregor_lohaus.gtransfer.config.types;
+
+import com.gregor_lohaus.gtransfer.config.annotations.Nested;
+import com.gregor_lohaus.gtransfer.config.annotations.Property;
+
+import io.github.wasabithumb.jtoml.serial.TomlSerializable;
+
+public class ServerConfig implements TomlSerializable {
+  @Property(name = "port")
+  public Integer port;
+  @Nested(name = "ssl")
+  public SslConfig sslConfig;
+}

Backend/src/main/java/com/gregor_lohaus/gtransfer/config/types/SslConfig.java

@@ -0,0 +1,14 @@
+package com.gregor_lohaus.gtransfer.config.types;
+
+import com.gregor_lohaus.gtransfer.config.annotations.Property;
+
+import io.github.wasabithumb.jtoml.serial.TomlSerializable;
+
+public class SslConfig implements TomlSerializable {
+  @Property(name = "enabled")
+  public Boolean enabled;
+  @Property(name = "certificate")
+  public String certificate;
+  @Property(name = "certificate-private-key")
+  public String certificatePrivateKey;
+}

Backend/src/main/java/com/gregor_lohaus/gtransfer/config/types/UploadConfig.java

@@ -11,6 +11,4 @@ public class UploadConfig implements TomlSerializable {
   public Integer maxExpiryDays;
   @Property(name = "cleanupEnabled")
   public Boolean cleanupEnabled;
-  @Property(name = "cleanupIntervalMs")
-  public Long cleanupIntervalMs;
 }

Backend/src/main/java/com/gregor_lohaus/gtransfer/controller/Env.java

@@ -1,28 +0,0 @@
-package com.gregor_lohaus.gtransfer.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.gregor_lohaus.gtransfer.services.filewriter.AbstractStorageService;
-
-@RestController
-public class Env {
-	@Autowired
-	private ConfigurableEnvironment env;
-	@Autowired
-	private AbstractStorageService storageService;
-  @GetMapping("/env")
-  public String env() {
-		StringBuilder b = new StringBuilder();
-		MutablePropertySources sources = this.env.getPropertySources();
-		sources.forEach((var m) -> {
-			b.append(m.toString());
-			b.append("\n");
-		});
-		b.append(storageService.getClass().toString());
-		return b.toString();
-  }
-}

Backend/src/main/java/com/gregor_lohaus/gtransfer/services/filecleanup/FileCleanupService.java

@@ -1,4 +1,4 @@
-package com.gregor_lohaus.gtransfer.services;
+package com.gregor_lohaus.gtransfer.services.filecleanup;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -15,10 +15,11 @@ import com.gregor_lohaus.gtransfer.model.File;
 import com.gregor_lohaus.gtransfer.model.FileRepository;
 import com.gregor_lohaus.gtransfer.services.filewriter.AbstractStorageService;
 
-@Component
-@ConditionalOnProperty(name = "gtransfer-config.upload.cleanupEnabled", havingValue = "true", matchIfMissing = true)
 public class FileCleanupService {
-
+    private Boolean enabled;
+    public FileCleanupService(Boolean enabled) {
+        this.enabled = enabled;
+    }
     private static final Logger log = LoggerFactory.getLogger(FileCleanupService.class);
 
     @Autowired
@@ -27,17 +28,24 @@ public class FileCleanupService {
     @Autowired
     private AbstractStorageService storageService;
 
-    @Scheduled(fixedDelayString = "${gtransfer-config.upload.cleanupIntervalMs:3600000}")
+    @Scheduled(fixedDelay = 30000)
     @Transactional
     public void cleanupExpiredFiles() {
+        log.info("Cleaneup started");
+        if (!enabled) {
+            log.info("Cleaneup skipped");
+            return;            
+        }
         List<File> expired = fileRepository.findExpired(LocalDateTime.now());
-        if (expired.isEmpty()) return;
+        if (expired.isEmpty()) {
+            log.info("Nothing to clean up");
+            return;
+        };
 
         for (File file : expired) {
             storageService.delete(file.getId());
             fileRepository.delete(file);
         }
-
         log.info("Cleaned up {} expired file(s)", expired.size());
     }
 }

Backend/src/main/java/com/gregor_lohaus/gtransfer/services/filecleanup/FileCleanupServiceConfiguration.java

@@ -0,0 +1,19 @@
+
+package com.gregor_lohaus.gtransfer.services.filecleanup;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
+
+@Configuration
+public class FileCleanupServiceConfiguration {
+  @Bean
+  public FileCleanupService fileCleanupService(
+    @Value("${gtransfer-config.upload.cleanupEnabled}")
+    Boolean enabled
+  ) {
+    return new FileCleanupService(enabled);
+  }
+}

Backend/src/main/java/com/gregor_lohaus/gtransfer/services/filewriter/StorageServiceConfiguration.java

@@ -5,12 +5,10 @@ import java.nio.file.Path;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
 
 @Configuration
-@EnableScheduling
 public class StorageServiceConfiguration {
 
     //TODO S3 implementation

Backend/src/main/resources/static/download.js

@@ -25,22 +25,7 @@ if (!fragment) {
         setStatus('Decrypting\u2026');
         const plaintext = await decryptFile(await response.arrayBuffer(), key);
 
-        const url = URL.createObjectURL(new Blob([plaintext]));
+        showPreview(filename, plaintext);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = filename;
-
-        htmx.swap(htmx.find('#download-state'), `
-            <div class="drop-zone-icon mb-3">&#x1F512;</div>
-            <div class="fw-medium mb-2">${filename}</div>
-            <button id="download-btn" class="btn btn-outline-success mt-2">Download</button>`,
-            { swapStyle: 'innerHTML' });
-
-        htmx.on(htmx.find('#download-btn'), 'click', () => {
-            a.click();
-            URL.revokeObjectURL(url);
-            showSuccess(filename);
-        });
     }
 } catch (err) {
     showError('Decryption failed: ' + err.message);
@@ -51,10 +36,89 @@ function setStatus(msg) {
     if (el) el.textContent = msg;
 }
 
+function escapeHtml(str) {
+    return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+
+function getMimeType(filename) {
+    const ext = filename.split('.').pop().toLowerCase();
+    const types = {
+        jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', gif: 'image/gif',
+        webp: 'image/webp', svg: 'image/svg+xml', bmp: 'image/bmp', ico: 'image/x-icon',
+        mp4: 'video/mp4', webm: 'video/webm', ogv: 'video/ogg', mov: 'video/quicktime',
+        mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', flac: 'audio/flac',
+        aac: 'audio/aac', m4a: 'audio/mp4',
+        txt: 'text/plain', md: 'text/plain', csv: 'text/csv', log: 'text/plain',
+        json: 'application/json', xml: 'text/xml',
+        js: 'text/plain', ts: 'text/plain', py: 'text/plain', java: 'text/plain',
+        c: 'text/plain', cpp: 'text/plain', h: 'text/plain', sh: 'text/plain',
+        yaml: 'text/plain', yml: 'text/plain', toml: 'text/plain', ini: 'text/plain',
+        pdf: 'application/pdf',
+    };
+    return types[ext] || 'application/octet-stream';
+}
+
+function showPreview(filename, plaintext) {
+    const mimeType = getMimeType(filename);
+    const blob = new Blob([plaintext], { type: mimeType });
+    const url = URL.createObjectURL(blob);
+    window.addEventListener('unload', () => URL.revokeObjectURL(url));
+
+    const name = escapeHtml(filename);
+    const downloadBtn = `<button id="download-btn" class="btn btn-outline-success mt-2">Download</button>`;
+    let previewHtml;
+
+    if (mimeType.startsWith('image/')) {
+        previewHtml = `
+            <img src="${url}" alt="${name}" class="preview-media mb-3">
+            <div class="fw-medium mb-2">${name}</div>
+            ${downloadBtn}`;
+    } else if (mimeType.startsWith('video/')) {
+        previewHtml = `
+            <video src="${url}" controls class="preview-media mb-3"></video>
+            <div class="fw-medium mb-2">${name}</div>
+            ${downloadBtn}`;
+    } else if (mimeType.startsWith('audio/')) {
+        previewHtml = `
+            <div class="drop-zone-icon mb-3">&#x1F3B5;</div>
+            <div class="fw-medium mb-2">${name}</div>
+            <audio src="${url}" controls class="preview-audio mb-3"></audio>
+            ${downloadBtn}`;
+    } else if (mimeType === 'application/pdf') {
+        previewHtml = `
+            <div class="fw-medium mb-2">${name}</div>
+            <iframe src="${url}" class="preview-pdf mb-3"></iframe>
+            ${downloadBtn}`;
+    } else if (mimeType.startsWith('text/') || mimeType === 'application/json') {
+        const text = new TextDecoder().decode(plaintext);
+        const preview = text.length > 10000 ? text.slice(0, 10000) + '\n\u2026' : text;
+        previewHtml = `
+            <div class="fw-medium mb-2">${name}</div>
+            <pre class="preview-text mb-3">${escapeHtml(preview)}</pre>
+            ${downloadBtn}`;
+    } else {
+        previewHtml = `
+            <div class="drop-zone-icon mb-3">&#x1F4C4;</div>
+            <div class="fw-medium mb-2">${name}</div>
+            ${downloadBtn}`;
+    }
+
+    htmx.swap(htmx.find('#download-state'), previewHtml, { swapStyle: 'innerHTML' });
+
+    htmx.on(htmx.find('#download-btn'), 'click', () => {
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = filename;
+        a.click();
+        showSuccess(filename);
+    });
+}
+
 function showSuccess(filename) {
+    const name = escapeHtml(filename);
     htmx.swap(htmx.find('#download-state'), `
         <div class="drop-zone-icon mb-3">&#x2705;</div>
-        <div class="fw-medium mb-1">${filename}</div>
+        <div class="fw-medium mb-1">${name}</div>
         <div class="drop-zone-text mb-3">Your download has started.</div>
         <a href="/" class="btn btn-link drop-zone-text text-decoration-none">Send a file</a>`,
         { swapStyle: 'innerHTML' });
@@ -63,7 +127,7 @@ function showSuccess(filename) {
 function showError(msg) {
     htmx.swap(htmx.find('#download-state'), `
         <div class="drop-zone-icon mb-3">&#x26A0;</div>
-        <div class="drop-zone-text mb-3">${msg}</div>
+        <div class="drop-zone-text mb-3">${escapeHtml(msg)}</div>
         <a href="/" class="btn btn-link drop-zone-text text-decoration-none">Go home</a>`,
         { swapStyle: 'innerHTML' });
 }

Backend/src/main/resources/static/style.css

@@ -65,3 +65,37 @@ footer, footer a {
 footer a:hover {
     color: #8b949e;
 }
+
+.preview-media {
+    max-width: 100%;
+    border-radius: 8px;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.preview-audio {
+    width: 100%;
+}
+
+.preview-pdf {
+    width: 100%;
+    height: 420px;
+    border: none;
+    border-radius: 8px;
+    display: block;
+}
+
+.preview-text {
+    text-align: left;
+    max-height: 320px;
+    overflow: auto;
+    background: #0d1117;
+    padding: 1rem;
+    border-radius: 8px;
+    font-size: 0.78rem;
+    color: #e6edf3;
+    border: 1px solid #30363d;
+    white-space: pre-wrap;
+    word-break: break-word;
+}