From 430f83e8e9d034b7edee27da3749342bec31b462 Mon Sep 17 00:00:00 2001 From: David Montesinos Date: Mon, 21 Apr 2025 16:46:55 +0200 Subject: [PATCH] Only compute hash when file has query string --- Oqtane.Server/Pages/Files.cshtml.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Oqtane.Server/Pages/Files.cshtml.cs b/Oqtane.Server/Pages/Files.cshtml.cs index 551be05f..4105262e 100644 --- a/Oqtane.Server/Pages/Files.cshtml.cs +++ b/Oqtane.Server/Pages/Files.cshtml.cs @@ -137,14 +137,14 @@ namespace Oqtane.Pages string downloadName = file.Name; string filepath = _files.GetFilePath(file); - var etagInput = $"{file.ModifiedOn.Ticks}:{file.Size}"; - if (Request.QueryString.HasValue) { - etagInput += $":{Request.QueryString.Value}"; + etag = Utilities.GenerateSimpleHash16($"{file.ModifiedOn.Ticks}:{file.Size}:{Request.QueryString.Value}"); + } + else + { + etag = Convert.ToString(file.ModifiedOn.Ticks ^ file.Size, 16); } - - etag = Utilities.GenerateSimpleHash16(etagInput); var header = ""; if (HttpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var ifNoneMatch))