* update string extensions IsFullPath to support more filepaths with new built-in Path.IsPathFullyQualified
* resolve TODO to switch to Path.IsPathFullyQualified supported from .NET Standard 2.1
* Use content root instead of web root for uploaded images
* Un-break a breaking change
* handle special parsing of AngularJS json response
* change htmlId selector to support html id's with numbers
* remove bad test case
* test IsFullPath without tricky UNC paths that are not useful
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
(cherry picked from commit d18dc92137)
107 lines
3.9 KiB
C#
107 lines
3.9 KiB
C#
using System.Net;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.Extensions.Options;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Hosting;
|
|
using Umbraco.Cms.Core.IO;
|
|
using Umbraco.Cms.Core.Media;
|
|
using Umbraco.Cms.Core.Strings;
|
|
using Umbraco.Cms.Web.Common.ActionsResults;
|
|
using Umbraco.Cms.Web.Common.Attributes;
|
|
using Umbraco.Cms.Web.Common.Authorization;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Web.BackOffice.Controllers;
|
|
|
|
[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
|
|
[Authorize(Policy = AuthorizationPolicies.SectionAccessForTinyMce)]
|
|
public class TinyMceController : UmbracoAuthorizedApiController
|
|
{
|
|
private readonly ContentSettings _contentSettings;
|
|
private readonly IHostingEnvironment _hostingEnvironment;
|
|
private readonly IImageUrlGenerator _imageUrlGenerator;
|
|
private readonly IIOHelper _ioHelper;
|
|
private readonly IShortStringHelper _shortStringHelper;
|
|
|
|
public TinyMceController(
|
|
IHostingEnvironment hostingEnvironment,
|
|
IShortStringHelper shortStringHelper,
|
|
IOptionsSnapshot<ContentSettings> contentSettings,
|
|
IIOHelper ioHelper,
|
|
IImageUrlGenerator imageUrlGenerator)
|
|
{
|
|
_hostingEnvironment = hostingEnvironment;
|
|
_shortStringHelper = shortStringHelper;
|
|
_contentSettings = contentSettings.Value;
|
|
_ioHelper = ioHelper;
|
|
_imageUrlGenerator = imageUrlGenerator;
|
|
}
|
|
|
|
[HttpPost]
|
|
public async Task<IActionResult> UploadImage(List<IFormFile> file)
|
|
{
|
|
// Create an unique folder path to help with concurrent users to avoid filename clash
|
|
var imageTempPath =
|
|
_hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempImageUploads + "/" + Guid.NewGuid());
|
|
|
|
// Ensure image temp path exists
|
|
if (Directory.Exists(imageTempPath) == false)
|
|
{
|
|
Directory.CreateDirectory(imageTempPath);
|
|
}
|
|
|
|
// Must have a file
|
|
if (file.Count == 0)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
// Should only have one file
|
|
if (file.Count > 1)
|
|
{
|
|
return new UmbracoProblemResult("Only one file can be uploaded at a time", HttpStatusCode.BadRequest);
|
|
}
|
|
|
|
IFormFile formFile = file.First();
|
|
|
|
// Really we should only have one file per request to this endpoint
|
|
// var file = result.FileData[0];
|
|
var fileName = formFile.FileName.Trim(new[] { '\"' }).TrimEnd();
|
|
var safeFileName = fileName.ToSafeFileName(_shortStringHelper);
|
|
var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLowerInvariant();
|
|
|
|
if (_contentSettings.IsFileAllowedForUpload(ext) == false ||
|
|
_imageUrlGenerator.IsSupportedImageFormat(ext) == false)
|
|
{
|
|
// Throw some error - to say can't upload this IMG type
|
|
return new UmbracoProblemResult("This is not an image filetype extension that is approved", HttpStatusCode.BadRequest);
|
|
}
|
|
|
|
var newFilePath = imageTempPath + Path.DirectorySeparatorChar + safeFileName;
|
|
var relativeNewFilePath = GetRelativePath(newFilePath);
|
|
|
|
await using (FileStream stream = System.IO.File.Create(newFilePath))
|
|
{
|
|
await formFile.CopyToAsync(stream);
|
|
}
|
|
|
|
return Ok(new { tmpLocation = relativeNewFilePath });
|
|
}
|
|
|
|
// Use private method istead of _ioHelper.GetRelativePath as that is relative for the webroot and not the content root.
|
|
private string GetRelativePath(string path)
|
|
{
|
|
if (path.IsFullPath())
|
|
{
|
|
var rootDirectory = _hostingEnvironment.MapPathContentRoot("~");
|
|
var relativePath = _ioHelper.PathStartsWith(path, rootDirectory) ? path[rootDirectory.Length..] : path;
|
|
path = relativePath;
|
|
}
|
|
|
|
return PathUtility.EnsurePathIsApplicationRootPrefixed(path);
|
|
}
|
|
}
|