Compare commits
8 Commits
expiery
...
128d294ea1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
128d294ea1 | ||
|
|
dba1d571e7 | ||
|
|
cb1f47fec1 | ||
|
|
405714a6ae | ||
|
|
9a46cd0814 | ||
|
|
3a2ff0fc5b | ||
|
|
e78ebb25c3 | ||
|
|
0d34b632ac |
@@ -1,5 +1,6 @@
|
|||||||
package com.gregor_lohaus.gtransfer;
|
package com.gregor_lohaus.gtransfer;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.context.annotation.ImportRuntimeHints;
|
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.model.ModelRuntimeHints;
|
||||||
import com.gregor_lohaus.gtransfer.native_image.HibernateRuntimeHints;
|
import com.gregor_lohaus.gtransfer.native_image.HibernateRuntimeHints;
|
||||||
import com.gregor_lohaus.gtransfer.native_image.WebRuntimeHints;
|
import com.gregor_lohaus.gtransfer.native_image.WebRuntimeHints;
|
||||||
|
import com.gregor_lohaus.gtransfer.services.filecleanup.FileCleanupService;
|
||||||
|
|
||||||
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@RestController
|
@RestController
|
||||||
|
@EnableScheduling
|
||||||
@ImportRuntimeHints({ConfigRuntimeHints.class, HibernateRuntimeHints.class, ModelRuntimeHints.class, WebRuntimeHints.class})
|
@ImportRuntimeHints({ConfigRuntimeHints.class, HibernateRuntimeHints.class, ModelRuntimeHints.class, WebRuntimeHints.class})
|
||||||
public class GtransferApplication {
|
public class GtransferApplication {
|
||||||
|
@Autowired
|
||||||
|
private FileCleanupService cleanupService;
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SpringApplication.run(GtransferApplication.class, args);
|
SpringApplication.run(GtransferApplication.class, args);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,16 @@ public class ConfigRuntimeHints implements RuntimeHintsRegistrar {
|
|||||||
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
|
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
|
||||||
MemberCategory.ACCESS_DECLARED_FIELDS,
|
MemberCategory.ACCESS_DECLARED_FIELDS,
|
||||||
MemberCategory.ACCESS_PUBLIC_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,
|
hints.reflection().registerType(TypeAdapter.class,
|
||||||
MemberCategory.ACCESS_DECLARED_FIELDS,
|
MemberCategory.ACCESS_DECLARED_FIELDS,
|
||||||
MemberCategory.ACCESS_PUBLIC_FIELDS);
|
MemberCategory.ACCESS_PUBLIC_FIELDS);
|
||||||
|
|||||||
@@ -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.DataSourceConfig;
|
||||||
import com.gregor_lohaus.gtransfer.config.types.JpaConfig;
|
import com.gregor_lohaus.gtransfer.config.types.JpaConfig;
|
||||||
import com.gregor_lohaus.gtransfer.config.types.MultipartConfig;
|
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.ServletConfig;
|
||||||
import com.gregor_lohaus.gtransfer.config.types.SpringConfig;
|
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.StorageService;
|
||||||
import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
|
import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
|
||||||
import com.gregor_lohaus.gtransfer.config.types.UploadConfig;
|
import com.gregor_lohaus.gtransfer.config.types.UploadConfig;
|
||||||
@@ -44,11 +46,17 @@ public class DefaultConfig {
|
|||||||
|
|
||||||
c.springConfig = sc;
|
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();
|
UploadConfig uc = new UploadConfig();
|
||||||
uc.maxDownloadLimit = 100;
|
uc.maxDownloadLimit = 100;
|
||||||
uc.maxExpiryDays = 30;
|
uc.maxExpiryDays = 30;
|
||||||
uc.cleanupEnabled = true;
|
uc.cleanupEnabled = true;
|
||||||
uc.cleanupIntervalMs = 3600000L;
|
|
||||||
c.uploadConfig = uc;
|
c.uploadConfig = uc;
|
||||||
|
|
||||||
config = c;
|
config = c;
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ public class Config implements TomlSerializable {
|
|||||||
@Nested(name = "spring")
|
@Nested(name = "spring")
|
||||||
@NoPrefix
|
@NoPrefix
|
||||||
public SpringConfig springConfig;
|
public SpringConfig springConfig;
|
||||||
|
@Nested(name = "server")
|
||||||
|
@NoPrefix
|
||||||
|
public ServerConfig serverConfig;
|
||||||
@Nested(name = "storageService")
|
@Nested(name = "storageService")
|
||||||
public StorageService storageService;
|
public StorageService storageService;
|
||||||
@Nested(name = "upload")
|
@Nested(name = "upload")
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -11,6 +11,4 @@ public class UploadConfig implements TomlSerializable {
|
|||||||
public Integer maxExpiryDays;
|
public Integer maxExpiryDays;
|
||||||
@Property(name = "cleanupEnabled")
|
@Property(name = "cleanupEnabled")
|
||||||
public Boolean cleanupEnabled;
|
public Boolean cleanupEnabled;
|
||||||
@Property(name = "cleanupIntervalMs")
|
|
||||||
public Long cleanupIntervalMs;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import org.springframework.http.MediaType;
|
|||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.ui.Model;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
@@ -28,10 +27,8 @@ public class DownloadController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private AbstractStorageService storageService;
|
private AbstractStorageService storageService;
|
||||||
|
|
||||||
@GetMapping("/download/{id}")
|
@GetMapping("/download")
|
||||||
public String page(@PathVariable String id, Model model) {
|
public String page() {
|
||||||
fileRepository.findById(id)
|
|
||||||
.ifPresent(f -> model.addAttribute("filename", f.getName()));
|
|
||||||
return "download/page";
|
return "download/page";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -45,8 +45,7 @@ public class UploadController {
|
|||||||
@RequestParam("hash") String hash,
|
@RequestParam("hash") String hash,
|
||||||
@RequestParam("name") String name,
|
@RequestParam("name") String name,
|
||||||
@RequestParam(required = false) Integer expiryDays,
|
@RequestParam(required = false) Integer expiryDays,
|
||||||
@RequestParam(required = false) Integer downloadLimit,
|
@RequestParam(required = false) Integer downloadLimit) throws IOException {
|
||||||
Model model) throws IOException {
|
|
||||||
|
|
||||||
storageService.put(hash, file.getBytes());
|
storageService.put(hash, file.getBytes());
|
||||||
|
|
||||||
@@ -57,7 +56,6 @@ public class UploadController {
|
|||||||
f.setDownloadLimit(limit);
|
f.setDownloadLimit(limit);
|
||||||
fileRepository.save(f);
|
fileRepository.save(f);
|
||||||
|
|
||||||
model.addAttribute("id", hash);
|
|
||||||
return "upload/result :: view";
|
return "upload/result :: view";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.gregor_lohaus.gtransfer.services;
|
package com.gregor_lohaus.gtransfer.services.filecleanup;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
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.model.FileRepository;
|
||||||
import com.gregor_lohaus.gtransfer.services.filewriter.AbstractStorageService;
|
import com.gregor_lohaus.gtransfer.services.filewriter.AbstractStorageService;
|
||||||
|
|
||||||
@Component
|
|
||||||
@ConditionalOnProperty(name = "gtransfer-config.upload.cleanupEnabled", havingValue = "true", matchIfMissing = true)
|
|
||||||
public class FileCleanupService {
|
public class FileCleanupService {
|
||||||
|
private Boolean enabled;
|
||||||
|
public FileCleanupService(Boolean enabled) {
|
||||||
|
this.enabled = enabled;
|
||||||
|
}
|
||||||
private static final Logger log = LoggerFactory.getLogger(FileCleanupService.class);
|
private static final Logger log = LoggerFactory.getLogger(FileCleanupService.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -27,17 +28,24 @@ public class FileCleanupService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private AbstractStorageService storageService;
|
private AbstractStorageService storageService;
|
||||||
|
|
||||||
@Scheduled(fixedDelayString = "${gtransfer-config.upload.cleanupIntervalMs:3600000}")
|
@Scheduled(fixedDelay = 30000)
|
||||||
@Transactional
|
@Transactional
|
||||||
public void cleanupExpiredFiles() {
|
public void cleanupExpiredFiles() {
|
||||||
|
log.info("Cleaneup started");
|
||||||
|
if (!enabled) {
|
||||||
|
log.info("Cleaneup skipped");
|
||||||
|
return;
|
||||||
|
}
|
||||||
List<File> expired = fileRepository.findExpired(LocalDateTime.now());
|
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) {
|
for (File file : expired) {
|
||||||
storageService.delete(file.getId());
|
storageService.delete(file.getId());
|
||||||
fileRepository.delete(file);
|
fileRepository.delete(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info("Cleaned up {} expired file(s)", expired.size());
|
log.info("Cleaned up {} expired file(s)", expired.size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,12 +5,10 @@ import java.nio.file.Path;
|
|||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
||||||
|
|
||||||
import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
|
import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableScheduling
|
|
||||||
public class StorageServiceConfiguration {
|
public class StorageServiceConfiguration {
|
||||||
|
|
||||||
//TODO S3 implementation
|
//TODO S3 implementation
|
||||||
|
|||||||
@@ -16,13 +16,32 @@ async function encryptFile(arrayBuffer) {
|
|||||||
|
|
||||||
// SHA-256(rawKey) → file identifier sent to server; server never sees the key itself
|
// SHA-256(rawKey) → file identifier sent to server; server never sees the key itself
|
||||||
const rawKey = await crypto.subtle.exportKey('raw', key);
|
const rawKey = await crypto.subtle.exportKey('raw', key);
|
||||||
const hash = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', rawKey)))
|
const hash = await hashKey(rawKey);
|
||||||
.map(b => b.toString(16).padStart(2, '0'))
|
|
||||||
.join('');
|
|
||||||
|
|
||||||
// Base64url-encode key for URL fragment
|
const base64urlKey = encodeKey(rawKey);
|
||||||
const base64urlKey = btoa(String.fromCharCode(...new Uint8Array(rawKey)))
|
|
||||||
.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
|
|
||||||
|
|
||||||
return { payload, hash, base64urlKey };
|
return { payload, hash, base64urlKey };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function hashKey(rawKey) {
|
||||||
|
return Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', rawKey)))
|
||||||
|
.map(b => b.toString(16).padStart(2, '0'))
|
||||||
|
.join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function decryptFile(payload, key) {
|
||||||
|
const bytes = new Uint8Array(payload);
|
||||||
|
const iv = bytes.slice(0, 12);
|
||||||
|
const ciphertext = bytes.slice(12);
|
||||||
|
return crypto.subtle.decrypt({ name: 'AES-GCM', iv }, key, ciphertext);
|
||||||
|
}
|
||||||
|
|
||||||
|
function encodeKey(rawKey) {
|
||||||
|
return btoa(String.fromCharCode(...new Uint8Array(rawKey)))
|
||||||
|
.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
function decodeKey(base64url) {
|
||||||
|
const base64 = base64url.replace(/-/g, '+').replace(/_/g, '/');
|
||||||
|
return Uint8Array.from(atob(base64), c => c.charCodeAt(0));
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,87 +1,133 @@
|
|||||||
(async function () {
|
|
||||||
const fragment = location.hash.slice(1);
|
const fragment = location.hash.slice(1);
|
||||||
if (!fragment) {
|
if (!fragment) {
|
||||||
showError('No decryption key found in URL.');
|
showError('No decryption key found in URL.');
|
||||||
return;
|
} else try {
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setStatus('Deriving key\u2026');
|
setStatus('Deriving key\u2026');
|
||||||
|
|
||||||
// Decode base64url → raw key bytes
|
const rawKeyBytes = decodeKey(fragment);
|
||||||
const base64 = fragment.replace(/-/g, '+').replace(/_/g, '/');
|
const id = await hashKey(rawKeyBytes);
|
||||||
const rawKeyBytes = Uint8Array.from(atob(base64), c => c.charCodeAt(0));
|
|
||||||
|
|
||||||
// Import key
|
|
||||||
const key = await crypto.subtle.importKey(
|
const key = await crypto.subtle.importKey(
|
||||||
'raw', rawKeyBytes, { name: 'AES-GCM' }, false, ['decrypt']
|
'raw', rawKeyBytes, { name: 'AES-GCM' }, false, ['decrypt']
|
||||||
);
|
);
|
||||||
|
|
||||||
// Derive hash → verify it matches the file ID in the URL
|
|
||||||
const hash = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', rawKeyBytes)))
|
|
||||||
.map(b => b.toString(16).padStart(2, '0'))
|
|
||||||
.join('');
|
|
||||||
|
|
||||||
const pathId = location.pathname.split('/').pop();
|
|
||||||
if (hash !== pathId) {
|
|
||||||
showError('Invalid link — key does not match file.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setStatus('Downloading\u2026');
|
setStatus('Downloading\u2026');
|
||||||
const response = await fetch(location.pathname + '/data');
|
const response = await fetch('/download/' + id + '/data');
|
||||||
|
|
||||||
if (response.status === 410) {
|
if (response.status === 410) {
|
||||||
showError('This file has expired or reached its download limit.');
|
showError('This file has expired or reached its download limit.');
|
||||||
return;
|
} else if (!response.ok) {
|
||||||
}
|
|
||||||
if (!response.ok) {
|
|
||||||
showError(`Download failed (${response.status}).`);
|
showError(`Download failed (${response.status}).`);
|
||||||
return;
|
} else {
|
||||||
}
|
|
||||||
|
|
||||||
// Extract filename from Content-Disposition header
|
|
||||||
const disposition = response.headers.get('Content-Disposition') || '';
|
const disposition = response.headers.get('Content-Disposition') || '';
|
||||||
const filename = disposition.match(/filename="?([^"]+)"?/)?.[1] || 'download';
|
const filename = disposition.match(/filename="?([^"]+)"?/)?.[1] || 'download';
|
||||||
|
|
||||||
setStatus('Decrypting\u2026');
|
setStatus('Decrypting\u2026');
|
||||||
const encrypted = new Uint8Array(await response.arrayBuffer());
|
const plaintext = await decryptFile(await response.arrayBuffer(), key);
|
||||||
const iv = encrypted.slice(0, 12);
|
|
||||||
const ciphertext = encrypted.slice(12);
|
|
||||||
|
|
||||||
const plaintext = await crypto.subtle.decrypt({ name: 'AES-GCM', iv }, key, ciphertext);
|
showPreview(filename, plaintext);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
showError('Decryption failed: ' + err.message);
|
||||||
|
}
|
||||||
|
|
||||||
// Trigger browser download
|
function setStatus(msg) {
|
||||||
const url = URL.createObjectURL(new Blob([plaintext]));
|
const el = htmx.find('#download-status');
|
||||||
|
if (el) el.textContent = msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
function escapeHtml(str) {
|
||||||
|
return str.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"');
|
||||||
|
}
|
||||||
|
|
||||||
|
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">🎵</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">📄</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');
|
const a = document.createElement('a');
|
||||||
a.href = url;
|
a.href = url;
|
||||||
a.download = filename;
|
a.download = filename;
|
||||||
a.click();
|
a.click();
|
||||||
URL.revokeObjectURL(url);
|
|
||||||
|
|
||||||
showSuccess(filename);
|
showSuccess(filename);
|
||||||
|
});
|
||||||
} catch (err) {
|
|
||||||
showError('Decryption failed: ' + err.message);
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
|
|
||||||
function setStatus(msg) {
|
|
||||||
const el = document.getElementById('download-status');
|
|
||||||
if (el) el.textContent = msg;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function showSuccess(filename) {
|
function showSuccess(filename) {
|
||||||
document.getElementById('download-state').innerHTML = `
|
const name = escapeHtml(filename);
|
||||||
|
htmx.swap(htmx.find('#download-state'), `
|
||||||
<div class="drop-zone-icon mb-3">✅</div>
|
<div class="drop-zone-icon mb-3">✅</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>
|
<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>`;
|
<a href="/" class="btn btn-link drop-zone-text text-decoration-none">Send a file</a>`,
|
||||||
|
{ swapStyle: 'innerHTML' });
|
||||||
}
|
}
|
||||||
|
|
||||||
function showError(msg) {
|
function showError(msg) {
|
||||||
document.getElementById('download-state').innerHTML = `
|
htmx.swap(htmx.find('#download-state'), `
|
||||||
<div class="drop-zone-icon mb-3">⚠</div>
|
<div class="drop-zone-icon mb-3">⚠</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>`;
|
<a href="/" class="btn btn-link drop-zone-text text-decoration-none">Go home</a>`,
|
||||||
|
{ swapStyle: 'innerHTML' });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,3 +65,37 @@ footer, footer a {
|
|||||||
footer a:hover {
|
footer a:hover {
|
||||||
color: #8b949e;
|
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;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,54 +1,50 @@
|
|||||||
const dropZone = document.getElementById('drop-zone');
|
const dropZone = htmx.find('#drop-zone');
|
||||||
const fileInput = document.getElementById('file-input');
|
const fileInput = htmx.find('#file-input');
|
||||||
const promptHtml = dropZone.innerHTML;
|
const promptHtml = dropZone.innerHTML;
|
||||||
|
|
||||||
let selectedFile = null;
|
let selectedFile = null;
|
||||||
|
|
||||||
// ── File selection ────────────────────────────────────────────────────────────
|
htmx.on(dropZone, 'click', () => {
|
||||||
|
|
||||||
dropZone.addEventListener('click', () => {
|
|
||||||
if (selectedFile === null) fileInput.click();
|
if (selectedFile === null) fileInput.click();
|
||||||
});
|
});
|
||||||
|
|
||||||
fileInput.addEventListener('change', e => {
|
htmx.on(fileInput, 'change', e => {
|
||||||
if (e.target.files[0]) onFileSelected(e.target.files[0]);
|
if (e.target.files[0]) onFileSelected(e.target.files[0]);
|
||||||
});
|
});
|
||||||
|
|
||||||
dropZone.addEventListener('dragover', e => {
|
htmx.on(dropZone, 'dragover', e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
dropZone.classList.add('dragover');
|
htmx.addClass(dropZone, 'dragover');
|
||||||
});
|
});
|
||||||
|
|
||||||
dropZone.addEventListener('dragleave', () => dropZone.classList.remove('dragover'));
|
htmx.on(dropZone, 'dragleave', () => htmx.removeClass(dropZone, 'dragover'));
|
||||||
|
|
||||||
dropZone.addEventListener('drop', e => {
|
htmx.on(dropZone, 'drop', e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
dropZone.classList.remove('dragover');
|
htmx.removeClass(dropZone, 'dragover');
|
||||||
if (e.dataTransfer.files[0] && selectedFile === null) onFileSelected(e.dataTransfer.files[0]);
|
if (e.dataTransfer.files[0] && selectedFile === null) onFileSelected(e.dataTransfer.files[0]);
|
||||||
});
|
});
|
||||||
|
|
||||||
function onFileSelected(file) {
|
function onFileSelected(file) {
|
||||||
selectedFile = file;
|
selectedFile = file;
|
||||||
// Use htmx to fetch the options form — server renders max values from config
|
|
||||||
htmx.ajax('GET', '/upload/options?name=' + encodeURIComponent(file.name), {
|
htmx.ajax('GET', '/upload/options?name=' + encodeURIComponent(file.name), {
|
||||||
target: '#drop-zone',
|
target: '#drop-zone',
|
||||||
swap: 'innerHTML'
|
swap: 'innerHTML'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Upload (called from onclick in server-rendered options form) ──────────────
|
|
||||||
|
|
||||||
async function startUpload() {
|
async function startUpload() {
|
||||||
const expiryDays = document.getElementById('expiry-days')?.value;
|
const expiryDays = htmx.find('#expiry-days')?.value;
|
||||||
const downloadLimit = document.getElementById('download-limit')?.value;
|
const downloadLimit = htmx.find('#download-limit')?.value;
|
||||||
|
|
||||||
dropZone.innerHTML = `
|
htmx.swap(dropZone, `
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<div class="spinner-border text-success" role="status">
|
<div class="spinner-border text-success" role="status">
|
||||||
<span class="visually-hidden">Loading\u2026</span>
|
<span class="visually-hidden">Loading\u2026</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="drop-zone-text" id="upload-status">Encrypting\u2026</div>`;
|
<div class="drop-zone-text" id="upload-status">Encrypting\u2026</div>`,
|
||||||
|
{ swapStyle: 'innerHTML' });
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { payload, hash, base64urlKey } = await encryptFile(await selectedFile.arrayBuffer());
|
const { payload, hash, base64urlKey } = await encryptFile(await selectedFile.arrayBuffer());
|
||||||
@@ -65,38 +61,33 @@ async function startUpload() {
|
|||||||
const response = await fetch('/upload', { method: 'POST', body: formData });
|
const response = await fetch('/upload', { method: 'POST', body: formData });
|
||||||
if (!response.ok) throw new Error(`Server error ${response.status}`);
|
if (!response.ok) throw new Error(`Server error ${response.status}`);
|
||||||
|
|
||||||
// Server returns HTML fragment; prepend origin and append key fragment client-side
|
htmx.swap(dropZone, await response.text(), { swapStyle: 'innerHTML' });
|
||||||
dropZone.innerHTML = await response.text();
|
|
||||||
htmx.process(dropZone);
|
htmx.process(dropZone);
|
||||||
const shareLink = document.getElementById('share-link');
|
htmx.find('#share-link').value = window.location.origin + '/download#' + base64urlKey;
|
||||||
shareLink.value = window.location.origin + shareLink.value + '#' + base64urlKey;
|
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
dropZone.innerHTML = `
|
htmx.swap(dropZone, `
|
||||||
<div class="drop-zone-icon mb-3">⚠</div>
|
<div class="drop-zone-icon mb-3">⚠</div>
|
||||||
<div class="drop-zone-text mb-3">${err.message}</div>
|
<div class="drop-zone-text mb-3">${err.message}</div>
|
||||||
<button class="btn btn-link drop-zone-text text-decoration-none" onclick="resetUpload()">Try again</button>`;
|
<button class="btn btn-link drop-zone-text text-decoration-none" onclick="resetUpload()">Try again</button>`,
|
||||||
|
{ swapStyle: 'innerHTML' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function setStatus(msg) {
|
function setStatus(msg) {
|
||||||
const el = document.getElementById('upload-status');
|
const el = htmx.find('#upload-status');
|
||||||
if (el) el.textContent = msg;
|
if (el) el.textContent = msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Reset (called from onclick in server-rendered fragments) ──────────────────
|
|
||||||
|
|
||||||
function resetUpload() {
|
function resetUpload() {
|
||||||
selectedFile = null;
|
selectedFile = null;
|
||||||
fileInput.value = '';
|
fileInput.value = '';
|
||||||
dropZone.innerHTML = promptHtml;
|
htmx.swap(dropZone, promptHtml, { swapStyle: 'innerHTML' });
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Copy link (called from onclick in result fragment) ────────────────────────
|
|
||||||
|
|
||||||
async function copyLink() {
|
async function copyLink() {
|
||||||
await navigator.clipboard.writeText(document.getElementById('share-link').value);
|
await navigator.clipboard.writeText(htmx.find('#share-link').value);
|
||||||
const btn = document.getElementById('copy-btn');
|
const btn = htmx.find('#copy-btn');
|
||||||
btn.textContent = 'Copied!';
|
btn.textContent = 'Copied!';
|
||||||
setTimeout(() => { btn.textContent = 'Copy'; }, 2000);
|
setTimeout(() => { btn.textContent = 'Copy'; }, 2000);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,12 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title th:text="${filename != null ? filename + ' — GTransfer' : 'GTransfer'}">GTransfer</title>
|
<title>GTransfer</title>
|
||||||
<link rel="stylesheet" th:href="@{/webjars/bootstrap/dist/css/bootstrap.min.css}">
|
<link rel="stylesheet" th:href="@{/webjars/bootstrap/dist/css/bootstrap.min.css}">
|
||||||
<link rel="stylesheet" th:href="@{/style.css}">
|
<link rel="stylesheet" th:href="@{/style.css}">
|
||||||
<script th:src="@{/download.js}" defer></script>
|
<script th:src="@{/webjars/htmx.org/dist/htmx.min.js}" defer></script>
|
||||||
|
<script th:src="@{/crypto.js}" defer></script>
|
||||||
|
<script th:src="@{/download.js}" type="module"></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="d-flex flex-column min-vh-100">
|
<body class="d-flex flex-column min-vh-100">
|
||||||
|
|
||||||
@@ -18,7 +20,6 @@
|
|||||||
<main class="flex-grow-1 d-flex align-items-center justify-content-center py-5 px-3">
|
<main class="flex-grow-1 d-flex align-items-center justify-content-center py-5 px-3">
|
||||||
<div id="download-state" class="drop-zone text-center py-5 px-4" style="max-width: 520px; width: 100%;">
|
<div id="download-state" class="drop-zone text-center py-5 px-4" style="max-width: 520px; width: 100%;">
|
||||||
<div class="drop-zone-icon mb-3">🔒</div>
|
<div class="drop-zone-icon mb-3">🔒</div>
|
||||||
<div class="fw-medium mb-2" th:if="${filename != null}" th:text="${filename}"></div>
|
|
||||||
<div class="drop-zone-text" id="download-status">Preparing…</div>
|
<div class="drop-zone-text" id="download-status">Preparing…</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -5,8 +5,7 @@
|
|||||||
<div class="drop-zone-icon mb-3">✅</div>
|
<div class="drop-zone-icon mb-3">✅</div>
|
||||||
<div class="drop-zone-text mb-3">Your file is ready to share</div>
|
<div class="drop-zone-text mb-3">Your file is ready to share</div>
|
||||||
<div class="input-group mb-2">
|
<div class="input-group mb-2">
|
||||||
<input type="text" id="share-link" class="form-control form-control-sm"
|
<input type="text" id="share-link" class="form-control form-control-sm" readonly>
|
||||||
th:value="@{/download/{id}(id=${id})}" readonly>
|
|
||||||
<button id="copy-btn" class="btn btn-outline-success btn-sm" onclick="copyLink()">Copy</button>
|
<button id="copy-btn" class="btn btn-outline-success btn-sm" onclick="copyLink()">Copy</button>
|
||||||
</div>
|
</div>
|
||||||
<button class="btn btn-link drop-zone-text text-decoration-none small" onclick="resetUpload()">
|
<button class="btn btn-link drop-zone-text text-decoration-none small" onclick="resetUpload()">
|
||||||
|
|||||||
45
README.md
Normal file
45
README.md
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
# GTransfer
|
||||||
|
|
||||||
|
A self-hosted, end-to-end encrypted file transfer service. The server stores only ciphertext and never has access to encryption keys or plaintext.
|
||||||
|
|
||||||
|
## How encryption works
|
||||||
|
|
||||||
|
### Upload
|
||||||
|
|
||||||
|
1. **Key generation** — the browser generates a random 256-bit AES-GCM key using the [Web Crypto API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API). The key never leaves the browser.
|
||||||
|
|
||||||
|
2. **Encryption** — the file is encrypted with AES-GCM. A random 96-bit (12-byte) IV is generated for each upload. The IV is prepended to the ciphertext to produce the payload:
|
||||||
|
```
|
||||||
|
payload = IV (12 bytes) || ciphertext
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **File ID** — the server needs a way to identify the file without knowing the key. The client computes `SHA-256(rawKey)` and uses the hex digest as the file ID. This is a one-way operation — the server cannot reverse it to obtain the key.
|
||||||
|
|
||||||
|
4. **Upload** — the encrypted payload and file ID are sent to the server. The server stores the ciphertext and records the file ID, name, expiry, and download limit in the database.
|
||||||
|
|
||||||
|
5. **Share link** — the raw key is base64url-encoded and placed in the [URL fragment](https://developer.mozilla.org/en-US/docs/Web/API/URL/hash):
|
||||||
|
```
|
||||||
|
https://example.com/download#<base64url(rawKey)>
|
||||||
|
```
|
||||||
|
Browsers never include the fragment in HTTP requests, so the key is never transmitted to the server.
|
||||||
|
|
||||||
|
### Download
|
||||||
|
|
||||||
|
1. **Key extraction** — the browser reads the key from the URL fragment and decodes it from base64url.
|
||||||
|
|
||||||
|
2. **File lookup** — the client computes `SHA-256(rawKey)` to derive the file ID and fetches the encrypted payload from `/download/<id>/data`.
|
||||||
|
|
||||||
|
3. **Decryption** — the IV is read from the first 12 bytes of the payload, and the remainder is decrypted with AES-GCM. AES-GCM is authenticated encryption, so any tampering with the ciphertext causes decryption to fail with an authentication error.
|
||||||
|
|
||||||
|
4. **Download** — the plaintext is written to a `Blob` and the browser is prompted to save it.
|
||||||
|
|
||||||
|
### Security properties
|
||||||
|
|
||||||
|
| Property | Detail |
|
||||||
|
|---|---|
|
||||||
|
| Encryption | AES-256-GCM |
|
||||||
|
| IV | 96-bit random, unique per upload |
|
||||||
|
| Key derivation | None — key is randomly generated |
|
||||||
|
| File ID | SHA-256(rawKey) — server cannot reverse to key |
|
||||||
|
| Key transport | URL fragment — never sent to server |
|
||||||
|
| Server access | Ciphertext, file metadata, SHA-256 of key only |
|
||||||
Reference in New Issue
Block a user