From 51954ac73725d7f054bbc4c2200b09bfd8be449b Mon Sep 17 00:00:00 2001 From: Jeremy Foster Date: Sat, 24 Jan 2026 23:00:06 -0800 Subject: [PATCH] Fix bugs --- api/net/Areas/Subscriber/Controllers/ContentController.cs | 2 +- libs/net/template/ReportEngine.cs | 5 ++++- openshift/scripts/deploy.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/api/net/Areas/Subscriber/Controllers/ContentController.cs b/api/net/Areas/Subscriber/Controllers/ContentController.cs index 647dbad5a..fe84f7426 100644 --- a/api/net/Areas/Subscriber/Controllers/ContentController.cs +++ b/api/net/Areas/Subscriber/Controllers/ContentController.cs @@ -202,7 +202,7 @@ public async Task DownloadFileAsync(long id) [SwaggerOperation(Tags = new[] { "Content" })] public IActionResult AnonymousDownloadFile(string path) { - var ext = Path.GetExtension(path).Substring(1); + var ext = Path.GetExtension(path).TrimStart('.'); if (!_storageOptions.AllowAnonymousDownloadFileTypes.Any(value => String.Equals(value, ext, StringComparison.OrdinalIgnoreCase))) throw new InvalidOperationException("Unable to download file."); path = String.IsNullOrWhiteSpace(path) ? "" : HttpUtility.UrlDecode(path).MakeRelativePath(); diff --git a/libs/net/template/ReportEngine.cs b/libs/net/template/ReportEngine.cs index 10947ab18..c3701b863 100644 --- a/libs/net/template/ReportEngine.cs +++ b/libs/net/template/ReportEngine.cs @@ -1,6 +1,7 @@ using System.Globalization; using System.IO.Compression; +using System.Net; using System.Text; using System.Text.Json; using System.Text.Json.Nodes; @@ -532,8 +533,10 @@ await report.Sections await File.WriteAllBytesAsync(fullPath, imageBytes); + var urlPathToImage = WebUtility.UrlEncode(pathToImage); + // Update the section to include the new image. - sectionData.Settings.UrlCache = this.TemplateOptions.SubscriberAppUrl?.Append($"api/subscriber/contents/download?path={pathToImage}").AbsoluteUri; + sectionData.Settings.UrlCache = this.TemplateOptions.SubscriberAppUrl?.Append($"api/subscriber/contents/download?path={urlPathToImage}").AbsoluteUri; } } else diff --git a/openshift/scripts/deploy.sh b/openshift/scripts/deploy.sh index 9d33d1e40..819bff566 100755 --- a/openshift/scripts/deploy.sh +++ b/openshift/scripts/deploy.sh @@ -48,7 +48,7 @@ podsExtractQuotes=$(getPods extract-quotes-service deployment $env) podsFolderCollection=$(getPods folder-collection-service deployment $env) podsContent=$(getPods content-service deployment $env) podsIndexing=$(getPods indexing-service deployment $env) -if [ "$env" != "dev "]; then +if [[ "$env" != "dev " ]]; then podsIndexingCloud=$(getPods indexing-service-cloud deployment $env) fi podsEventHandler=$(getPods event-handler-service deployment $env) @@ -139,7 +139,7 @@ scale extract-quotes-service $podsExtractQuotes deployment $env scale folder-collection-service $podsFolderCollection deployment $env scale content-service $podsContent deployment $env scale indexing-service $podsIndexing deployment $env -if [ "$env" != "dev" ]; then +if [[ "$env" != "dev" ]]; then scale indexing-service-cloud $podsIndexingCloud deployment $env fi scale event-handler-service $podsEventHandler deployment $env