kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use deterministic hash in file server image generation

Browse Source
This commit is contained in:
sbwalker 2025-01-28 15:55:40 -05:00
parent 37de18c670
commit 188be2fa8c
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Oqtane.Server/Pages/Files.cshtml.cs
View File

@ -131,8 +131,7 @@ namespace Oqtane.Pages
string downloadName = file.Name; string downloadName = file.Name;
string filepath = _files.GetFilePath(file); string filepath = _files.GetFilePath(file);
var etagValue = file.ModifiedOn.Ticks ^ file.Size; // evaluate any querystring parameters
bool isRequestingImageManipulation = false; bool isRequestingImageManipulation = false;
int width = 0; int width = 0;
@ -140,39 +139,34 @@ namespace Oqtane.Pages
if (Request.Query.TryGetValue("width", out var widthStr) && int.TryParse(widthStr, out width) && width > 0) if (Request.Query.TryGetValue("width", out var widthStr) && int.TryParse(widthStr, out width) && width > 0)
{ {
isRequestingImageManipulation = true; isRequestingImageManipulation = true;
etagValue ^= (width * 31);
} }
if (Request.Query.TryGetValue("height", out var heightStr) && int.TryParse(heightStr, out height) && height > 0) if (Request.Query.TryGetValue("height", out var heightStr) && int.TryParse(heightStr, out height) && height > 0)
{ {
isRequestingImageManipulation = true; isRequestingImageManipulation = true;
etagValue ^= (height * 17);
} }
Request.Query.TryGetValue("mode", out var mode); Request.Query.TryGetValue("mode", out var mode);
Request.Query.TryGetValue("position", out var position); Request.Query.TryGetValue("position", out var position);
Request.Query.TryGetValue("background", out var background); Request.Query.TryGetValue("background", out var background);
if (width > 0 || height > 0)
{
if (!string.IsNullOrWhiteSpace(mode)) etagValue ^= mode.ToString().GetHashCode();
if (!string.IsNullOrWhiteSpace(position)) etagValue ^= position.ToString().GetHashCode();
if (!string.IsNullOrWhiteSpace(background)) etagValue ^= background.ToString().GetHashCode();
}
int rotate; int rotate;
if (Request.Query.TryGetValue("rotate", out var rotateStr) && int.TryParse(rotateStr, out rotate) && 360 > rotate && rotate > 0) if (Request.Query.TryGetValue("rotate", out var rotateStr) && int.TryParse(rotateStr, out rotate) && 360 > rotate && rotate > 0)
{ {
isRequestingImageManipulation = true; isRequestingImageManipulation = true;
etagValue ^= (rotate * 13);
} }
if (Request.Query.TryGetValue("format", out var format) && _imageService.GetAvailableFormats().Contains(format.ToString())) if (Request.Query.TryGetValue("format", out var format) && _imageService.GetAvailableFormats().Contains(format.ToString()))
{ {
isRequestingImageManipulation = true; isRequestingImageManipulation = true;
etagValue ^= format.ToString().GetHashCode();
} }
etag = Convert.ToString(etagValue, 16); if (isRequestingImageManipulation)
{
etag = Utilities.GenerateSimpleHash(Request.QueryString.Value);
}
else
{
etag = Convert.ToString(file.ModifiedOn.Ticks ^ file.Size, 16);
}
var header = ""; var header = "";
if (HttpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var ifNoneMatch)) if (HttpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var ifNoneMatch))

6
Oqtane.Shared/Interfaces/IImageService.cs
View File

@ -1,9 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Oqtane.Services namespace Oqtane.Services
{ {
public interface IImageService public interface IImageService