diff --git a/frontend/src/app/download/download.component.html b/frontend/src/app/download/download.component.html index 2bd21fd..35aec59 100644 --- a/frontend/src/app/download/download.component.html +++ b/frontend/src/app/download/download.component.html @@ -1,32 +1,121 @@ -
+

Download File

-

Access your files quickly and securely

-
- -
- -
- - - +
+

Access your files quickly and securely

+
+ + + +
+ +
+ Password wrong | Check capslock +
+ + + +

Files are available for a limited time. Ensure the code or link is correct and the file is still downloadable.

+
+
+
+
+
{{ downloadProgress | number:'1.0-0' }}%
+

Downloading...

+

Your file is being downloaded in the background. Please wait...

+

{{ downloadDuration }} seconds passed.

+
+
+
+
+ Success +

Download complete!

+

File {{ fileName }} has been downloaded and saved to your drive.

+

The download took {{ downloadDuration }} seconds.

+ +
- -

Files are available for a limited time. Ensure the code or link is correct and the file is still downloadable.

- -
-

Please enter the file password

-

Please enter the download password:

- -
-
- -
+ +
+
+
+

Did you know?

+

{{ funfact }}

+
+ + + +
+

The file cant be downloaded!

+
+ +

Oh no...

+

What happened here?

+

The file you are trying to download is not available anymore.

+

This issue may occur if the download limit has been reached or the download period has expired.

+
+ +
+
+
+ +
+
+
+ +
+ + +
+

File not found!

+
+ +

Oh no...

+

What happened here?

+

The file you are trying to download does not exist.

+

Please check the file ID.

+
+ +
+
+
+ +
+
+
+ +
+ + + diff --git a/frontend/src/app/download/download.component.ts b/frontend/src/app/download/download.component.ts index f55e6a8..8d889a5 100644 --- a/frontend/src/app/download/download.component.ts +++ b/frontend/src/app/download/download.component.ts @@ -1,25 +1,86 @@ -import { Component } from '@angular/core'; +import {Component, ElementRef, ViewChild} from '@angular/core'; import axios from "axios"; +import {DevelopmentStore} from "../../store/DevelopmentStore"; +import {FormsModule} from "@angular/forms"; +import {DecimalPipe, NgClass, NgIf} from "@angular/common"; +import funfacts from "../../assets/funfacts"; +import {RouterLink} from "@angular/router"; @Component({ selector: 'app-download', standalone: true, - imports: [], + imports: [ + FormsModule, + NgIf, + DecimalPipe, + RouterLink, + NgClass + ], templateUrl: './download.component.html', styleUrl: './download.component.scss' }) export class DownloadComponent { - constructor() { + @ViewChild('download_not_possible') download_not_possible: ElementRef | undefined; + @ViewChild('file_not_found_modal') file_not_found_modal: ElementRef | undefined; + + inputFileId: string = "2402183"; + fileId: string = ""; + filePassword: string = ""; + fileName: string = ""; + downloadInfo: DownloadInfo | null = null; + + fileDownloadStarted: boolean = false; + fileDownloadFinished: boolean = false; + waitingForPassword: boolean = false; + downloadProgress: number = 0; + downloadDuration: string = ""; + passwordWrong: boolean = false; + + funfact: string = ""; + + + constructor(private developmentStore: DevelopmentStore) { + this.funfact = funfacts[Math.floor(Math.random() * funfacts.length)]; this.speedTest(); } + requestDownload() { + + if(this.waitingForPassword) { + console.log("Requesting download with password"); + this.downloadFile(); + return; + } + + console.log(this.inputFileId); + this.fileId = this.inputFileId; // TODO: Implement link extraction logic + + this.getDownloadInfo(); + } + + processDownloadInfo() { + if(!this.downloadInfo?.passwordProtected && this.downloadInfo?.downloadable) { + console.log("Proceeding with download"); + this.downloadFile(); + return; + } + else if(!this.downloadInfo?.downloadable) { + this.download_not_possible?.nativeElement.showModal(); + return; + } + else if(this.downloadInfo?.passwordProtected) { + this.waitingForPassword = true; + console.log("Password protected"); + } + } + private speedTest() { const start = new Date().getTime(); // Start timer axios({ method: 'get', - url: 'http://localhost:/api/v1/speed-test', + url: this.developmentStore.getBaseUrl() + 'api/v1/speed-test', responseType: 'arraybuffer', headers: { 'Access-Control-Allow-Origin': '*', // Allow CORS @@ -38,4 +99,94 @@ export class DownloadComponent { console.error('Error during download test:', error); }); } + + private getDownloadInfo() { + axios({ + method: 'get', + url: this.developmentStore.getBaseUrl() + 'api/v1/download-info?fileId=' + this.fileId, + responseType: 'json', + headers: { + 'Access-Control-Allow-Origin': '*', // Allow CORS + } + }) + .then(response => { + this.downloadInfo = response.data; + console.log(response.data); + this.processDownloadInfo(); + }) + .catch(error => { + this.file_not_found_modal?.nativeElement.showModal(); + console.error('Error during download info request:', error); + }); + } + + private downloadFile() { + const startTime = new Date().getTime(); + this.fileDownloadStarted = true; + axios({ + method: 'get', + url: this.developmentStore.getBaseUrl() + 'api/v1/download?fileId=' + this.fileId + '&password=' + this.filePassword, + responseType: 'arraybuffer', + headers: { + 'Access-Control-Allow-Origin': '*', // Allow CORS + }, + onDownloadProgress: (progressEvent) => { + const endTime = new Date().getTime(); + const duration = (endTime - startTime) / 1000; + this.downloadDuration = duration.toFixed(0); + // Calculate the percentage of download completed + if(progressEvent.total) { + const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total); + this.downloadProgress = percentCompleted; + console.log(percentCompleted + '%'); // Log the percentage or update any progress UI component + } + } + }) + .then(response => { + const endTime = new Date().getTime(); + const duration = (endTime - startTime) / 1000; + this.downloadDuration = duration.toFixed(2); + this.fileDownloadFinished = true; + + const contentDisposition = response.headers['content-disposition']; + let filename = "default_filename"; // Default filename in case parsing fails + + if (contentDisposition) { + const filenameRegex = /filename="?([^"]+)"?/; + const matches = contentDisposition.match(filenameRegex); + if (matches && matches[1]) { + filename = matches[1]; + } + } + this.fileName = filename; + + const blob = new Blob([response.data], {type: 'application/octet-stream'}); + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.style.display = 'none'; + a.href = url; + a.download = filename; // You can specify a filename here + document.body.appendChild(a); + a.click(); + + // Clean up by revoking the Blob URL and removing the temporary anchor + window.URL.revokeObjectURL(url); + document.body.removeChild(a); + }) + .catch(error => { + this.fileDownloadStarted = false; + this.wrongPassword(); + console.error('Error during download request:', error); + }); + } + + private wrongPassword() { + this.passwordWrong = true; + } +} +interface DownloadInfo { + downloadable: boolean; + passwordProtected: boolean; + singleDownload: boolean; + fileId: string; } diff --git a/frontend/src/app/upload/upload.component.html b/frontend/src/app/upload/upload.component.html index f31c556..a862c5b 100644 --- a/frontend/src/app/upload/upload.component.html +++ b/frontend/src/app/upload/upload.component.html @@ -1,4 +1,4 @@ -
+

Upload Your File

diff --git a/frontend/src/app/upload/upload.component.ts b/frontend/src/app/upload/upload.component.ts index fdc2c96..8251840 100644 --- a/frontend/src/app/upload/upload.component.ts +++ b/frontend/src/app/upload/upload.component.ts @@ -147,7 +147,7 @@ export class UploadComponent { axios({ method: 'post', - url: 'http://localhost/api/v1/upload-speed-test', + url: this.developmentStore.getBaseUrl() + 'api/v1/upload-speed-test', data: uint8View, headers: { 'Content-Type': 'application/octet-stream', diff --git a/frontend/src/assets/funfacts.ts b/frontend/src/assets/funfacts.ts new file mode 100644 index 0000000..7edf729 --- /dev/null +++ b/frontend/src/assets/funfacts.ts @@ -0,0 +1,24 @@ + +let funfacts = [ + "Honey never spoils. Archaeologists have found pots of honey in ancient Egyptian tombs that are over 3,000 years old and still edible.", + "Octopuses have three hearts and blue blood.", + "Bananas are berries, but strawberries are not.", + "The shortest war in history was between Britain and Zanzibar on August 27, 1896. Zanzibar surrendered after 38 minutes.", + "A day on Venus is longer than a year on Venus.", + "The Eiffel Tower can be 15 cm taller during the summer when the iron heats up and expands.", + "Cows have best friends and can become stressed if they are separated.", + "A group of flamingos is called a flamboyance.", + "The unicorn is the national animal of Scotland.", + "More people are killed each year by cows than by sharks.", + "The total weight of all the ants on Earth is about the same as the weight of all the humans on Earth.", + "Wombat poop is cube-shaped.", + "The inventor of the frisbee was turned into a frisbee after he died.", + "There are more possible iterations of a game of chess than there are atoms in the known universe.", + "The heart of a blue whale is so large that a human can swim through the arteries.", + "Vending machines kill 4 times as many people as sharks per year.", + "Butterflies taste with their feet.", + "In Switzerland, it is illegal to own just one guinea pig because they are prone to loneliness.", + "Snails can sleep for up to three years.", + "The old Twitter bird actually had a name - Larry." +]; +export default funfacts; diff --git a/frontend/src/assets/poop-solid.svg b/frontend/src/assets/poop-solid.svg new file mode 100644 index 0000000..e38eabb --- /dev/null +++ b/frontend/src/assets/poop-solid.svg @@ -0,0 +1 @@ + diff --git a/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java b/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java index e82c99a..24278ae 100644 --- a/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java +++ b/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java @@ -14,6 +14,8 @@ import org.springframework.stereotype.Repository; import java.lang.reflect.Type; import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Optional; @Repository @RequiredArgsConstructor @@ -44,11 +46,17 @@ public class FileUploadRepository { r.db("sharepulse").table("file_uploads").insert(map).run(connection); } - public FileUpload retrieveFileUploadByFileId(String fileId) { - return r.db("sharepulse").table("file_uploads") - .filter(r.hashMap("fileId", fileId)) - .run(connection, FileUpload.class) - .next(); + public Optional retrieveFileUploadByFileId(String fileId) { + try { + FileUpload fileUpload = r.db("sharepulse").table("file_uploads") + .filter(r.hashMap("fileId", fileId)) + .run(connection, FileUpload.class) + .next(); + return Optional.ofNullable(fileUpload); + } catch (NoSuchElementException e) { + return Optional.empty(); + } + } public void updateFileUpload(FileUpload updatedFileUpload) { diff --git a/src/main/java/de/w665/sharepulse/rest/TestRestResource.java b/src/main/java/de/w665/sharepulse/rest/TestRestResource.java index ce94c50..790c454 100644 --- a/src/main/java/de/w665/sharepulse/rest/TestRestResource.java +++ b/src/main/java/de/w665/sharepulse/rest/TestRestResource.java @@ -28,9 +28,9 @@ public class TestRestResource extends ApiRestController { } @GetMapping("test") - public String test(@RequestParam String id) { - FileUpload fileUpload = fileUploadRepository.retrieveFileUploadByFileId(id); - return fileUpload != null ? fileUpload.toString() : "FileUpload not found for id: " + id; + public FileUpload test(@RequestParam String id) { + FileUpload fileUpload = fileUploadRepository.retrieveFileUploadByFileId(id).orElse(null); + return fileUpload; } @GetMapping("test/download") diff --git a/src/main/java/de/w665/sharepulse/rest/mappings/Download.java b/src/main/java/de/w665/sharepulse/rest/mappings/Download.java index b534780..494e011 100644 --- a/src/main/java/de/w665/sharepulse/rest/mappings/Download.java +++ b/src/main/java/de/w665/sharepulse/rest/mappings/Download.java @@ -22,6 +22,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.Optional; @Slf4j @RestController @@ -41,7 +42,11 @@ public class Download extends ApiRestController { @RequestParam(value = "password", required = false) String password) throws IOException { - FileUpload fileUpload = fileService.getFileUploadByFileId(fileId); + Optional optionalFileUpload = fileService.getFileUploadByFileId(fileId); + FileUpload fileUpload = optionalFileUpload.orElse(null); + if(optionalFileUpload.isEmpty()) { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } try { fileSecurityService.verifyDownloadPermission(fileUpload, password); @@ -63,6 +68,7 @@ public class Download extends ApiRestController { headers.add(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate"); headers.add(HttpHeaders.PRAGMA, "no-cache"); headers.add(HttpHeaders.EXPIRES, "0"); + headers.add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); return ResponseEntity.ok() .headers(headers) @@ -73,12 +79,19 @@ public class Download extends ApiRestController { @GetMapping("/download-info") public ResponseEntity getDownloadInfo(@RequestParam String fileId) { - FileUpload fileUpload = fileService.getFileUploadByFileId(fileId); + Optional optionalFileUpload = fileService.getFileUploadByFileId(fileId); + FileUpload fileUpload = optionalFileUpload.orElse(null); + if(optionalFileUpload.isEmpty()) { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + + boolean downloadable = !fileUpload.isSingleDownload() || fileUpload.getDownloadCount() == 0; Map response = new HashMap<>(); response.put("fileId", fileUpload.getFileId()); response.put("passwordProtected", fileUpload.isPasswordProtected()); response.put("singleDownload", fileUpload.isSingleDownload()); + response.put("downloadable", downloadable); return new ResponseEntity<>(response, HttpStatus.OK); } diff --git a/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java b/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java index 638ce6d..6dc208f 100644 --- a/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java +++ b/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java @@ -45,6 +45,14 @@ public class Upload extends ApiRestController { } FileUpload fileUpload = fileService.processUploadedFile(file, request.getRemoteAddr(), passwordProtected, singleDownload, fileDescription); + + if(fileUpload == null) { + log.debug("File Upload failed for IP: " + request.getRemoteAddr()); + Map response = new HashMap<>(); + response.put("message", "FileUpload failed. FileName might have invalid characters."); + return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST); + } + log.debug("User uploaded file " + file.getOriginalFilename() + " from IP " + request.getRemoteAddr() + " successfully."); Map response = new HashMap<>(); diff --git a/src/main/java/de/w665/sharepulse/service/FileService.java b/src/main/java/de/w665/sharepulse/service/FileService.java index e3e0184..9b8fea0 100644 --- a/src/main/java/de/w665/sharepulse/service/FileService.java +++ b/src/main/java/de/w665/sharepulse/service/FileService.java @@ -3,7 +3,6 @@ package de.w665.sharepulse.service; import de.w665.sharepulse.db.repo.FileUploadRepository; import de.w665.sharepulse.model.FileUpload; import jakarta.annotation.PostConstruct; -import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.tomcat.util.http.fileupload.FileUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +16,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Date; +import java.util.Optional; @Slf4j @Service @@ -70,6 +70,14 @@ public class FileService { password = fileSecurityService.generateFilePassword(); } + /*String encodedFileName = ""; + try { + encodedFileName = URLEncoder.encode(file.getOriginalFilename(), StandardCharsets.UTF_8.toString()); + } catch (UnsupportedEncodingException e) { + log.error("Error encoding file name: " + e.getMessage()); + return null; + }*/ + FileUpload fileUpload = FileUpload.builder() .fileId(fileId) .fileName(file.getOriginalFilename()) @@ -104,7 +112,7 @@ public class FileService { return new File(getTempDirPath() + File.separator + fileId); } - public FileUpload getFileUploadByFileId(String fileId) { + public Optional getFileUploadByFileId(String fileId) { return fileUploadRepository.retrieveFileUploadByFileId(fileId); }