From 54431f2bc91c5dcaa9206137e4e1ac7dd4f7c6d2 Mon Sep 17 00:00:00 2001 From: Rostislav Raykov Date: Sat, 30 Nov 2024 22:38:12 +0200 Subject: [PATCH] generated links for files now should respect the "X-Forwarded-Proto" header if the app is behind a well setup reverse proxy --- .../org/rostislav/quickdrop/util/FileUtils.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/rostislav/quickdrop/util/FileUtils.java b/src/main/java/org/rostislav/quickdrop/util/FileUtils.java index 8ae86bc..81bdfbc 100644 --- a/src/main/java/org/rostislav/quickdrop/util/FileUtils.java +++ b/src/main/java/org/rostislav/quickdrop/util/FileUtils.java @@ -20,16 +20,12 @@ public class FileUtils { return String.format("%.2f %s", sizeInUnits, units[unitIndex]); } - public static long bytesToMegabytes(long bytes) { - return bytes / 1024 / 1024; - } - - public static long megabytesToBytes(long megabytes) { - return megabytes * 1024 * 1024; - } - public static String getDownloadLink(HttpServletRequest request, FileEntity fileEntity) { - return request.getScheme() + "://" + request.getServerName() + "/file/" + fileEntity.uuid; + String scheme = request.getHeader("X-Forwarded-Proto"); + if (scheme == null) { + scheme = request.getScheme(); // Fallback to the default scheme + } + return scheme + "://" + request.getServerName() + "/file/" + fileEntity.uuid; } public static void populateModelAttributes(FileEntity fileEntity, Model model, HttpServletRequest request) {