Compare commits
33 Commits
bd72a98e64
...
chunked
| Author | SHA1 | Date | |
|---|---|---|---|
| f5e024f41c | |||
| 0c3f8353be | |||
| af02e24b4e | |||
| be5b9e0626 | |||
|
|
edf55a02c2 | ||
|
|
c4dc527110 | ||
|
|
268d234f98 | ||
|
|
98b09c58a4 | ||
|
|
85eed9527e | ||
|
|
9332d54cf2 | ||
|
|
edb8300ef7 | ||
|
|
8e5e84565c | ||
|
|
5af2edca59 | ||
|
|
5074cb62e3 | ||
|
|
f114b3a776 | ||
|
|
dd31c35e70 | ||
|
|
7d28a11d81 | ||
|
|
9de644097a | ||
|
|
cb7360585d | ||
|
|
f691c83315 | ||
|
|
e270438331 | ||
|
|
f824386fd1 | ||
|
|
5476011192 | ||
|
|
7b16329adb | ||
|
|
56b1da10b8 | ||
|
|
84a255abac | ||
|
|
5d5003d4ae | ||
|
|
4231cc74cf | ||
|
|
786ceaa0ca | ||
|
|
1d2b420ab1 | ||
|
|
c5f312b33f | ||
|
|
b4e033f905 | ||
|
|
12b5afe120 |
41
.gitea/workflows/deploy.yaml
Normal file
41
.gitea/workflows/deploy.yaml
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
name: Deploy
|
||||||
|
run-name: ${{ gitea.actor }} deployed latest version 🚀
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- "main"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Explore-Gitea-Actions:
|
||||||
|
runs-on: x86
|
||||||
|
container:
|
||||||
|
image: gitea.gregorlohaus.com/gregor/graal:latest
|
||||||
|
credentials:
|
||||||
|
username: lohausgregor@gmail.com
|
||||||
|
password: ${{ secrets.REGPASS }}
|
||||||
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- run: /usr/local/bin/docker-entrypoint.sh postgres &
|
||||||
|
- name: build
|
||||||
|
working-directory: ${{ gitea.workspace }}/Backend
|
||||||
|
env:
|
||||||
|
JAVA_HOME: /root/.sdkman/candidates/java/current
|
||||||
|
run: /root/.sdkman/candidates/gradle/9.4.0/bin/gradle build
|
||||||
|
- name: deploy
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
eval "$(ssh-agent -s)"
|
||||||
|
ssh-add <(echo "${{ secrets.DEPLOYSSHKEY }}")
|
||||||
|
mkdir -p ~/.ssh
|
||||||
|
ssh-keyscan 162.55.217.172 >> ~/.ssh/known_hosts
|
||||||
|
scp ${{ gitea.workspace }}/Backend/build/native/nativeCompile/gtransfer anon@162.55.217.172:/home/anon/.local/bin/gtransfernew
|
||||||
|
ssh anon@162.55.217.172 "chmod +x /home/anon/.local/bin/gtransfernew"
|
||||||
|
ssh anon@162.55.217.172 "mv /home/anon/.local/bin/gtransfer /home/anon/.local/bin/gtransferback"
|
||||||
|
ssh anon@162.55.217.172 "mv /home/anon/.local/bin/gtransfernew /home/anon/.local/bin/gtransfer"
|
||||||
|
ssh anon@162.55.217.172 "sudo systemctl restart gtransfer"
|
||||||
|
# - name: upload binary
|
||||||
|
# uses: https://gitea.com/actions/gitea-upload-artifact@v4
|
||||||
|
# with:
|
||||||
|
# name: gtransfer
|
||||||
|
# path: ${{ gitea.workspace }}/Backend/build/native/nativeCompile/gtransfer
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@ devenv.local.nix
|
|||||||
# pre-commit
|
# pre-commit
|
||||||
.pre-commit-config.yaml
|
.pre-commit-config.yaml
|
||||||
.gradle
|
.gradle
|
||||||
|
layout.kdl
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
.gradle
|
.gradle
|
||||||
bin
|
bin
|
||||||
build
|
build
|
||||||
|
.devenv
|
||||||
|
|||||||
@@ -20,12 +20,15 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation 'com.google.code.gson:gson:2.10.1'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||||
implementation 'org.webjars:webjars-locator-lite'
|
implementation 'org.webjars:webjars-locator-lite'
|
||||||
implementation 'org.webjars.npm:htmx.org:2.0.4'
|
implementation 'org.webjars.npm:htmx.org:2.0.4'
|
||||||
implementation 'org.webjars.npm:bootstrap:5.3.3'
|
implementation 'org.webjars.npm:bootstrap:5.3.3'
|
||||||
|
implementation platform('software.amazon.awssdk:bom:2.45.1')
|
||||||
|
implementation 'software.amazon.awssdk:s3'
|
||||||
runtimeOnly 'org.postgresql:postgresql'
|
runtimeOnly 'org.postgresql:postgresql'
|
||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
@@ -33,6 +36,16 @@ dependencies {
|
|||||||
implementation 'io.github.wasabithumb:jtoml-serializer-reflect:1.4.2'
|
implementation 'io.github.wasabithumb:jtoml-serializer-reflect:1.4.2'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
graalvmNative {
|
||||||
|
binaries {
|
||||||
|
main {
|
||||||
|
buildArgs.add("--static-nolibc")
|
||||||
|
buildArgs.add("--libc=glibc")
|
||||||
|
buildArgs.add("--verbose")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import com.gregor_lohaus.gtransfer.config.types.Config;
|
import com.gregor_lohaus.gtransfer.config.types.Config;
|
||||||
|
// import com.google.gson.Gson;
|
||||||
|
// import com.google.gson.GsonBuilder;
|
||||||
import org.springframework.boot.EnvironmentPostProcessor;
|
import org.springframework.boot.EnvironmentPostProcessor;
|
||||||
// import org.springframework.boot.env.EnvironmentPostProcessor;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
import org.springframework.core.env.ConfigurableEnvironment;
|
||||||
|
|
||||||
@@ -41,6 +41,10 @@ public class ConfigEnvironmentPostProcessor implements EnvironmentPostProcessor
|
|||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
Config defaultConfig = DefaultConfig.config;
|
Config defaultConfig = DefaultConfig.config;
|
||||||
|
// Gson gson = new GsonBuilder().setPrettyPrinting().serializeNulls().create();
|
||||||
|
// String json = gson.toJson(defaultConfig);
|
||||||
|
// System.out.println(json);
|
||||||
|
|
||||||
table = ConfigSerializer.toToml(defaultConfig);
|
table = ConfigSerializer.toToml(defaultConfig);
|
||||||
toml.write(CONFIG_FILE_PATH, table);
|
toml.write(CONFIG_FILE_PATH, table);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,6 +50,21 @@ 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(UploadConfig.class,
|
||||||
|
MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
|
||||||
|
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,
|
hints.reflection().registerType(TypeAdapter.class,
|
||||||
MemberCategory.ACCESS_DECLARED_FIELDS,
|
MemberCategory.ACCESS_DECLARED_FIELDS,
|
||||||
MemberCategory.ACCESS_PUBLIC_FIELDS);
|
MemberCategory.ACCESS_PUBLIC_FIELDS);
|
||||||
|
|||||||
@@ -6,10 +6,13 @@ 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;
|
||||||
|
|
||||||
public class DefaultConfig {
|
public class DefaultConfig {
|
||||||
public static final Config config;
|
public static final Config config;
|
||||||
@@ -19,6 +22,12 @@ public class DefaultConfig {
|
|||||||
StorageService ss = new StorageService();
|
StorageService ss = new StorageService();
|
||||||
ss.type = StorageServiceType.LOCAL;
|
ss.type = StorageServiceType.LOCAL;
|
||||||
ss.path = Path.of(System.getProperty("user.home"),".local","share","gtransfer").toString();
|
ss.path = Path.of(System.getProperty("user.home"),".local","share","gtransfer").toString();
|
||||||
|
ss.bucket = "";
|
||||||
|
ss.region = "us-east-1";
|
||||||
|
ss.endpoint = "";
|
||||||
|
ss.accessKeyId = "";
|
||||||
|
ss.secretAccessKey = "";
|
||||||
|
ss.pathStyleAccessEnabled = false;
|
||||||
c.storageService= ss;
|
c.storageService= ss;
|
||||||
|
|
||||||
SpringConfig sc = new SpringConfig();
|
SpringConfig sc = new SpringConfig();
|
||||||
@@ -42,6 +51,22 @@ public class DefaultConfig {
|
|||||||
sc.servletConfig = svc;
|
sc.servletConfig = svc;
|
||||||
|
|
||||||
c.springConfig = sc;
|
c.springConfig = sc;
|
||||||
|
|
||||||
|
ServerConfig svc2 = new ServerConfig();
|
||||||
|
svc2.port = 8080;
|
||||||
|
SslConfig ssl = new SslConfig();
|
||||||
|
ssl.enabled = false;
|
||||||
|
ssl.certificatePrivateKey = "";
|
||||||
|
ssl.certificate = "";
|
||||||
|
svc2.sslConfig = ssl;
|
||||||
|
c.serverConfig = svc2;
|
||||||
|
|
||||||
|
UploadConfig uc = new UploadConfig();
|
||||||
|
uc.maxDownloadLimit = 100;
|
||||||
|
uc.maxExpiryDays = 30;
|
||||||
|
uc.cleanupEnabled = true;
|
||||||
|
c.uploadConfig = uc;
|
||||||
|
|
||||||
config = c;
|
config = c;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,11 @@ 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")
|
||||||
|
public UploadConfig uploadConfig;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -9,4 +9,16 @@ public class StorageService implements TomlSerializable {
|
|||||||
public StorageServiceType type;
|
public StorageServiceType type;
|
||||||
@Property(name = "root")
|
@Property(name = "root")
|
||||||
public String path;
|
public String path;
|
||||||
|
@Property(name = "bucket")
|
||||||
|
public String bucket;
|
||||||
|
@Property(name = "region")
|
||||||
|
public String region;
|
||||||
|
@Property(name = "endpoint")
|
||||||
|
public String endpoint;
|
||||||
|
@Property(name = "accessKeyId")
|
||||||
|
public String accessKeyId;
|
||||||
|
@Property(name = "secretAccessKey")
|
||||||
|
public String secretAccessKey;
|
||||||
|
@Property(name = "pathStyleAccessEnabled")
|
||||||
|
public Boolean pathStyleAccessEnabled;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 UploadConfig implements TomlSerializable {
|
||||||
|
@Property(name = "maxDownloadLimit")
|
||||||
|
public Integer maxDownloadLimit;
|
||||||
|
@Property(name = "maxExpiryDays")
|
||||||
|
public Integer maxExpiryDays;
|
||||||
|
@Property(name = "cleanupEnabled")
|
||||||
|
public Boolean cleanupEnabled;
|
||||||
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
package com.gregor_lohaus.gtransfer.controller;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
|
|
||||||
|
import com.gregor_lohaus.gtransfer.model.File;
|
||||||
|
import com.gregor_lohaus.gtransfer.model.FileRepository;
|
||||||
|
import com.gregor_lohaus.gtransfer.services.filewriter.AbstractStorageService;
|
||||||
|
import com.gregor_lohaus.gtransfer.services.filewriter.StorageKeys;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
public class DownloadController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileRepository fileRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private AbstractStorageService storageService;
|
||||||
|
|
||||||
|
@GetMapping("/download")
|
||||||
|
public String page() {
|
||||||
|
return "download/page";
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/download/{id}/metadata")
|
||||||
|
@ResponseBody
|
||||||
|
@Transactional
|
||||||
|
public ResponseEntity<Map<String, Object>> metadata(@PathVariable String id) {
|
||||||
|
AvailableFile available = getAvailableFile(id);
|
||||||
|
if (!available.found()) {
|
||||||
|
return ResponseEntity.status(available.status()).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
File file = available.file();
|
||||||
|
return ResponseEntity.ok(Map.of(
|
||||||
|
"name", file.getName(),
|
||||||
|
"chunkCount", file.getChunkCount()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/download/{id}/chunk/{index}")
|
||||||
|
@ResponseBody
|
||||||
|
@Transactional
|
||||||
|
public ResponseEntity<byte[]> chunk(@PathVariable String id, @PathVariable Integer index) {
|
||||||
|
AvailableFile available = getAvailableFile(id);
|
||||||
|
if (!available.found()) {
|
||||||
|
return ResponseEntity.status(available.status()).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
File file = available.file();
|
||||||
|
if (index == null || index < 0 || index >= file.getChunkCount()) {
|
||||||
|
return ResponseEntity.badRequest().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
Optional<byte[]> data = storageService.get(StorageKeys.chunk(file.getId(), index));
|
||||||
|
if (data.isEmpty()) {
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||||
|
.body(data.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/download/{id}/complete")
|
||||||
|
@ResponseBody
|
||||||
|
@Transactional
|
||||||
|
public ResponseEntity<Void> complete(@PathVariable String id) {
|
||||||
|
AvailableFile available = getAvailableFile(id);
|
||||||
|
if (!available.found()) {
|
||||||
|
return ResponseEntity.status(available.status()).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
File file = available.file();
|
||||||
|
file.setDownloads(file.getDownloads() + 1);
|
||||||
|
fileRepository.save(file);
|
||||||
|
|
||||||
|
if (file.getDownloadLimit() != null && file.getDownloads() >= file.getDownloadLimit()) {
|
||||||
|
deleteStoredFile(file);
|
||||||
|
fileRepository.delete(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.noContent().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private AvailableFile getAvailableFile(String id) {
|
||||||
|
Optional<File> fileOpt = fileRepository.findById(id);
|
||||||
|
if (fileOpt.isEmpty()) {
|
||||||
|
return AvailableFile.notFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
File file = fileOpt.get();
|
||||||
|
if (file.getExpireyDateTime() != null && LocalDateTime.now().isAfter(file.getExpireyDateTime())) {
|
||||||
|
deleteStoredFile(file);
|
||||||
|
fileRepository.delete(file);
|
||||||
|
return AvailableFile.gone();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (file.getDownloadLimit() != null && file.getDownloads() >= file.getDownloadLimit()) {
|
||||||
|
deleteStoredFile(file);
|
||||||
|
fileRepository.delete(file);
|
||||||
|
return AvailableFile.gone();
|
||||||
|
}
|
||||||
|
|
||||||
|
return AvailableFile.ok(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void deleteStoredFile(File file) {
|
||||||
|
for (int i = 0; i < file.getChunkCount(); i++) {
|
||||||
|
storageService.delete(StorageKeys.chunk(file.getId(), i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private record AvailableFile(File file, HttpStatus status) {
|
||||||
|
static AvailableFile ok(File file) {
|
||||||
|
return new AvailableFile(file, HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
static AvailableFile notFound() {
|
||||||
|
return new AvailableFile(null, HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
static AvailableFile gone() {
|
||||||
|
return new AvailableFile(null, HttpStatus.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean found() {
|
||||||
|
return file != null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,37 +1,89 @@
|
|||||||
package com.gregor_lohaus.gtransfer.controller;
|
package com.gregor_lohaus.gtransfer.controller;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Map;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.OptionalLong;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import com.gregor_lohaus.gtransfer.model.File;
|
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;
|
||||||
|
import com.gregor_lohaus.gtransfer.services.filewriter.StorageKeys;
|
||||||
|
|
||||||
@RestController
|
@Controller
|
||||||
public class UploadController {
|
public class UploadController {
|
||||||
|
|
||||||
|
@Value("${gtransfer-config.upload.maxDownloadLimit:100}")
|
||||||
|
private Integer maxDownloadLimit;
|
||||||
|
|
||||||
|
@Value("${gtransfer-config.upload.maxExpiryDays:30}")
|
||||||
|
private Integer maxExpiryDays;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private AbstractStorageService storageService;
|
private AbstractStorageService storageService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileRepository fileRepository;
|
private FileRepository fileRepository;
|
||||||
|
|
||||||
|
@GetMapping("/upload/options")
|
||||||
|
public String options(@RequestParam String name, Model model) {
|
||||||
|
model.addAttribute("name", name);
|
||||||
|
model.addAttribute("maxExpiryDays", maxExpiryDays);
|
||||||
|
model.addAttribute("maxDownloadLimit", maxDownloadLimit);
|
||||||
|
return "upload/options :: form";
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/upload")
|
@PostMapping("/upload")
|
||||||
public ResponseEntity<Map<String, String>> upload(
|
public String upload(
|
||||||
@RequestParam("file") MultipartFile file,
|
|
||||||
@RequestParam("hash") String hash,
|
@RequestParam("hash") String hash,
|
||||||
@RequestParam("name") String name) throws IOException {
|
@RequestParam("name") String name,
|
||||||
|
@RequestParam("chunkCount") Integer chunkCount,
|
||||||
|
@RequestParam(required = false) Integer expiryDays,
|
||||||
|
@RequestParam(required = false) Integer downloadLimit) {
|
||||||
|
if (!isValidId(hash) || chunkCount == null || chunkCount < 1) {
|
||||||
|
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid upload metadata");
|
||||||
|
}
|
||||||
|
|
||||||
storageService.put(hash, file.getBytes());
|
int days = expiryDays != null ? Math.min(expiryDays, maxExpiryDays) : maxExpiryDays;
|
||||||
fileRepository.save(new File(hash, hash, name, null));
|
Integer limit = downloadLimit != null ? Math.min(downloadLimit, maxDownloadLimit) : null;
|
||||||
|
|
||||||
return ResponseEntity.ok(Map.of("id", hash));
|
File f = new File(hash, hash, name, LocalDateTime.now().plusDays(days));
|
||||||
|
f.setChunkCount(chunkCount);
|
||||||
|
f.setDownloadLimit(limit);
|
||||||
|
fileRepository.save(f);
|
||||||
|
|
||||||
|
return "upload/result :: view";
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/upload/chunk")
|
||||||
|
public ResponseEntity<Void> uploadChunk(
|
||||||
|
@RequestParam("chunk") MultipartFile chunk,
|
||||||
|
@RequestParam("hash") String hash,
|
||||||
|
@RequestParam("index") Integer index) throws IOException {
|
||||||
|
if (!isValidId(hash) || index == null || index < 0) {
|
||||||
|
return ResponseEntity.badRequest().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
OptionalLong written = storageService.put(StorageKeys.chunk(hash, index), chunk.getBytes());
|
||||||
|
if (written.isEmpty()) {
|
||||||
|
return ResponseEntity.internalServerError().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.noContent().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isValidId(String id) {
|
||||||
|
return id != null && id.matches("[a-f0-9]{64}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,11 @@ public class File {
|
|||||||
private String id;
|
private String id;
|
||||||
private String path;
|
private String path;
|
||||||
private String name;
|
private String name;
|
||||||
|
private Integer chunkCount;
|
||||||
private LocalDateTime expireyDateTime;
|
private LocalDateTime expireyDateTime;
|
||||||
private Integer downloadLimit;
|
private Integer downloadLimit;
|
||||||
|
@Column(columnDefinition = "integer default 0")
|
||||||
|
private int downloads = 0;
|
||||||
public LocalDateTime getExpireyDateTime() {
|
public LocalDateTime getExpireyDateTime() {
|
||||||
return expireyDateTime;
|
return expireyDateTime;
|
||||||
}
|
}
|
||||||
@@ -39,12 +42,24 @@ public class File {
|
|||||||
public void setName(String name) {
|
public void setName(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
public Integer getChunkCount() {
|
||||||
|
return chunkCount == null ? 1 : chunkCount;
|
||||||
|
}
|
||||||
|
public void setChunkCount(Integer chunkCount) {
|
||||||
|
this.chunkCount = chunkCount;
|
||||||
|
}
|
||||||
public Integer getDownloadLimit() {
|
public Integer getDownloadLimit() {
|
||||||
return downloadLimit;
|
return downloadLimit;
|
||||||
}
|
}
|
||||||
public void setDownloadLimit(Integer downloadLimit) {
|
public void setDownloadLimit(Integer downloadLimit) {
|
||||||
this.downloadLimit = downloadLimit;
|
this.downloadLimit = downloadLimit;
|
||||||
}
|
}
|
||||||
|
public int getDownloads() {
|
||||||
|
return downloads;
|
||||||
|
}
|
||||||
|
public void setDownloads(int downloads) {
|
||||||
|
this.downloads = downloads;
|
||||||
|
}
|
||||||
public File(String id, String path, String name, LocalDateTime expDateTime) {
|
public File(String id, String path, String name, LocalDateTime expDateTime) {
|
||||||
this.path = path;
|
this.path = path;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
|||||||
@@ -1,8 +1,16 @@
|
|||||||
package com.gregor_lohaus.gtransfer.model;
|
package com.gregor_lohaus.gtransfer.model;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface FileRepository extends JpaRepository<File, String> {
|
public interface FileRepository extends JpaRepository<File, String> {
|
||||||
|
|
||||||
|
@Query("SELECT f FROM File f WHERE f.expireyDateTime IS NOT NULL AND f.expireyDateTime < :now")
|
||||||
|
List<File> findExpired(@Param("now") LocalDateTime now);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package com.gregor_lohaus.gtransfer.services.filecleanup;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import com.gregor_lohaus.gtransfer.model.File;
|
||||||
|
import com.gregor_lohaus.gtransfer.model.FileRepository;
|
||||||
|
import com.gregor_lohaus.gtransfer.services.filewriter.AbstractStorageService;
|
||||||
|
import com.gregor_lohaus.gtransfer.services.filewriter.StorageKeys;
|
||||||
|
|
||||||
|
public class FileCleanupService {
|
||||||
|
private Boolean enabled;
|
||||||
|
public FileCleanupService(Boolean enabled) {
|
||||||
|
this.enabled = enabled;
|
||||||
|
}
|
||||||
|
private static final Logger log = LoggerFactory.getLogger(FileCleanupService.class);
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileRepository fileRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private AbstractStorageService storageService;
|
||||||
|
|
||||||
|
@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()) {
|
||||||
|
log.info("Nothing to clean up");
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
for (File file : expired) {
|
||||||
|
deleteStoredFile(file);
|
||||||
|
fileRepository.delete(file);
|
||||||
|
}
|
||||||
|
log.info("Cleaned up {} expired file(s)", expired.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void deleteStoredFile(File file) {
|
||||||
|
for (int i = 0; i < file.getChunkCount(); i++) {
|
||||||
|
storageService.delete(StorageKeys.chunk(file.getId(), i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,4 +13,5 @@ public abstract class AbstractStorageService {
|
|||||||
|
|
||||||
abstract public OptionalLong put(String id, byte[] data);
|
abstract public OptionalLong put(String id, byte[] data);
|
||||||
abstract public Optional<byte[]> get(String id);
|
abstract public Optional<byte[]> get(String id);
|
||||||
|
abstract public boolean delete(String id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,4 +19,9 @@ public class DummyStorageService extends AbstractStorageService {
|
|||||||
public Optional<byte[]> get(String id) {
|
public Optional<byte[]> get(String id) {
|
||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean delete(String id) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,8 +15,12 @@ public class LocalStorageService extends AbstractStorageService {
|
|||||||
@Override
|
@Override
|
||||||
public OptionalLong put(String id, byte[] data) {
|
public OptionalLong put(String id, byte[] data) {
|
||||||
try {
|
try {
|
||||||
Files.createDirectories(root);
|
Path target = root.resolve(id);
|
||||||
Files.write(root.resolve(id), data);
|
Path parent = target.getParent();
|
||||||
|
if (parent != null) {
|
||||||
|
Files.createDirectories(parent);
|
||||||
|
}
|
||||||
|
Files.write(target, data);
|
||||||
return OptionalLong.of(data.length);
|
return OptionalLong.of(data.length);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
return OptionalLong.empty();
|
return OptionalLong.empty();
|
||||||
@@ -33,4 +37,13 @@ public class LocalStorageService extends AbstractStorageService {
|
|||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean delete(String id) {
|
||||||
|
try {
|
||||||
|
return Files.deleteIfExists(root.resolve(id));
|
||||||
|
} catch (IOException e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,191 @@
|
|||||||
|
package com.gregor_lohaus.gtransfer.services.filewriter;
|
||||||
|
|
||||||
|
import java.net.URI;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.OptionalLong;
|
||||||
|
|
||||||
|
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
|
||||||
|
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
|
||||||
|
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
|
||||||
|
import software.amazon.awssdk.core.ResponseBytes;
|
||||||
|
import software.amazon.awssdk.core.exception.SdkException;
|
||||||
|
import software.amazon.awssdk.core.sync.RequestBody;
|
||||||
|
import software.amazon.awssdk.regions.Region;
|
||||||
|
import software.amazon.awssdk.services.s3.S3Client;
|
||||||
|
import software.amazon.awssdk.services.s3.S3ClientBuilder;
|
||||||
|
import software.amazon.awssdk.services.s3.S3Configuration;
|
||||||
|
import software.amazon.awssdk.services.s3.model.BucketAlreadyExistsException;
|
||||||
|
import software.amazon.awssdk.services.s3.model.BucketAlreadyOwnedByYouException;
|
||||||
|
import software.amazon.awssdk.services.s3.model.BucketLocationConstraint;
|
||||||
|
import software.amazon.awssdk.services.s3.model.CreateBucketConfiguration;
|
||||||
|
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
|
||||||
|
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
|
||||||
|
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
|
||||||
|
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
|
||||||
|
import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
|
||||||
|
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
|
||||||
|
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
|
||||||
|
import software.amazon.awssdk.services.s3.model.S3Exception;
|
||||||
|
|
||||||
|
public class S3StorageService extends AbstractStorageService {
|
||||||
|
private final S3Client client;
|
||||||
|
private final String bucket;
|
||||||
|
private final String prefix;
|
||||||
|
private final String region;
|
||||||
|
|
||||||
|
public S3StorageService(
|
||||||
|
String bucket,
|
||||||
|
String region,
|
||||||
|
String prefix,
|
||||||
|
String endpoint,
|
||||||
|
String accessKeyId,
|
||||||
|
String secretAccessKey,
|
||||||
|
boolean pathStyleAccessEnabled) {
|
||||||
|
super(Path.of(""));
|
||||||
|
if (bucket == null || bucket.isBlank()) {
|
||||||
|
throw new IllegalArgumentException("S3 storage requires a bucket");
|
||||||
|
}
|
||||||
|
this.bucket = bucket;
|
||||||
|
this.region = blankToDefault(region, "us-east-1");
|
||||||
|
this.prefix = normalizePrefix(prefix);
|
||||||
|
this.client = createClient(this.region, endpoint, accessKeyId, secretAccessKey, pathStyleAccessEnabled);
|
||||||
|
ensureBucketExists();
|
||||||
|
}
|
||||||
|
|
||||||
|
private S3Client createClient(
|
||||||
|
String region,
|
||||||
|
String endpoint,
|
||||||
|
String accessKeyId,
|
||||||
|
String secretAccessKey,
|
||||||
|
boolean pathStyleAccessEnabled) {
|
||||||
|
S3ClientBuilder builder = S3Client.builder()
|
||||||
|
.region(Region.of(blankToDefault(region, "us-east-1")))
|
||||||
|
.serviceConfiguration(S3Configuration.builder()
|
||||||
|
.pathStyleAccessEnabled(pathStyleAccessEnabled)
|
||||||
|
.build());
|
||||||
|
|
||||||
|
if (endpoint != null && !endpoint.isBlank()) {
|
||||||
|
builder.endpointOverride(URI.create(endpoint));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (accessKeyId != null && !accessKeyId.isBlank()) {
|
||||||
|
if (secretAccessKey == null || secretAccessKey.isBlank()) {
|
||||||
|
throw new IllegalArgumentException("S3 storage requires a secretAccessKey when accessKeyId is set");
|
||||||
|
}
|
||||||
|
builder.credentialsProvider(
|
||||||
|
StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKeyId, secretAccessKey)));
|
||||||
|
} else {
|
||||||
|
builder.credentialsProvider(DefaultCredentialsProvider.create());
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ensureBucketExists() {
|
||||||
|
try {
|
||||||
|
client.headBucket(HeadBucketRequest.builder()
|
||||||
|
.bucket(bucket)
|
||||||
|
.build());
|
||||||
|
return;
|
||||||
|
} catch (S3Exception e) {
|
||||||
|
if (e.statusCode() != 404) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
client.createBucket(createBucketRequest());
|
||||||
|
} catch (BucketAlreadyOwnedByYouException e) {
|
||||||
|
return;
|
||||||
|
} catch (BucketAlreadyExistsException e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private CreateBucketRequest createBucketRequest() {
|
||||||
|
CreateBucketRequest.Builder builder = CreateBucketRequest.builder()
|
||||||
|
.bucket(bucket);
|
||||||
|
|
||||||
|
if (!region.equals("us-east-1")) {
|
||||||
|
builder.createBucketConfiguration(CreateBucketConfiguration.builder()
|
||||||
|
.locationConstraint(BucketLocationConstraint.fromValue(region))
|
||||||
|
.build());
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String blankToDefault(String value, String defaultValue) {
|
||||||
|
if (value == null || value.isBlank()) {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String normalizePrefix(String value) {
|
||||||
|
if (value == null || value.isBlank()) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
String normalized = value;
|
||||||
|
while (normalized.startsWith("/")) {
|
||||||
|
normalized = normalized.substring(1);
|
||||||
|
}
|
||||||
|
while (normalized.endsWith("/")) {
|
||||||
|
normalized = normalized.substring(0, normalized.length() - 1);
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String key(String id) {
|
||||||
|
if (prefix.isEmpty()) {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
return prefix + "/" + id;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public OptionalLong put(String id, byte[] data) {
|
||||||
|
try {
|
||||||
|
PutObjectRequest request = PutObjectRequest.builder()
|
||||||
|
.bucket(bucket)
|
||||||
|
.key(key(id))
|
||||||
|
.contentLength((long) data.length)
|
||||||
|
.build();
|
||||||
|
client.putObject(request, RequestBody.fromBytes(data));
|
||||||
|
return OptionalLong.of(data.length);
|
||||||
|
} catch (SdkException e) {
|
||||||
|
return OptionalLong.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<byte[]> get(String id) {
|
||||||
|
try {
|
||||||
|
GetObjectRequest request = GetObjectRequest.builder()
|
||||||
|
.bucket(bucket)
|
||||||
|
.key(key(id))
|
||||||
|
.build();
|
||||||
|
ResponseBytes<GetObjectResponse> response = client.getObjectAsBytes(request);
|
||||||
|
return Optional.of(response.asByteArray());
|
||||||
|
} catch (NoSuchKeyException e) {
|
||||||
|
return Optional.empty();
|
||||||
|
} catch (SdkException e) {
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean delete(String id) {
|
||||||
|
try {
|
||||||
|
DeleteObjectRequest request = DeleteObjectRequest.builder()
|
||||||
|
.bucket(bucket)
|
||||||
|
.key(key(id))
|
||||||
|
.build();
|
||||||
|
client.deleteObject(request);
|
||||||
|
return true;
|
||||||
|
} catch (SdkException e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.gregor_lohaus.gtransfer.services.filewriter;
|
||||||
|
|
||||||
|
public final class StorageKeys {
|
||||||
|
private StorageKeys() {}
|
||||||
|
|
||||||
|
public static String chunk(String id, int index) {
|
||||||
|
return id + "/chunks/" + index;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,15 +11,27 @@ import com.gregor_lohaus.gtransfer.config.types.StorageServiceType;
|
|||||||
@Configuration
|
@Configuration
|
||||||
public class StorageServiceConfiguration {
|
public class StorageServiceConfiguration {
|
||||||
|
|
||||||
//TODO S3 implementation
|
|
||||||
@Bean
|
@Bean
|
||||||
public AbstractStorageService storageService(
|
public AbstractStorageService storageService(
|
||||||
@Value("${gtransfer-config.storageService.type}") StorageServiceType type,
|
@Value("${gtransfer-config.storageService.type}") StorageServiceType type,
|
||||||
@Value("${gtransfer-config.storageService.root}") String root) {
|
@Value("${gtransfer-config.storageService.root}") String root,
|
||||||
|
@Value("${gtransfer-config.storageService.bucket:}") String bucket,
|
||||||
|
@Value("${gtransfer-config.storageService.region:us-east-1}") String region,
|
||||||
|
@Value("${gtransfer-config.storageService.endpoint:}") String endpoint,
|
||||||
|
@Value("${gtransfer-config.storageService.accessKeyId:}") String accessKeyId,
|
||||||
|
@Value("${gtransfer-config.storageService.secretAccessKey:}") String secretAccessKey,
|
||||||
|
@Value("${gtransfer-config.storageService.pathStyleAccessEnabled:false}") boolean pathStyleAccessEnabled) {
|
||||||
return switch (type) {
|
return switch (type) {
|
||||||
case LOCAL -> new LocalStorageService(Path.of(root));
|
case LOCAL -> new LocalStorageService(Path.of(root));
|
||||||
case DUMMY -> new DummyStorageService(Path.of(root));
|
case DUMMY -> new DummyStorageService(Path.of(root));
|
||||||
case S3 -> new LocalStorageService(Path.of(root));
|
case S3 -> new S3StorageService(
|
||||||
|
bucket,
|
||||||
|
region,
|
||||||
|
root,
|
||||||
|
endpoint,
|
||||||
|
accessKeyId,
|
||||||
|
secretAccessKey,
|
||||||
|
pathStyleAccessEnabled);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
60
Backend/src/main/resources/static/crypto.js
Normal file
60
Backend/src/main/resources/static/crypto.js
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
var DEFAULT_CHUNK_SIZE = 4 * 1024 * 1024;
|
||||||
|
|
||||||
|
async function encryptFile(file, chunkSize = DEFAULT_CHUNK_SIZE) {
|
||||||
|
const key = await crypto.subtle.generateKey(
|
||||||
|
{ name: 'AES-GCM', length: 256 },
|
||||||
|
true,
|
||||||
|
['encrypt', 'decrypt']
|
||||||
|
);
|
||||||
|
|
||||||
|
const rawKey = await crypto.subtle.exportKey('raw', key);
|
||||||
|
const hash = await hashKey(rawKey);
|
||||||
|
const base64urlKey = encodeKey(rawKey);
|
||||||
|
const chunkCount = Math.max(1, Math.ceil(file.size / chunkSize));
|
||||||
|
|
||||||
|
return {
|
||||||
|
hash,
|
||||||
|
base64urlKey,
|
||||||
|
chunkCount,
|
||||||
|
chunks: encryptedChunks(file, key, chunkCount, chunkSize)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function* encryptedChunks(file, key, chunkCount, chunkSize) {
|
||||||
|
for (let index = 0; index < chunkCount; index++) {
|
||||||
|
const start = index * chunkSize;
|
||||||
|
const end = Math.min(start + chunkSize, file.size);
|
||||||
|
const plaintext = await file.slice(start, end).arrayBuffer();
|
||||||
|
const iv = crypto.getRandomValues(new Uint8Array(12));
|
||||||
|
const ciphertext = await crypto.subtle.encrypt({ name: 'AES-GCM', iv }, key, plaintext);
|
||||||
|
|
||||||
|
const payload = new Uint8Array(12 + ciphertext.byteLength);
|
||||||
|
payload.set(iv, 0);
|
||||||
|
payload.set(new Uint8Array(ciphertext), 12);
|
||||||
|
|
||||||
|
yield { index, payload };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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 decryptChunk(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));
|
||||||
|
}
|
||||||
176
Backend/src/main/resources/static/download.js
Normal file
176
Backend/src/main/resources/static/download.js
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
const fragment = location.hash.slice(1);
|
||||||
|
if (!fragment) {
|
||||||
|
showError('No decryption key found in URL.');
|
||||||
|
} else try {
|
||||||
|
setStatus('Deriving key\u2026');
|
||||||
|
|
||||||
|
const rawKeyBytes = decodeKey(fragment);
|
||||||
|
const id = await hashKey(rawKeyBytes);
|
||||||
|
|
||||||
|
const key = await crypto.subtle.importKey(
|
||||||
|
'raw', rawKeyBytes, { name: 'AES-GCM' }, false, ['decrypt']
|
||||||
|
);
|
||||||
|
|
||||||
|
setProgress('Loading metadata\u2026', 0, 1);
|
||||||
|
const metadataResponse = await fetch('/download/' + id + '/metadata');
|
||||||
|
|
||||||
|
if (metadataResponse.status === 410) {
|
||||||
|
showError('This file has expired or reached its download limit.');
|
||||||
|
} else if (!metadataResponse.ok) {
|
||||||
|
showError(`Download failed (${metadataResponse.status}).`);
|
||||||
|
} else {
|
||||||
|
const metadata = await metadataResponse.json();
|
||||||
|
const filename = metadata.name || 'download';
|
||||||
|
const chunkCount = metadata.chunkCount || 1;
|
||||||
|
const chunks = [];
|
||||||
|
|
||||||
|
for (let index = 0; index < chunkCount; index++) {
|
||||||
|
setProgress(`Downloading chunk ${index + 1} of ${chunkCount}\u2026`, index, chunkCount);
|
||||||
|
const chunkResponse = await fetch('/download/' + id + '/chunk/' + index);
|
||||||
|
if (chunkResponse.status === 410) {
|
||||||
|
throw new Error('This file has expired or reached its download limit.');
|
||||||
|
}
|
||||||
|
if (!chunkResponse.ok) {
|
||||||
|
throw new Error(`Chunk download failed (${chunkResponse.status})`);
|
||||||
|
}
|
||||||
|
|
||||||
|
setProgress(`Decrypting chunk ${index + 1} of ${chunkCount}\u2026`, index + 0.5, chunkCount);
|
||||||
|
const plaintextChunk = await decryptChunk(await chunkResponse.arrayBuffer(), key);
|
||||||
|
chunks.push(new Uint8Array(plaintextChunk));
|
||||||
|
setProgress(`Downloaded ${index + 1} of ${chunkCount} chunks`, index + 1, chunkCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
const completeResponse = await fetch('/download/' + id + '/complete', { method: 'POST' });
|
||||||
|
if (!completeResponse.ok && completeResponse.status !== 404 && completeResponse.status !== 410) {
|
||||||
|
throw new Error(`Download completion failed (${completeResponse.status})`);
|
||||||
|
}
|
||||||
|
|
||||||
|
setProgress('Preparing preview\u2026', chunkCount, chunkCount);
|
||||||
|
const plaintext = combineChunks(chunks);
|
||||||
|
showPreview(filename, plaintext);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
showError(err.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
function setStatus(msg) {
|
||||||
|
const el = htmx.find('#download-status');
|
||||||
|
if (el) el.textContent = msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setProgress(msg, completed, total) {
|
||||||
|
setStatus(msg);
|
||||||
|
const percent = Math.round((completed / total) * 100);
|
||||||
|
const bar = htmx.find('#download-progress');
|
||||||
|
if (!bar) return;
|
||||||
|
bar.style.width = `${percent}%`;
|
||||||
|
bar.textContent = `${percent}%`;
|
||||||
|
bar.setAttribute('aria-valuenow', String(percent));
|
||||||
|
}
|
||||||
|
|
||||||
|
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 combineChunks(chunks) {
|
||||||
|
const size = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0);
|
||||||
|
const combined = new Uint8Array(size);
|
||||||
|
let offset = 0;
|
||||||
|
for (const chunk of chunks) {
|
||||||
|
combined.set(chunk, offset);
|
||||||
|
offset += chunk.byteLength;
|
||||||
|
}
|
||||||
|
return combined.buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
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');
|
||||||
|
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">✅</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' });
|
||||||
|
}
|
||||||
|
|
||||||
|
function showError(msg) {
|
||||||
|
htmx.swap(htmx.find('#download-state'), `
|
||||||
|
<div class="drop-zone-icon mb-3">⚠</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' });
|
||||||
|
}
|
||||||
@@ -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,135 +1,120 @@
|
|||||||
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 views = {
|
|
||||||
prompt: document.getElementById('view-prompt'),
|
|
||||||
selected: document.getElementById('view-selected'),
|
|
||||||
uploading: document.getElementById('view-uploading'),
|
|
||||||
result: document.getElementById('view-result'),
|
|
||||||
};
|
|
||||||
|
|
||||||
let selectedFile = null;
|
let selectedFile = null;
|
||||||
|
|
||||||
function showView(name) {
|
htmx.on(dropZone, 'click', () => {
|
||||||
Object.entries(views).forEach(([key, el]) => el.classList.toggle('d-none', key !== name));
|
if (selectedFile === null) fileInput.click();
|
||||||
}
|
|
||||||
|
|
||||||
// ── File selection ────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
dropZone.addEventListener('click', () => {
|
|
||||||
if (views.prompt.classList.contains('d-none')) return;
|
|
||||||
fileInput.click();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
fileInput.addEventListener('change', e => {
|
htmx.on(fileInput, 'change', e => {
|
||||||
if (e.target.files[0]) selectFile(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]) selectFile(e.dataTransfer.files[0]);
|
if (e.dataTransfer.files[0] && selectedFile === null) onFileSelected(e.dataTransfer.files[0]);
|
||||||
});
|
});
|
||||||
|
|
||||||
function selectFile(file) {
|
function onFileSelected(file) {
|
||||||
selectedFile = file;
|
selectedFile = file;
|
||||||
document.getElementById('selected-name').textContent = file.name;
|
htmx.ajax('GET', '/upload/options?name=' + encodeURIComponent(file.name), {
|
||||||
showView('selected');
|
target: '#drop-zone',
|
||||||
|
swap: 'innerHTML'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
document.getElementById('reset-btn').addEventListener('click', e => {
|
async function startUpload() {
|
||||||
e.stopPropagation();
|
const expiryDays = htmx.find('#expiry-days')?.value;
|
||||||
selectedFile = null;
|
const downloadLimit = htmx.find('#download-limit')?.value;
|
||||||
fileInput.value = '';
|
|
||||||
showView('prompt');
|
|
||||||
});
|
|
||||||
|
|
||||||
document.getElementById('new-upload-btn').addEventListener('click', e => {
|
htmx.swap(dropZone, `
|
||||||
e.stopPropagation();
|
<div class="mb-3">
|
||||||
selectedFile = null;
|
<div class="spinner-border text-success" role="status">
|
||||||
fileInput.value = '';
|
<span class="visually-hidden">Loading\u2026</span>
|
||||||
showView('prompt');
|
</div>
|
||||||
});
|
</div>
|
||||||
|
<div class="drop-zone-text mb-3" id="upload-status">Preparing\u2026</div>
|
||||||
// ── Upload ────────────────────────────────────────────────────────────────────
|
<div class="progress" role="progressbar" aria-label="Upload progress" aria-valuemin="0" aria-valuemax="100">
|
||||||
|
<div id="upload-progress" class="progress-bar bg-success" style="width: 0%">0%</div>
|
||||||
document.getElementById('upload-btn').addEventListener('click', async e => {
|
</div>`,
|
||||||
e.stopPropagation();
|
{ swapStyle: 'innerHTML' });
|
||||||
await upload();
|
|
||||||
});
|
|
||||||
|
|
||||||
function setStatus(msg) {
|
|
||||||
document.getElementById('upload-status').textContent = msg;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function upload() {
|
|
||||||
const file = selectedFile;
|
|
||||||
showView('uploading');
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setStatus('Generating encryption key\u2026');
|
const encryptedFile = await encryptFile(selectedFile);
|
||||||
const key = await crypto.subtle.generateKey(
|
|
||||||
{ name: 'AES-GCM', length: 256 },
|
|
||||||
true,
|
|
||||||
['encrypt', 'decrypt']
|
|
||||||
);
|
|
||||||
|
|
||||||
const iv = crypto.getRandomValues(new Uint8Array(12));
|
for await (const { index, payload } of encryptedFile.chunks) {
|
||||||
|
const chunkCount = encryptedFile.chunkCount;
|
||||||
|
setProgress(`Encrypting chunk ${index + 1} of ${chunkCount}\u2026`, index, chunkCount);
|
||||||
|
|
||||||
setStatus('Encrypting\u2026');
|
setProgress(`Uploading chunk ${index + 1} of ${chunkCount}\u2026`, index + 0.5, chunkCount);
|
||||||
const ciphertext = await crypto.subtle.encrypt(
|
const chunkData = new FormData();
|
||||||
{ name: 'AES-GCM', iv },
|
chunkData.append('chunk', new Blob([payload]), String(index));
|
||||||
key,
|
chunkData.append('hash', encryptedFile.hash);
|
||||||
await file.arrayBuffer()
|
chunkData.append('index', index);
|
||||||
);
|
|
||||||
|
|
||||||
// Payload: 12-byte IV prepended to ciphertext
|
const chunkResponse = await fetch('/upload/chunk', { method: 'POST', body: chunkData });
|
||||||
const payload = new Uint8Array(12 + ciphertext.byteLength);
|
if (!chunkResponse.ok) throw new Error(`Chunk upload failed (${chunkResponse.status})`);
|
||||||
payload.set(iv, 0);
|
setProgress(`Uploaded chunk ${index + 1} of ${chunkCount}`, index + 1, chunkCount);
|
||||||
payload.set(new Uint8Array(ciphertext), 12);
|
}
|
||||||
|
|
||||||
// SHA-256(rawKey) → file identifier sent to server (server never sees the key)
|
setProgress('Finalizing\u2026', encryptedFile.chunkCount, encryptedFile.chunkCount);
|
||||||
const rawKey = await crypto.subtle.exportKey('raw', key);
|
const metadata = new FormData();
|
||||||
const hash = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', rawKey)))
|
metadata.append('hash', encryptedFile.hash);
|
||||||
.map(b => b.toString(16).padStart(2, '0'))
|
metadata.append('name', selectedFile.name);
|
||||||
.join('');
|
metadata.append('chunkCount', encryptedFile.chunkCount);
|
||||||
|
if (expiryDays) metadata.append('expiryDays', expiryDays);
|
||||||
|
if (downloadLimit) metadata.append('downloadLimit', downloadLimit);
|
||||||
|
|
||||||
// Base64url-encode key for URL fragment
|
const response = await fetch('/upload', { method: 'POST', body: metadata });
|
||||||
const base64urlKey = btoa(String.fromCharCode(...new Uint8Array(rawKey)))
|
if (!response.ok) throw new Error(`Server error ${response.status}`);
|
||||||
.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
|
|
||||||
|
|
||||||
setStatus('Uploading\u2026');
|
htmx.swap(dropZone, await response.text(), { swapStyle: 'innerHTML' });
|
||||||
const formData = new FormData();
|
htmx.process(dropZone);
|
||||||
formData.append('file', new Blob([payload]), file.name);
|
htmx.find('#share-link').value = window.location.origin + '/download#' + encryptedFile.base64urlKey;
|
||||||
formData.append('hash', hash);
|
|
||||||
formData.append('name', file.name);
|
|
||||||
|
|
||||||
const response = await fetch('/upload', { method: 'POST', body: formData });
|
|
||||||
if (!response.ok) throw new Error(`Server responded with ${response.status}`);
|
|
||||||
|
|
||||||
const { id } = await response.json();
|
|
||||||
document.getElementById('share-link').value =
|
|
||||||
`${window.location.origin}/download/${id}#${base64urlKey}`;
|
|
||||||
showView('result');
|
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setStatus(`Error: ${err.message}`);
|
htmx.swap(dropZone, `
|
||||||
|
<div class="drop-zone-icon mb-3">⚠</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>`,
|
||||||
|
{ swapStyle: 'innerHTML' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Copy link ─────────────────────────────────────────────────────────────────
|
function setStatus(msg) {
|
||||||
|
const el = htmx.find('#upload-status');
|
||||||
|
if (el) el.textContent = msg;
|
||||||
|
}
|
||||||
|
|
||||||
document.getElementById('copy-btn').addEventListener('click', async e => {
|
function setProgress(msg, completed, total) {
|
||||||
e.stopPropagation();
|
setStatus(msg);
|
||||||
await navigator.clipboard.writeText(document.getElementById('share-link').value);
|
const percent = Math.round((completed / total) * 100);
|
||||||
const btn = document.getElementById('copy-btn');
|
const bar = htmx.find('#upload-progress');
|
||||||
|
if (!bar) return;
|
||||||
|
bar.style.width = `${percent}%`;
|
||||||
|
bar.textContent = `${percent}%`;
|
||||||
|
bar.setAttribute('aria-valuenow', String(percent));
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetUpload() {
|
||||||
|
selectedFile = null;
|
||||||
|
fileInput.value = '';
|
||||||
|
htmx.swap(dropZone, promptHtml, { swapStyle: 'innerHTML' });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copyLink() {
|
||||||
|
await navigator.clipboard.writeText(htmx.find('#share-link').value);
|
||||||
|
const btn = htmx.find('#copy-btn');
|
||||||
btn.textContent = 'Copied!';
|
btn.textContent = 'Copied!';
|
||||||
setTimeout(() => { btn.textContent = 'Copy'; }, 2000);
|
setTimeout(() => { btn.textContent = 'Copy'; }, 2000);
|
||||||
});
|
}
|
||||||
|
|||||||
36
Backend/src/main/resources/templates/download/page.html
Normal file
36
Backend/src/main/resources/templates/download/page.html
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" xmlns:th="http://www.thymeleaf.org" data-bs-theme="dark">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>GTransfer</title>
|
||||||
|
<link rel="stylesheet" th:href="@{/webjars/bootstrap/dist/css/bootstrap.min.css}">
|
||||||
|
<link rel="stylesheet" th:href="@{/style.css}">
|
||||||
|
<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>
|
||||||
|
<body class="d-flex flex-column min-vh-100">
|
||||||
|
|
||||||
|
<nav class="navbar px-4 pt-3">
|
||||||
|
<a class="brand fw-bold text-decoration-none fs-4" href="/">G<span>Transfer</span></a>
|
||||||
|
<span class="badge-e2e rounded-pill fw-medium px-3 py-1">🔒 End-to-end encrypted</span>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<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 class="drop-zone-icon mb-3">🔒</div>
|
||||||
|
<div class="drop-zone-text mb-3" id="download-status">Preparing…</div>
|
||||||
|
<div class="progress" role="progressbar" aria-label="Download progress" aria-valuemin="0" aria-valuemax="100">
|
||||||
|
<div id="download-progress" class="progress-bar bg-success" style="width: 0%">0%</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<footer class="text-center p-4 small">
|
||||||
|
<a href="https://github.com/gregor-lohaus/gtransfer">Open source</a>
|
||||||
|
· No tracking · No ads
|
||||||
|
</footer>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
<link rel="stylesheet" th:href="@{/style.css}">
|
<link rel="stylesheet" th:href="@{/style.css}">
|
||||||
<script th:src="@{/webjars/bootstrap/dist/js/bootstrap.bundle.min.js}" defer></script>
|
<script th:src="@{/webjars/bootstrap/dist/js/bootstrap.bundle.min.js}" defer></script>
|
||||||
<script th:src="@{/webjars/htmx.org/dist/htmx.min.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="@{/upload.js}" defer></script>
|
<script th:src="@{/upload.js}" defer></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="d-flex flex-column min-vh-100">
|
<body class="d-flex flex-column min-vh-100">
|
||||||
@@ -27,59 +28,21 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-7 d-flex justify-content-center justify-content-lg-end">
|
<div class="col-lg-7 d-flex justify-content-center justify-content-lg-end">
|
||||||
|
<input type="file" id="file-input" accept="*/*" hidden>
|
||||||
<div id="drop-zone" class="drop-zone text-center py-5 px-4 w-100">
|
<div id="drop-zone" class="drop-zone text-center py-5 px-4 w-100">
|
||||||
|
<div class="drop-zone-icon mb-3">📂</div>
|
||||||
<!-- State: prompt (default) -->
|
<div class="mb-2">
|
||||||
<div id="view-prompt">
|
<strong>Choose a file</strong>
|
||||||
<div class="drop-zone-icon mb-3">📂</div>
|
<span class="drop-zone-text"> or drag and drop here</span>
|
||||||
<div class="mb-2">
|
|
||||||
<strong>Choose a file</strong>
|
|
||||||
<span class="drop-zone-text"> or drag and drop here</span>
|
|
||||||
</div>
|
|
||||||
<div class="drop-zone-text small">Any file type · Up to <span th:text="${maxFileSize}">10GB</span></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="drop-zone-text small">Any file type · Up to <span th:text="${maxFileSize}">10GB</span></div>
|
||||||
<!-- State: file selected -->
|
|
||||||
<div id="view-selected" class="d-none">
|
|
||||||
<div class="drop-zone-icon mb-3">📄</div>
|
|
||||||
<div class="fw-medium mb-3" id="selected-name"></div>
|
|
||||||
<div class="d-flex gap-2 justify-content-center">
|
|
||||||
<button id="upload-btn" class="btn btn-success px-4">Send</button>
|
|
||||||
<button id="reset-btn" class="btn btn-link drop-zone-text text-decoration-none">Change file</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- State: uploading -->
|
|
||||||
<div id="view-uploading" class="d-none">
|
|
||||||
<div class="mb-3">
|
|
||||||
<div class="spinner-border text-success" role="status">
|
|
||||||
<span class="visually-hidden">Loading...</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="drop-zone-text" id="upload-status">Preparing…</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- State: result -->
|
|
||||||
<div id="view-result" class="d-none">
|
|
||||||
<div class="drop-zone-icon mb-3">✅</div>
|
|
||||||
<div class="drop-zone-text mb-3">Your file is ready to share</div>
|
|
||||||
<div class="input-group mb-2">
|
|
||||||
<input type="text" id="share-link" class="form-control form-control-sm" readonly>
|
|
||||||
<button id="copy-btn" class="btn btn-outline-success btn-sm">Copy</button>
|
|
||||||
</div>
|
|
||||||
<button id="new-upload-btn" class="btn btn-link drop-zone-text text-decoration-none small">
|
|
||||||
Send another file
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<input type="file" id="file-input" hidden>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<footer class="text-center p-4 small">
|
<footer class="text-center p-4 small">
|
||||||
<a href="https://github.com/gregor-lohaus/gtransfer">Open source</a>
|
<a href="https://gitea.gregorlohaus.com/gregor/gtransfer">Open source</a>
|
||||||
· No tracking · No ads
|
· No tracking · No ads
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
|
|||||||
27
Backend/src/main/resources/templates/upload/options.html
Normal file
27
Backend/src/main/resources/templates/upload/options.html
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<body>
|
||||||
|
<div th:fragment="form">
|
||||||
|
<div class="drop-zone-icon mb-3">📄</div>
|
||||||
|
<div class="fw-medium mb-3 text-truncate" th:text="${name}">filename</div>
|
||||||
|
|
||||||
|
<div class="row g-2 mb-3 text-start">
|
||||||
|
<div class="col-6">
|
||||||
|
<label for="expiry-days" class="form-label drop-zone-text small">Expires after (days)</label>
|
||||||
|
<input type="number" id="expiry-days" class="form-control form-control-sm"
|
||||||
|
min="1" th:max="${maxExpiryDays}" th:value="${maxExpiryDays}">
|
||||||
|
</div>
|
||||||
|
<div class="col-6">
|
||||||
|
<label for="download-limit" class="form-label drop-zone-text small">Download limit</label>
|
||||||
|
<input type="number" id="download-limit" class="form-control form-control-sm"
|
||||||
|
min="1" th:max="${maxDownloadLimit}" placeholder="Unlimited">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="d-flex gap-2 justify-content-center">
|
||||||
|
<button class="btn btn-success px-4" onclick="startUpload()">Send</button>
|
||||||
|
<button class="btn btn-link drop-zone-text text-decoration-none" onclick="resetUpload()">Change file</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
16
Backend/src/main/resources/templates/upload/result.html
Normal file
16
Backend/src/main/resources/templates/upload/result.html
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<body>
|
||||||
|
<div th:fragment="view">
|
||||||
|
<div class="drop-zone-icon mb-3">✅</div>
|
||||||
|
<div class="drop-zone-text mb-3">Your file is ready to share</div>
|
||||||
|
<div class="input-group mb-2">
|
||||||
|
<input type="text" id="share-link" class="form-control form-control-sm" readonly>
|
||||||
|
<button id="copy-btn" class="btn btn-outline-success btn-sm" onclick="copyLink()">Copy</button>
|
||||||
|
</div>
|
||||||
|
<button class="btn btn-link drop-zone-text text-decoration-none small" onclick="resetUpload()">
|
||||||
|
Send another file
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
12
Dockerfile
Normal file
12
Dockerfile
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
FROM postgres:15.17-trixie
|
||||||
|
RUN apt update
|
||||||
|
RUN apt install -y curl wget zip unzip build-essential zlib1g-dev nodejs ssh
|
||||||
|
RUN curl -s "https://get.sdkman.io?ci=true" | bash
|
||||||
|
SHELL ["/bin/bash", "-c"]
|
||||||
|
RUN source "/root/.sdkman/bin/sdkman-init.sh" \
|
||||||
|
&& sdk install java 25.0.2-graalce \
|
||||||
|
&& sdk install gradle
|
||||||
|
ENV POSTGRES_PASSWORD=gtransfer
|
||||||
|
ENV POSTGRES_USER=gtransfer
|
||||||
|
ENV POSTGRES_DB=gtransfer
|
||||||
|
ENTRYPOINT ["/bin/bash"]
|
||||||
47
README.md
Normal file
47
README.md
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
|
### [Canonical Repo Url](https://gitea.gregorlohaus.com/gregor/gtransfer)
|
||||||
|
|
||||||
|
## Encryption flow
|
||||||
|
|
||||||
|
### 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 |
|
||||||
18
devenv.lock
18
devenv.lock
@@ -3,11 +3,11 @@
|
|||||||
"devenv": {
|
"devenv": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "src/modules",
|
"dir": "src/modules",
|
||||||
"lastModified": 1771852244,
|
"lastModified": 1777321427,
|
||||||
"narHash": "sha256-4t3gQ4s7kqtDwSiE74Px6szKJtKtcoHgUiNmIm+Xl9Y=",
|
"narHash": "sha256-EV/mIQur/dvCFwHzBjL7LBAgyhT0l3wQBgFjjY6zucg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "devenv",
|
"repo": "devenv",
|
||||||
"rev": "c88c14a32d06173867e26b7d4f5daed38a3f6f1e",
|
"rev": "fb3d8df47420022c47a42151c26e5cdaee6c641d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -22,11 +22,11 @@
|
|||||||
"nixpkgs-src": "nixpkgs-src"
|
"nixpkgs-src": "nixpkgs-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770434727,
|
"lastModified": 1776852779,
|
||||||
"narHash": "sha256-YzOZRgiqIccnkkZvckQha7wvOfN2z50xEdPvfgu6sf8=",
|
"narHash": "sha256-WwO/ITisCXwyiRgtktZgv3iGhAGO+IB5Av4kKCwezR0=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "devenv-nixpkgs",
|
"repo": "devenv-nixpkgs",
|
||||||
"rev": "8430f16a39c27bdeef236f1eeb56f0b51b33d348",
|
"rev": "ec3063523dcd911aeadb50faa589f237cdab5853",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
"nixpkgs-src": {
|
"nixpkgs-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769922788,
|
"lastModified": 1776329215,
|
||||||
"narHash": "sha256-H3AfG4ObMDTkTJYkd8cz1/RbY9LatN5Mk4UF48VuSXc=",
|
"narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "207d15f1a6603226e1e223dc79ac29c7846da32e",
|
"rev": "b86751bc4085f48661017fa226dee99fab6c651b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
36
devenv.nix
36
devenv.nix
@@ -1,57 +1,41 @@
|
|||||||
{ pkgs, lib, config, inputs, ... }:
|
{ pkgs, lib, config, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# https://devenv.sh/basics/
|
|
||||||
env.GRAALVM_HOME = "${pkgs.graalvmPackages.graalvm-ce}";
|
env.GRAALVM_HOME = "${pkgs.graalvmPackages.graalvm-ce}";
|
||||||
|
|
||||||
# https://devenv.sh/packages/
|
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.graalvmPackages.graalvm-ce
|
pkgs.graalvmPackages.graalvm-ce
|
||||||
pkgs.watchexec
|
pkgs.watchexec
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://devenv.sh/languages/
|
|
||||||
languages.java.enable = true;
|
languages.java.enable = true;
|
||||||
languages.java.lsp.enable = true;
|
languages.java.lsp.enable = true;
|
||||||
languages.java.gradle.enable = true;
|
languages.java.gradle.enable = true;
|
||||||
languages.java.jdk.package = pkgs.jdk25_headless;
|
languages.java.jdk.package = pkgs.jdk25_headless;
|
||||||
# https://devenv.sh/processes/
|
|
||||||
# processes.cargo-watch.exec = "cargo-watch";
|
|
||||||
# process.manager.implementation = "mprocs";
|
|
||||||
processes.watchbuild = {
|
processes.watchbuild = {
|
||||||
exec = "watchexec -r -e java,html,css,js -w ./Backend/src -- build-backend";
|
exec = "build-backend";
|
||||||
|
watch = {
|
||||||
|
paths = [./Backend/src];
|
||||||
|
extensions = ["java" "html" "css" "js"];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
processes.runbin = {
|
processes.runbin = {
|
||||||
exec = "watchexec -r -w ./Backend/buildcompleted.at ./Backend/build/native/nativeCompile/gtransfer";
|
exec = "./Backend/build/native/nativeCompile/gtransfer";
|
||||||
|
watch = {
|
||||||
|
paths = [ ./Backend/buildcompleted.at ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
# https://devenv.sh/services/
|
|
||||||
services.postgres.enable = true;
|
services.postgres.enable = true;
|
||||||
services.postgres.listen_addresses = "localhost";
|
services.postgres.listen_addresses = "localhost";
|
||||||
services.postgres.port = 5432;
|
services.postgres.port = 5432;
|
||||||
services.postgres.initialDatabases = [
|
services.postgres.initialDatabases = [
|
||||||
{name="gtransfer";user="gtransfer";pass="gtransfer";}
|
{name="gtransfer";user="gtransfer";pass="gtransfer";}
|
||||||
];
|
];
|
||||||
|
services.minio.enable = true;
|
||||||
# https://devenv.sh/scripts/
|
|
||||||
scripts.build-backend.exec = ''
|
scripts.build-backend.exec = ''
|
||||||
gradle -p ./Backend build && echo $(date) > ./Backend/buildcompleted.at
|
gradle -p ./Backend build && echo $(date) > ./Backend/buildcompleted.at
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enterShell = ''
|
|
||||||
'';
|
|
||||||
|
|
||||||
# https://devenv.sh/tasks/
|
|
||||||
# tasks = {
|
|
||||||
# "myproj:setup".exec = "mytool build";
|
|
||||||
# "devenv:enterShell".after = [ "myproj:setup" ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
# https://devenv.sh/tests/
|
|
||||||
enterTest = ''
|
enterTest = ''
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# https://devenv.sh/git-hooks/
|
|
||||||
# git-hooks.hooks.shellcheck.enable = true;
|
|
||||||
|
|
||||||
# See full reference at https://devenv.sh/reference/options/
|
|
||||||
}
|
}
|
||||||
|
|||||||
337
layout.kdl
337
layout.kdl
@@ -1,337 +0,0 @@
|
|||||||
layout {
|
|
||||||
cwd "/home/anon"
|
|
||||||
tab name="Tab #1" focus=true {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="zellij:tab-bar"
|
|
||||||
}
|
|
||||||
pane command="devenv" cwd="Dev/GTransfer" {
|
|
||||||
args "shell"
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="zellij:status-bar"
|
|
||||||
}
|
|
||||||
floating_panes {
|
|
||||||
pane command="devenv" cwd="Dev/GTransfer" {
|
|
||||||
height 30
|
|
||||||
width 170
|
|
||||||
x 85
|
|
||||||
y 16
|
|
||||||
args "up"
|
|
||||||
}
|
|
||||||
pane command="hx" cwd=".config/gtransfer" {
|
|
||||||
height 30
|
|
||||||
width 170
|
|
||||||
x 87
|
|
||||||
y 18
|
|
||||||
args "config.toml"
|
|
||||||
}
|
|
||||||
pane command="devenv" cwd="Dev/GTransfer" {
|
|
||||||
height 30
|
|
||||||
width 170
|
|
||||||
x 89
|
|
||||||
y 20
|
|
||||||
args "shell"
|
|
||||||
}
|
|
||||||
pane command="claude" cwd="Dev/GTransfer" {
|
|
||||||
height 30
|
|
||||||
width 170
|
|
||||||
x 91
|
|
||||||
y 22
|
|
||||||
args "."
|
|
||||||
}
|
|
||||||
pane command="yy" cwd="Dev/GTransfer" {
|
|
||||||
height 30
|
|
||||||
width 170
|
|
||||||
x 93
|
|
||||||
y 24
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
new_tab_template {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="zellij:tab-bar"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon"
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="zellij:status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
swap_tiled_layout name="vertical" {
|
|
||||||
tab max_panes=5 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane
|
|
||||||
pane {
|
|
||||||
children
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tab max_panes=8 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane {
|
|
||||||
children
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tab max_panes=12 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane {
|
|
||||||
children
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
swap_tiled_layout name="horizontal" {
|
|
||||||
tab max_panes=4 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tab max_panes=8 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane {
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
children
|
|
||||||
}
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tab max_panes=12 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane {
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
children
|
|
||||||
}
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
pane
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
swap_tiled_layout name="stacked" {
|
|
||||||
tab min_panes=5 {
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="tab-bar"
|
|
||||||
}
|
|
||||||
pane {
|
|
||||||
pane split_direction="vertical" {
|
|
||||||
pane
|
|
||||||
pane stacked=true {
|
|
||||||
children
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pane size=1 borderless=true {
|
|
||||||
plugin location="status-bar"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
swap_floating_layout name="staggered" {
|
|
||||||
floating_panes {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
swap_floating_layout name="enlarged" {
|
|
||||||
floating_panes max_panes=10 {
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 1
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 2
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 3
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 4
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 5
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 6
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 7
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 8
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x "5%"
|
|
||||||
y 9
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "90%"
|
|
||||||
width "90%"
|
|
||||||
x 10
|
|
||||||
y 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
swap_floating_layout name="spread" {
|
|
||||||
floating_panes max_panes=1 {
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
x "50%"
|
|
||||||
y "50%"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
floating_panes max_panes=2 {
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
width "45%"
|
|
||||||
x "1%"
|
|
||||||
y "25%"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
width "45%"
|
|
||||||
x "50%"
|
|
||||||
y "25%"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
floating_panes max_panes=3 {
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "45%"
|
|
||||||
width "45%"
|
|
||||||
y "55%"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
width "45%"
|
|
||||||
x "1%"
|
|
||||||
y "1%"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
width "45%"
|
|
||||||
x "50%"
|
|
||||||
y "1%"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
floating_panes max_panes=4 {
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "45%"
|
|
||||||
width "45%"
|
|
||||||
x "1%"
|
|
||||||
y "55%"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "45%"
|
|
||||||
width "45%"
|
|
||||||
x "50%"
|
|
||||||
y "55%"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "45%"
|
|
||||||
width "45%"
|
|
||||||
x "1%"
|
|
||||||
y "1%"
|
|
||||||
}
|
|
||||||
pane cwd="/home/anon" {
|
|
||||||
height "45%"
|
|
||||||
width "45%"
|
|
||||||
x "50%"
|
|
||||||
y "1%"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user