mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-04-05 10:56:56 +08:00
* 6748: Stricter file and folder name validation (#6792) * Media Library: More strict file and folder name validation, fixes #6748 * Resetting MediaLibraryService changes to 1.10.x * Code styling in FileSystemStorageProvider * Adding string file and folder name validation to FileSystemStorageProvider, so that MediaLibrary components don't need to do it separately * Applying the same file and folder name validation to AzureFileSystem too * Code styling and fixes in AzureFileSystem, MediaLibrary and IStorageProvider * Simplifying invalid character detection * Code styling * Adding InvalidNameCharacterException to be able to handle invalid characters precisely at various user-facing components * Updating MediaLibrary not to log an error when a file can't be uploaded due to invalid characters --------- Co-authored-by: Lombiq <github@lombiq.com> * #6793: Adding a content-independent culture selector shape for the front-end (#8784) * Adds a new CultureSelector shape for front-end * fixed query string culture change * Moving NameValueCollectionExtensions from Orchard.DynamicForms and Orchard.Localization to Orchard.Framework * Code styling * Simplifying UserCultureSelectorController and removing the addition of the culture to the query string * EOF empty lines and code styling * Fixing that the main Orchard.Localization should depend on Orchard.Autoroute * Code styling in LocalizationService * Updating LocalizationService to not have to use IEnumerable.Single * Matching culture name matching in LocalizationService culture- and casing-invariant --------- Co-authored-by: Sergio Navarro <jersio@hotmail.com> Co-authored-by: psp589 <pablosanchez589@gmail.com> * #8640: Fixing consistency between different Enumeration Field flavors' data storage (#8789) * Reworking EnumerationField's logic to store/retrieve its (selected) values * Fixing exception when creating new item with CheckboxList flavor, adding more nullchecks and compactness * Code styling in EnumerationFieldDriver * Code styling in EnumerationField editor template * Fixing that EnumerationFieldDriver and the EnumerationField editor template should read SelectedValues instead of Values directly --------- Co-authored-by: Matteo Piovanelli <MatteoPiovanelli-Laser@users.noreply.github.com> * Fixing merge --------- Co-authored-by: Lombiq <github@lombiq.com> Co-authored-by: Sergio Navarro <jersio@hotmail.com> Co-authored-by: psp589 <pablosanchez589@gmail.com> Co-authored-by: Matteo Piovanelli <MatteoPiovanelli-Laser@users.noreply.github.com>
This commit is contained in:
Benedek Farkas
GitHub
parent
0faf196f74
commit
e60a845359
@ -96,6 +96,8 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
return newPath;
|
||||
}
|
||||
|
||||
private static string GetFolderName(string path) => path.Substring(path.LastIndexOf('/') + 1);
|
||||
|
||||
public string Combine(string path1, string path2) {
|
||||
if (path1 == null) {
|
||||
throw new ArgumentNullException("path1");
|
||||
@ -148,10 +150,10 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
}
|
||||
|
||||
return BlobClient.ListBlobs(prefix)
|
||||
.OfType<CloudBlockBlob>()
|
||||
.Where(blobItem => !blobItem.Uri.AbsoluteUri.EndsWith(FolderEntry))
|
||||
.Select(blobItem => new AzureBlobFileStorage(blobItem, _absoluteRoot))
|
||||
.ToArray();
|
||||
.OfType<CloudBlockBlob>()
|
||||
.Where(blobItem => !blobItem.Uri.AbsoluteUri.EndsWith(FolderEntry))
|
||||
.Select(blobItem => new AzureBlobFileStorage(blobItem, _absoluteRoot))
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
public IEnumerable<IStorageFolder> ListFolders(string path) {
|
||||
@ -201,6 +203,11 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
|
||||
public void CreateFolder(string path) {
|
||||
path = ConvertToRelativeUriPath(path);
|
||||
|
||||
if (FileSystemStorageProvider.FolderNameContainsInvalidCharacters(GetFolderName(path))) {
|
||||
throw new InvalidNameCharacterException("The directory name contains invalid character(s)");
|
||||
}
|
||||
|
||||
Container.EnsureDirectoryDoesNotExist(String.Concat(_root, path));
|
||||
|
||||
// Creating a virtually hidden file to make the directory an existing concept
|
||||
@ -232,7 +239,11 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
path = ConvertToRelativeUriPath(path);
|
||||
newPath = ConvertToRelativeUriPath(newPath);
|
||||
|
||||
// Workaround for https://github.com/Azure/azure-storage-net/issues/892
|
||||
if (FileSystemStorageProvider.FolderNameContainsInvalidCharacters(GetFolderName(newPath))) {
|
||||
throw new InvalidNameCharacterException("The new directory name contains invalid character(s)");
|
||||
}
|
||||
|
||||
// Workaround for https://github.com/Azure/azure-storage-net/issues/892.
|
||||
// Renaming a folder by only changing the casing corrupts all the files in the folder.
|
||||
if (path.Equals(newPath, StringComparison.OrdinalIgnoreCase)) {
|
||||
var tempPath = Guid.NewGuid().ToString() + "/";
|
||||
@ -277,6 +288,10 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
path = ConvertToRelativeUriPath(path);
|
||||
newPath = ConvertToRelativeUriPath(newPath);
|
||||
|
||||
if (FileSystemStorageProvider.FileNameContainsInvalidCharacters(Path.GetFileName(newPath))) {
|
||||
throw new InvalidNameCharacterException("The new file name contains invalid character(s)");
|
||||
}
|
||||
|
||||
Container.EnsureBlobExists(String.Concat(_root, path));
|
||||
Container.EnsureBlobDoesNotExist(String.Concat(_root, newPath));
|
||||
|
||||
@ -301,6 +316,10 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
public IStorageFile CreateFile(string path) {
|
||||
path = ConvertToRelativeUriPath(path);
|
||||
|
||||
if (FileSystemStorageProvider.FileNameContainsInvalidCharacters(Path.GetFileName(path))) {
|
||||
throw new InvalidNameCharacterException("The file name contains invalid character(s)");
|
||||
}
|
||||
|
||||
if (Container.BlobExists(String.Concat(_root, path))) {
|
||||
throw new ArgumentException("File " + path + " already exists");
|
||||
}
|
||||
@ -388,10 +407,7 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
_rootPath = rootPath;
|
||||
}
|
||||
|
||||
public string GetName() {
|
||||
var path = GetPath();
|
||||
return path.Substring(path.LastIndexOf('/') + 1);
|
||||
}
|
||||
public string GetName() => GetFolderName(GetPath());
|
||||
|
||||
public string GetPath() {
|
||||
return _blob.Uri.ToString().Substring(_rootPath.Length).Trim('/');
|
||||
@ -416,11 +432,12 @@ namespace Orchard.Azure.Services.FileSystems {
|
||||
long size = 0;
|
||||
|
||||
foreach (var blobItem in directoryBlob.ListBlobs()) {
|
||||
if (blobItem is CloudBlockBlob)
|
||||
size += ((CloudBlockBlob)blobItem).Properties.Length;
|
||||
|
||||
if (blobItem is CloudBlobDirectory)
|
||||
size += GetDirectorySize((CloudBlobDirectory)blobItem);
|
||||
if (blobItem is CloudBlockBlob blob) {
|
||||
size += blob.Properties.Length;
|
||||
}
|
||||
else if (blobItem is CloudBlobDirectory directory) {
|
||||
size += GetDirectorySize(directory);
|
||||
}
|
||||
}
|
||||
|
||||
return size;
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Specialized;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
|
||||
namespace Orchard.DynamicForms.Helpers {
|
||||
public static class NameValueCollectionExtensions {
|
||||
public static string ToQueryString(this NameValueCollection nameValues) {
|
||||
return String.Join("&", (from string name in nameValues select String.Concat(name, "=", HttpUtility.UrlEncode(nameValues[name]))).ToArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -339,7 +339,6 @@
|
||||
<Compile Include="Migrations.cs" />
|
||||
<Compile Include="Handlers\ReadFormValuesHandler.cs" />
|
||||
<Compile Include="Services\FormElementEventHandlerBase.cs" />
|
||||
<Compile Include="Helpers\NameValueCollectionExtensions.cs" />
|
||||
<Compile Include="Models\Submission.cs" />
|
||||
<Compile Include="Permissions.cs" />
|
||||
<Compile Include="Services\FormService.cs" />
|
||||
|
||||
@ -467,4 +467,4 @@ namespace Orchard.DynamicForms.Services {
|
||||
return validatorElementType == elementType || validatorElementType.IsAssignableFrom(elementType);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,46 +4,41 @@ using Orchard.ContentManagement.Handlers;
|
||||
using Orchard.Fields.Fields;
|
||||
using Orchard.Fields.Settings;
|
||||
using Orchard.Localization;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Orchard.Fields.Drivers {
|
||||
public class EnumerationFieldDriver : ContentFieldDriver<EnumerationField> {
|
||||
public IOrchardServices Services { get; set; }
|
||||
|
||||
private const string TemplateName = "Fields/Enumeration.Edit";
|
||||
|
||||
public EnumerationFieldDriver(IOrchardServices services) {
|
||||
Services = services;
|
||||
|
||||
T = NullLocalizer.Instance;
|
||||
}
|
||||
|
||||
public Localizer T { get; set; }
|
||||
|
||||
private static string GetPrefix(ContentField field, ContentPart part) {
|
||||
return part.PartDefinition.Name + "." + field.Name;
|
||||
}
|
||||
private static string GetPrefix(ContentField field, ContentPart part) =>
|
||||
part.PartDefinition.Name + "." + field.Name;
|
||||
|
||||
private static string GetDifferentiator(EnumerationField field, ContentPart part) {
|
||||
return field.Name;
|
||||
}
|
||||
private static string GetDifferentiator(EnumerationField field) => field.Name;
|
||||
|
||||
protected override DriverResult Display(ContentPart part, EnumerationField field, string displayType, dynamic shapeHelper) {
|
||||
return ContentShape("Fields_Enumeration", GetDifferentiator(field, part),
|
||||
() => shapeHelper.Fields_Enumeration());
|
||||
return ContentShape("Fields_Enumeration", GetDifferentiator(field), () => shapeHelper.Fields_Enumeration());
|
||||
}
|
||||
|
||||
protected override DriverResult Editor(ContentPart part, EnumerationField field, dynamic shapeHelper) {
|
||||
return ContentShape("Fields_Enumeration_Edit", GetDifferentiator(field, part),
|
||||
() => {
|
||||
if (part.IsNew() && String.IsNullOrEmpty(field.Value)) {
|
||||
var settings = field.PartFieldDefinition.Settings.GetModel<EnumerationFieldSettings>();
|
||||
if (!String.IsNullOrWhiteSpace(settings.DefaultValue)) {
|
||||
field.Value = settings.DefaultValue;
|
||||
}
|
||||
return ContentShape("Fields_Enumeration_Edit", GetDifferentiator(field), () => {
|
||||
if (part.IsNew() && string.IsNullOrEmpty(field.Value)) {
|
||||
var settings = field.PartFieldDefinition.Settings.GetModel<EnumerationFieldSettings>();
|
||||
if (!string.IsNullOrWhiteSpace(settings.DefaultValue)) {
|
||||
field.SelectedValues = new string[] { settings.DefaultValue };
|
||||
}
|
||||
return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part));
|
||||
});
|
||||
}
|
||||
|
||||
return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part));
|
||||
});
|
||||
}
|
||||
|
||||
protected override DriverResult Editor(ContentPart part, EnumerationField field, IUpdateModel updater, dynamic shapeHelper) {
|
||||
|
||||
@ -7,28 +7,16 @@ namespace Orchard.Fields.Fields {
|
||||
private const char Separator = ';';
|
||||
|
||||
public string Value {
|
||||
get { return Storage.Get<string>(); }
|
||||
set { Storage.Set(value ?? String.Empty); }
|
||||
get => Storage.Get<string>()?.Trim(Separator) ?? "";
|
||||
set => Storage.Set(string.IsNullOrWhiteSpace(value)
|
||||
? string.Empty
|
||||
// It is now the responsibility of this field to (re-)add the separators.
|
||||
: Separator + value.Trim(Separator) + Separator);
|
||||
}
|
||||
|
||||
public string[] SelectedValues {
|
||||
get {
|
||||
var value = Value;
|
||||
if(string.IsNullOrWhiteSpace(value)) {
|
||||
return new string[0];
|
||||
}
|
||||
|
||||
return value.Split(new [] { Separator }, StringSplitOptions.RemoveEmptyEntries);
|
||||
}
|
||||
|
||||
set {
|
||||
if (value == null || value.Length == 0) {
|
||||
Value = String.Empty;
|
||||
}
|
||||
else {
|
||||
Value = Separator + string.Join(Separator.ToString(), value) + Separator;
|
||||
}
|
||||
}
|
||||
get => Value?.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries) ?? new string[0];
|
||||
set => Value = value?.Length > 0 ? string.Join(Separator.ToString(), value) : "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,22 +1,27 @@
|
||||
@model Orchard.Fields.Fields.EnumerationField
|
||||
|
||||
@using Orchard.Fields.Settings;
|
||||
|
||||
@{
|
||||
var settings = Model.PartFieldDefinition.Settings.GetModel<EnumerationFieldSettings>();
|
||||
string[] options = (!String.IsNullOrWhiteSpace(settings.Options)) ? settings.Options.Split(new string[] { System.Environment.NewLine }, StringSplitOptions.None) : new string[] { T("Select an option").ToString() };
|
||||
}
|
||||
|
||||
<fieldset>
|
||||
<label for="@Html.FieldIdFor(m => m.Value)" @if (settings.Required) { <text> class="required" </text> }>@Model.DisplayName</label>
|
||||
<label for="@Html.FieldIdFor(m => m.Value)" @if (settings.Required) { <text> class="required" </text> }>@Model.DisplayName</label>
|
||||
@switch (settings.ListMode) {
|
||||
case ListMode.Dropdown:
|
||||
@Html.DropDownListFor(m => m.Value, new SelectList(options, Model.Value), settings.Required ? new { required = "required" } : null)
|
||||
@Html.DropDownListFor(m => m.Value, new SelectList(options, Model.SelectedValues.FirstOrDefault()), settings.Required ? new { required = "required" } : null)
|
||||
break;
|
||||
|
||||
case ListMode.Radiobutton:
|
||||
foreach (var option in options) {
|
||||
if (string.IsNullOrWhiteSpace(option)) {
|
||||
<label>@Html.RadioButton("Value", "", string.IsNullOrWhiteSpace(Model.Value), settings.Required ? new { required = "required" } : null)<i>@T("unset")</i></label> }
|
||||
<label>@Html.RadioButton("Value", "", string.IsNullOrWhiteSpace(Model.SelectedValues.FirstOrDefault()), settings.Required ? new { required = "required" } : null)<i>@T("unset")</i></label>
|
||||
}
|
||||
else {
|
||||
<label>@Html.RadioButton("Value", option, (option == Model.Value), settings.Required ? new { required = "required" } : null)@option</label> }
|
||||
<label>@Html.RadioButton("Value", option, (option == Model.SelectedValues.FirstOrDefault()), settings.Required ? new { required = "required" } : null)@option</label>
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
using System;
|
||||
using System.Web.Mvc;
|
||||
using Orchard.Autoroute.Models;
|
||||
using Orchard.CulturePicker.Services;
|
||||
using Orchard.Environment.Extensions;
|
||||
using Orchard.Localization.Providers;
|
||||
using Orchard.Localization.Services;
|
||||
using Orchard.Mvc.Extensions;
|
||||
|
||||
namespace Orchard.Localization.Controllers {
|
||||
[OrchardFeature("Orchard.Localization.CultureSelector")]
|
||||
public class UserCultureSelectorController : Controller {
|
||||
private readonly ILocalizationService _localizationService;
|
||||
private readonly ICultureStorageProvider _cultureStorageProvider;
|
||||
public IOrchardServices Services { get; set; }
|
||||
|
||||
public UserCultureSelectorController(
|
||||
IOrchardServices services,
|
||||
ILocalizationService localizationService,
|
||||
ICultureStorageProvider cultureStorageProvider) {
|
||||
Services = services;
|
||||
_localizationService = localizationService;
|
||||
_cultureStorageProvider = cultureStorageProvider;
|
||||
}
|
||||
|
||||
public ActionResult ChangeCulture(string culture) {
|
||||
if (string.IsNullOrEmpty(culture)) {
|
||||
throw new ArgumentNullException(culture);
|
||||
}
|
||||
|
||||
var returnUrl = Utils.GetReturnUrl(Services.WorkContext.HttpContext.Request);
|
||||
if (string.IsNullOrEmpty(returnUrl))
|
||||
returnUrl = "";
|
||||
|
||||
if (_localizationService.TryGetRouteForUrl(returnUrl, out AutoroutePart currentRoutePart)
|
||||
&& _localizationService.TryFindLocalizedRoute(currentRoutePart.ContentItem, culture, out AutoroutePart localizedRoutePart)) {
|
||||
returnUrl = localizedRoutePart.Path;
|
||||
}
|
||||
|
||||
_cultureStorageProvider.SetCulture(culture);
|
||||
if (!returnUrl.StartsWith("~/")) {
|
||||
returnUrl = "~/" + returnUrl;
|
||||
}
|
||||
|
||||
return this.RedirectLocal(returnUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -9,7 +9,7 @@ Features:
|
||||
Orchard.Localization:
|
||||
Description: Enables localization of content items.
|
||||
Category: Content
|
||||
Dependencies: Settings
|
||||
Dependencies: Settings, Orchard.Autoroute
|
||||
Name: Content Localization
|
||||
Orchard.Localization.DateTimeFormat:
|
||||
Description: Enables PO-based translation of date/time formats and names of days and months.
|
||||
@ -30,7 +30,7 @@ Features:
|
||||
Description: Enables transliteration of the autoroute slug when creating a piece of content.
|
||||
Category: Content
|
||||
Name: URL Transliteration
|
||||
Dependencies: Orchard.Localization.Transliteration, Orchard.Autoroute
|
||||
Dependencies: Orchard.Localization.Transliteration
|
||||
Orchard.Localization.CultureNeutralPartsAndFields:
|
||||
Description: Enables the synchronization among localizations of parts and fields specifically marked as "Culture Neutral".
|
||||
Category: Content
|
||||
|
||||
@ -89,10 +89,11 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AdminMenu.cs" />
|
||||
<Compile Include="Controllers\AdminCultureSelectorController.cs" />
|
||||
<Compile Include="Extensions\Constants.cs" />
|
||||
<Compile Include="Controllers\AdminController.cs" />
|
||||
<Compile Include="Controllers\TransliterationAdminController.cs" />
|
||||
<Compile Include="Controllers\AdminCultureSelectorController.cs" />
|
||||
<Compile Include="Controllers\UserCultureSelectorController.cs" />
|
||||
<Compile Include="Extensions\MetaDataExtensions.cs" />
|
||||
<Compile Include="Handlers\LocalizationCultureNeutralityHandler.cs" />
|
||||
<Compile Include="Models\TransliterationSpecificationRecord.cs" />
|
||||
@ -120,6 +121,7 @@
|
||||
<Compile Include="Services\LocalizationService.cs" />
|
||||
<Compile Include="Services\TransliterationService.cs" />
|
||||
<Compile Include="Events\TransliterationSlugEventHandler.cs" />
|
||||
<Compile Include="Services\Utils.cs" />
|
||||
<Compile Include="Settings\LocalizationCultureNeutralityEditorEvents.cs" />
|
||||
<Compile Include="Settings\LocalizationCultureNeutralitySettings.cs" />
|
||||
<Compile Include="ViewModels\ContentLocalizationsViewModel.cs" />
|
||||
@ -196,8 +198,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Views\UserCultureSelector.cshtml" />
|
||||
<Content Include="Views\DefinitionTemplates\LocalizationCultureNeutralitySettings.cshtml" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
@ -233,4 +234,4 @@
|
||||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -1,4 +1,3 @@
|
||||
using System;
|
||||
using System.Web;
|
||||
using Orchard.Environment.Configuration;
|
||||
using Orchard.Environment.Extensions;
|
||||
@ -19,7 +18,8 @@ namespace Orchard.Localization.Selectors {
|
||||
private const string AdminCookieName = "OrchardCurrentCulture-Admin";
|
||||
private const int DefaultExpireTimeYear = 1;
|
||||
|
||||
public CookieCultureSelector(IHttpContextAccessor httpContextAccessor,
|
||||
public CookieCultureSelector(
|
||||
IHttpContextAccessor httpContextAccessor,
|
||||
IClock clock,
|
||||
ShellSettings shellSettings) {
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
@ -36,11 +36,10 @@ namespace Orchard.Localization.Selectors {
|
||||
|
||||
var cookie = new HttpCookie(cookieName, culture) {
|
||||
Expires = _clock.UtcNow.AddYears(DefaultExpireTimeYear),
|
||||
Domain = httpContext.Request.IsLocal ? null : httpContext.Request.Url.Host
|
||||
};
|
||||
|
||||
cookie.Domain = !httpContext.Request.IsLocal ? httpContext.Request.Url.Host : null;
|
||||
|
||||
if (!String.IsNullOrEmpty(_shellSettings.RequestUrlPrefix)) {
|
||||
if (!string.IsNullOrEmpty(_shellSettings.RequestUrlPrefix)) {
|
||||
cookie.Path = GetCookiePath(httpContext);
|
||||
}
|
||||
|
||||
@ -73,4 +72,4 @@ namespace Orchard.Localization.Selectors {
|
||||
return cookiePath;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using Orchard.Autoroute.Models;
|
||||
using Orchard.ContentManagement;
|
||||
using Orchard.Localization.Models;
|
||||
|
||||
@ -10,5 +11,7 @@ namespace Orchard.Localization.Services {
|
||||
void SetContentCulture(IContent content, string culture);
|
||||
IEnumerable<LocalizationPart> GetLocalizations(IContent content);
|
||||
IEnumerable<LocalizationPart> GetLocalizations(IContent content, VersionOptions versionOptions);
|
||||
bool TryFindLocalizedRoute(ContentItem routableContent, string cultureName, out AutoroutePart localizedRoute);
|
||||
bool TryGetRouteForUrl(string url, out AutoroutePart route);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,47 +1,56 @@
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Orchard.Autoroute.Models;
|
||||
using Orchard.Autoroute.Services;
|
||||
using Orchard.ContentManagement;
|
||||
using Orchard.ContentManagement.Aspects;
|
||||
using Orchard.Localization.Models;
|
||||
|
||||
namespace Orchard.Localization.Services {
|
||||
public class LocalizationService : ILocalizationService {
|
||||
private readonly IContentManager _contentManager;
|
||||
private readonly ICultureManager _cultureManager;
|
||||
private readonly IHomeAliasService _homeAliasService;
|
||||
|
||||
|
||||
public LocalizationService(IContentManager contentManager, ICultureManager cultureManager) {
|
||||
public LocalizationService(IContentManager contentManager, ICultureManager cultureManager, IHomeAliasService homeAliasService) {
|
||||
_contentManager = contentManager;
|
||||
_cultureManager = cultureManager;
|
||||
_homeAliasService = homeAliasService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Warning: Returns only the first item of same culture localizations.
|
||||
/// </summary>
|
||||
public LocalizationPart GetLocalizedContentItem(IContent content, string culture) =>
|
||||
GetLocalizedContentItem(content, culture, null);
|
||||
|
||||
public LocalizationPart GetLocalizedContentItem(IContent content, string culture) {
|
||||
return GetLocalizedContentItem(content, culture, null);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Warning: Returns only the first item of same culture localizations.
|
||||
/// </summary>
|
||||
public LocalizationPart GetLocalizedContentItem(IContent content, string culture, VersionOptions versionOptions) {
|
||||
var cultureRecord = _cultureManager.GetCultureByName(culture);
|
||||
|
||||
if (cultureRecord == null) return null;
|
||||
if (cultureRecord == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var localized = content.As<LocalizationPart>();
|
||||
|
||||
if (localized == null) return null;
|
||||
if (localized == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (localized?.Culture.Culture == culture) return localized;
|
||||
if (localized.Culture?.Culture == culture) return localized;
|
||||
|
||||
// Warning: Returns only the first of same culture localizations.
|
||||
return GetLocalizationsQuery(localized, versionOptions)
|
||||
.Where<LocalizationPartRecord>(l => l.CultureId == cultureRecord.Id)
|
||||
.Where<LocalizationPartRecord>(localization => localization.CultureId == cultureRecord.Id)
|
||||
.Slice(1)
|
||||
.FirstOrDefault();
|
||||
}
|
||||
|
||||
public string GetContentCulture(IContent content) {
|
||||
var localized = content.As<LocalizationPart>();
|
||||
|
||||
return localized?.Culture == null ? _cultureManager.GetSiteCulture() : localized.Culture.Culture;
|
||||
}
|
||||
public string GetContentCulture(IContent content) =>
|
||||
content.As<LocalizationPart>()?.Culture?.Culture ?? _cultureManager.GetSiteCulture();
|
||||
|
||||
public void SetContentCulture(IContent content, string culture) {
|
||||
var localized = content.As<LocalizationPart>();
|
||||
@ -51,30 +60,83 @@ namespace Orchard.Localization.Services {
|
||||
localized.Culture = _cultureManager.GetCultureByName(culture);
|
||||
}
|
||||
|
||||
public IEnumerable<LocalizationPart> GetLocalizations(IContent content) {
|
||||
return GetLocalizations(content, null);
|
||||
}
|
||||
/// <summary>
|
||||
/// Warning: May contain more than one localization of the same culture.
|
||||
/// </summary>
|
||||
public IEnumerable<LocalizationPart> GetLocalizations(IContent content) => GetLocalizations(content, null);
|
||||
|
||||
/// <summary>
|
||||
/// Warning: May contain more than one localization of the same culture.
|
||||
/// </summary>
|
||||
public IEnumerable<LocalizationPart> GetLocalizations(IContent content, VersionOptions versionOptions) {
|
||||
if (content.ContentItem.Id == 0) return Enumerable.Empty<LocalizationPart>();
|
||||
|
||||
var localized = content.As<LocalizationPart>();
|
||||
|
||||
return GetLocalizationsQuery(localized, versionOptions)
|
||||
.Where<LocalizationPartRecord>(l => l.Id != localized.Id) // Exclude the current content.
|
||||
.Where<LocalizationPartRecord>(localization => localization.Id != localized.Id) // Exclude the current content.
|
||||
.List();
|
||||
}
|
||||
|
||||
public bool TryGetRouteForUrl(string url, out AutoroutePart route) {
|
||||
route = _contentManager.Query<AutoroutePart, AutoroutePartRecord>()
|
||||
.ForVersion(VersionOptions.Published)
|
||||
.Where(r => r.DisplayAlias == url)
|
||||
.List()
|
||||
.FirstOrDefault();
|
||||
|
||||
route = route ?? _homeAliasService.GetHomePage(VersionOptions.Latest).As<AutoroutePart>();
|
||||
|
||||
return route != null;
|
||||
}
|
||||
|
||||
public bool TryFindLocalizedRoute(ContentItem routableContent, string cultureName, out AutoroutePart localizedRoute) {
|
||||
if (!routableContent.Parts.Any(p => p.Is<ILocalizableAspect>())) {
|
||||
localizedRoute = null;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
IEnumerable<LocalizationPart> localizations = GetLocalizations(routableContent, VersionOptions.Published);
|
||||
|
||||
ILocalizableAspect localizationPart = null, siteCultureLocalizationPart = null;
|
||||
foreach (var localization in localizations) {
|
||||
if (localization.Culture.Culture.Equals(cultureName, StringComparison.InvariantCultureIgnoreCase)) {
|
||||
localizationPart = localization;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (localization.Culture == null && siteCultureLocalizationPart == null) {
|
||||
siteCultureLocalizationPart = localization;
|
||||
}
|
||||
}
|
||||
|
||||
if (localizationPart == null) {
|
||||
localizationPart = siteCultureLocalizationPart;
|
||||
}
|
||||
|
||||
localizedRoute = localizationPart?.As<AutoroutePart>();
|
||||
|
||||
return localizedRoute != null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Warning: May contain more than one localization of the same culture.
|
||||
/// </summary>
|
||||
private IContentQuery<LocalizationPart> GetLocalizationsQuery(LocalizationPart localizationPart, VersionOptions versionOptions) {
|
||||
var masterId = localizationPart.HasTranslationGroup ?
|
||||
localizationPart.Record.MasterContentItemId : localizationPart.Id;
|
||||
var masterId = localizationPart.HasTranslationGroup
|
||||
? localizationPart.Record.MasterContentItemId
|
||||
: localizationPart.Id;
|
||||
|
||||
var query = versionOptions == null ?
|
||||
_contentManager.Query<LocalizationPart>() : _contentManager.Query<LocalizationPart>(versionOptions);
|
||||
var query = _contentManager.Query<LocalizationPart>(localizationPart.ContentItem.ContentType);
|
||||
|
||||
// Warning: May contain more than one localization of the same culture.
|
||||
return query.Where<LocalizationPartRecord>(l => l.Id == masterId || l.MasterContentItemId == masterId);
|
||||
if (versionOptions == null) {
|
||||
query = query.ForVersion(versionOptions);
|
||||
}
|
||||
|
||||
return query
|
||||
.Where<LocalizationPartRecord>(localization => localization.Id == masterId || localization.MasterContentItemId == masterId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
using System.Web;
|
||||
|
||||
namespace Orchard.CulturePicker.Services {
|
||||
public static class Utils {
|
||||
public static string GetReturnUrl(HttpRequestBase request) {
|
||||
if (request.UrlReferrer == null) {
|
||||
return "";
|
||||
}
|
||||
|
||||
string localUrl = GetAppRelativePath(request.UrlReferrer.AbsolutePath, request);
|
||||
return HttpUtility.UrlDecode(localUrl);
|
||||
}
|
||||
|
||||
public static string GetAppRelativePath(string logicalPath, HttpRequestBase request) {
|
||||
if (request.ApplicationPath == null) {
|
||||
return "";
|
||||
}
|
||||
|
||||
logicalPath = logicalPath.ToLower();
|
||||
string appPath = request.ApplicationPath.ToLower();
|
||||
if (appPath != "/") {
|
||||
appPath += "/";
|
||||
}
|
||||
else {
|
||||
return logicalPath.Substring(1);
|
||||
}
|
||||
|
||||
return logicalPath.Replace(appPath, "");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
@using Orchard.Localization.Services
|
||||
|
||||
@{
|
||||
var currentCulture = WorkContext.CurrentCulture;
|
||||
var supportedCultures = WorkContext.Resolve<ICultureManager>().ListCultures().ToList();
|
||||
}
|
||||
|
||||
<div id="culture-selection">
|
||||
<ul>
|
||||
@foreach (var supportedCulture in supportedCultures)
|
||||
{
|
||||
var url = Url.Action(
|
||||
"ChangeCulture",
|
||||
"UserCultureSelector",
|
||||
new
|
||||
{
|
||||
area = "Orchard.Localization",
|
||||
culture = supportedCulture,
|
||||
returnUrl = Html.ViewContext.HttpContext.Request.RawUrl
|
||||
});
|
||||
|
||||
<li>
|
||||
@if (supportedCulture.Equals(currentCulture))
|
||||
{
|
||||
<a href="@url">@T("{0} (current)", supportedCulture)</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<a href="@url">@supportedCulture</a>
|
||||
}
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
@ -111,10 +111,16 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
url = mediaPart.FileName,
|
||||
});
|
||||
}
|
||||
catch (Exception ex) {
|
||||
Logger.Error(ex, "Unexpected exception when uploading a media.");
|
||||
catch (InvalidNameCharacterException) {
|
||||
statuses.Add(new {
|
||||
error = T(ex.Message).Text,
|
||||
error = T("The file name contains invalid character(s)").Text,
|
||||
progress = 1.0,
|
||||
});
|
||||
}
|
||||
catch (Exception ex) {
|
||||
Logger.Error(ex, T("Unexpected exception when uploading a media.").Text);
|
||||
statuses.Add(new {
|
||||
error = ex.Message,
|
||||
progress = 1.0,
|
||||
});
|
||||
}
|
||||
@ -134,7 +140,7 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
return HttpNotFound();
|
||||
|
||||
// Check permission
|
||||
if (!(_mediaLibraryService.CheckMediaFolderPermission(Permissions.EditMediaContent, replaceMedia.FolderPath) && _mediaLibraryService.CheckMediaFolderPermission(Permissions.ImportMediaContent, replaceMedia.FolderPath))
|
||||
if (!(_mediaLibraryService.CheckMediaFolderPermission(Permissions.EditMediaContent, replaceMedia.FolderPath) && _mediaLibraryService.CheckMediaFolderPermission(Permissions.ImportMediaContent, replaceMedia.FolderPath))
|
||||
&& !_mediaLibraryService.CanManageMediaFolder(replaceMedia.FolderPath)) {
|
||||
return new HttpUnauthorizedResult();
|
||||
}
|
||||
@ -142,7 +148,7 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
var statuses = new List<object>();
|
||||
|
||||
var settings = Services.WorkContext.CurrentSite.As<MediaLibrarySettingsPart>();
|
||||
|
||||
|
||||
// Loop through each file in the request
|
||||
for (int i = 0; i < HttpContext.Request.Files.Count; i++) {
|
||||
// Pointer to file
|
||||
@ -150,7 +156,8 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
var filename = Path.GetFileName(file.FileName);
|
||||
|
||||
// if the file has been pasted, provide a default name
|
||||
if (file.ContentType.Equals("image/png", StringComparison.InvariantCultureIgnoreCase) && !filename.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase)) {
|
||||
if (file.ContentType.Equals("image/png", StringComparison.InvariantCultureIgnoreCase)
|
||||
&& !filename.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase)) {
|
||||
filename = "clipboard.png";
|
||||
}
|
||||
|
||||
@ -180,13 +187,15 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
if (mediaItemsUsingTheFile == 1) { // if the file is referenced only by the deleted media content, the file too can be removed.
|
||||
try {
|
||||
_mediaLibraryService.DeleteFile(replaceMedia.FolderPath, replaceMedia.FileName);
|
||||
} catch (ArgumentException) { // File not found by FileSystemStorageProvider is thrown as ArgumentException.
|
||||
}
|
||||
catch (ArgumentException) { // File not found by FileSystemStorageProvider is thrown as ArgumentException.
|
||||
statuses.Add(new {
|
||||
error = T("Error when deleting file to replace: file {0} does not exist in folder {1}. Media has been updated anyway.", replaceMedia.FileName, replaceMedia.FolderPath).Text,
|
||||
progress = 1.0
|
||||
});
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
// it changes the media file name
|
||||
replaceMedia.FileName = filename;
|
||||
}
|
||||
@ -210,7 +219,7 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
});
|
||||
}
|
||||
catch (Exception ex) {
|
||||
Logger.Error(ex, "Unexpected exception when uploading a media.");
|
||||
Logger.Error(ex, T("Unexpected exception when uploading a media.").Text);
|
||||
|
||||
statuses.Add(new {
|
||||
error = T(ex.Message).Text,
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Web.Mvc;
|
||||
using Orchard.ContentManagement;
|
||||
using Orchard.FileSystems.Media;
|
||||
using Orchard.Localization;
|
||||
using Orchard.Logging;
|
||||
using Orchard.MediaLibrary.Models;
|
||||
@ -36,7 +36,7 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
public ActionResult Create(string folderPath) {
|
||||
if (!(_mediaLibraryService.CheckMediaFolderPermission(Permissions.ImportMediaContent, folderPath) || _mediaLibraryService.CheckMediaFolderPermission(Permissions.EditMediaContent, folderPath))) {
|
||||
Services.Notifier.Error(T("Couldn't create media folder"));
|
||||
return RedirectToAction("Index", "Admin", new { area = "Orchard.MediaLibrary", folderPath = folderPath });
|
||||
return RedirectToAction("Index", "Admin", new { area = "Orchard.MediaLibrary", folderPath });
|
||||
}
|
||||
|
||||
// If the user is trying to access a folder above his boundaries, redirect him to his home folder
|
||||
@ -68,28 +68,32 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
return new HttpUnauthorizedResult();
|
||||
}
|
||||
|
||||
var failed = false;
|
||||
try {
|
||||
bool valid = String.IsNullOrWhiteSpace(viewModel.Name) || Regex.IsMatch(viewModel.Name, @"^[^:?#\[\]@!$&'()*+,.;=\s\""\<\>\\\|%]+$");
|
||||
if (!valid) {
|
||||
throw new ArgumentException(T("Folder contains invalid characters").ToString());
|
||||
}
|
||||
else {
|
||||
_mediaLibraryService.CreateFolder(viewModel.FolderPath, viewModel.Name);
|
||||
Services.Notifier.Information(T("Media folder created"));
|
||||
}
|
||||
_mediaLibraryService.CreateFolder(viewModel.FolderPath, viewModel.Name);
|
||||
Services.Notifier.Information(T("Media folder created"));
|
||||
}
|
||||
catch (InvalidNameCharacterException) {
|
||||
Services.Notifier.Error(T("The folder name contains invalid character(s)."));
|
||||
failed = true;
|
||||
}
|
||||
catch (ArgumentException argumentException) {
|
||||
Services.Notifier.Error(T("Creating Folder failed: {0}", argumentException.Message));
|
||||
failed = true;
|
||||
}
|
||||
|
||||
if (failed) {
|
||||
Services.TransactionManager.Cancel();
|
||||
return View(viewModel);
|
||||
}
|
||||
|
||||
return RedirectToAction("Index", "Admin", new { area = "Orchard.MediaLibrary" });
|
||||
}
|
||||
|
||||
public ActionResult Edit(string folderPath) {
|
||||
if (!(_mediaLibraryService.CheckMediaFolderPermission(Permissions.ImportMediaContent, folderPath) || _mediaLibraryService.CheckMediaFolderPermission(Permissions.EditMediaContent, folderPath))) {
|
||||
Services.Notifier.Error(T("Couldn't edit media folder"));
|
||||
return RedirectToAction("Index", "Admin", new { area = "Orchard.MediaLibrary", folderPath = folderPath });
|
||||
return RedirectToAction("Index", "Admin", new { area = "Orchard.MediaLibrary", folderPath });
|
||||
}
|
||||
|
||||
if (!_mediaLibraryService.CanManageMediaFolder(folderPath)) {
|
||||
@ -125,7 +129,7 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
var viewModel = new MediaManagerFolderEditViewModel();
|
||||
UpdateModel(viewModel);
|
||||
|
||||
if (!(_mediaLibraryService.CheckMediaFolderPermission(Permissions.ImportMediaContent, viewModel.FolderPath)
|
||||
if (!(_mediaLibraryService.CheckMediaFolderPermission(Permissions.ImportMediaContent, viewModel.FolderPath)
|
||||
|| _mediaLibraryService.CheckMediaFolderPermission(Permissions.EditMediaContent, viewModel.FolderPath))) {
|
||||
return new HttpUnauthorizedResult();
|
||||
}
|
||||
@ -136,14 +140,12 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
}
|
||||
|
||||
try {
|
||||
bool valid = String.IsNullOrWhiteSpace(viewModel.Name) || Regex.IsMatch(viewModel.Name, @"^[^:?#\[\]@!$&'()*+,.;=\s\""\<\>\\\|%]+$");
|
||||
if (!valid) {
|
||||
throw new ArgumentException(T("Folder contains invalid characters").ToString());
|
||||
}
|
||||
else {
|
||||
_mediaLibraryService.RenameFolder(viewModel.FolderPath, viewModel.Name);
|
||||
Services.Notifier.Information(T("Media folder renamed"));
|
||||
}
|
||||
_mediaLibraryService.RenameFolder(viewModel.FolderPath, viewModel.Name);
|
||||
Services.Notifier.Information(T("Media folder renamed"));
|
||||
}
|
||||
catch (InvalidNameCharacterException) {
|
||||
Services.Notifier.Error(T("The folder name contains invalid character(s)."));
|
||||
return View(viewModel);
|
||||
}
|
||||
catch (Exception exception) {
|
||||
Services.Notifier.Error(T("Editing Folder failed: {0}", exception.Message));
|
||||
@ -198,7 +200,7 @@ namespace Orchard.MediaLibrary.Controllers {
|
||||
// don't try to rename the file if there is no associated media file
|
||||
if (!string.IsNullOrEmpty(media.FileName)) {
|
||||
// check permission on source folder
|
||||
if(!_mediaLibraryService.CheckMediaFolderPermission(Permissions.DeleteMediaContent, media.FolderPath)) {
|
||||
if (!_mediaLibraryService.CheckMediaFolderPermission(Permissions.DeleteMediaContent, media.FolderPath)) {
|
||||
return new HttpUnauthorizedResult();
|
||||
}
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
using System;
|
||||
using Orchard.ContentManagement;
|
||||
using Orchard.ContentManagement.Drivers;
|
||||
using Orchard.FileSystems.Media;
|
||||
using Orchard.Localization;
|
||||
using Orchard.MediaLibrary.Models;
|
||||
using Orchard.MediaLibrary.Services;
|
||||
using Orchard.Security;
|
||||
using Orchard.UI.Notify;
|
||||
|
||||
namespace Orchard.MediaLibrary.MediaFileName
|
||||
{
|
||||
namespace Orchard.MediaLibrary.MediaFileName {
|
||||
public class MediaFileNameDriver : ContentPartDriver<MediaPart> {
|
||||
private readonly IAuthenticationService _authenticationService;
|
||||
private readonly IAuthorizationService _authorizationService;
|
||||
@ -58,6 +58,8 @@ namespace Orchard.MediaLibrary.MediaFileName
|
||||
var priorFileName = model.FileName;
|
||||
if (updater.TryUpdateModel(model, Prefix, null, null)) {
|
||||
if (model.FileName != null && !model.FileName.Equals(priorFileName, StringComparison.OrdinalIgnoreCase)) {
|
||||
var fieldName = "MediaFileNameEditorSettings.FileName";
|
||||
|
||||
try {
|
||||
_mediaLibraryService.RenameFile(part.FolderPath, priorFileName, model.FileName);
|
||||
part.FileName = model.FileName;
|
||||
@ -65,10 +67,13 @@ namespace Orchard.MediaLibrary.MediaFileName
|
||||
_notifier.Add(NotifyType.Success, T("File '{0}' was renamed to '{1}'", priorFileName, model.FileName));
|
||||
}
|
||||
catch (OrchardException) {
|
||||
updater.AddModelError("MediaFileNameEditorSettings.FileName", T("Unable to rename file. Invalid Windows file path."));
|
||||
updater.AddModelError(fieldName, T("Unable to rename file. Invalid Windows file path."));
|
||||
}
|
||||
catch (Exception) {
|
||||
updater.AddModelError("MediaFileNameEditorSettings.FileName", T("Unable to rename file"));
|
||||
catch (InvalidNameCharacterException) {
|
||||
updater.AddModelError(fieldName, T("The file name contains invalid character(s)."));
|
||||
}
|
||||
catch (Exception exception) {
|
||||
updater.AddModelError(fieldName, T("Unable to rename file: {0}", exception.Message));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@ using System.Web;
|
||||
using Orchard.ContentManagement;
|
||||
using Orchard.ContentManagement.MetaData.Models;
|
||||
using Orchard.Core.Common.Models;
|
||||
using Orchard.Core.Title.Models;
|
||||
using Orchard.FileSystems.Media;
|
||||
using Orchard.Localization;
|
||||
using Orchard.MediaLibrary.Factories;
|
||||
using Orchard.MediaLibrary.Models;
|
||||
using Orchard.Core.Title.Models;
|
||||
using Orchard.Validation;
|
||||
using Orchard.MediaLibrary.Providers;
|
||||
using Orchard.Validation;
|
||||
|
||||
namespace Orchard.MediaLibrary.Services {
|
||||
public class MediaLibraryService : IMediaLibraryService {
|
||||
@ -21,7 +21,6 @@ namespace Orchard.MediaLibrary.Services {
|
||||
private readonly IStorageProvider _storageProvider;
|
||||
private readonly IEnumerable<IMediaFactorySelector> _mediaFactorySelectors;
|
||||
private readonly IMediaFolderProvider _mediaFolderProvider;
|
||||
private static char[] HttpUnallowed = new char[] { '<', '>', '*', '%', '&', ':', '\\', '?', '#' };
|
||||
|
||||
public MediaLibraryService(
|
||||
IOrchardServices orchardServices,
|
||||
@ -146,12 +145,6 @@ namespace Orchard.MediaLibrary.Services {
|
||||
}
|
||||
|
||||
public string GetUniqueFilename(string folderPath, string filename) {
|
||||
|
||||
// remove any char which is unallowed in an HTTP request
|
||||
foreach (var unallowedChar in HttpUnallowed) {
|
||||
filename = filename.Replace(unallowedChar.ToString(), "");
|
||||
}
|
||||
|
||||
// compute a unique filename
|
||||
var uniqueFilename = filename;
|
||||
var index = 1;
|
||||
@ -178,9 +171,9 @@ namespace Orchard.MediaLibrary.Services {
|
||||
var mediaFile = BuildMediaFile(relativePath, storageFile);
|
||||
|
||||
using (var stream = storageFile.OpenRead()) {
|
||||
var mediaFactory = GetMediaFactory(stream, mimeType, contentType);
|
||||
if (mediaFactory == null)
|
||||
throw new Exception(T("No media factory available to handle this resource.").Text);
|
||||
var mediaFactory = GetMediaFactory(stream, mimeType, contentType)
|
||||
?? throw new Exception(T("No media factory available to handle this resource.").Text);
|
||||
|
||||
var mediaPart = mediaFactory.CreateMedia(stream, mediaFile.Name, mimeType, contentType);
|
||||
if (mediaPart != null) {
|
||||
mediaPart.FolderPath = relativePath;
|
||||
@ -257,7 +250,7 @@ namespace Orchard.MediaLibrary.Services {
|
||||
if (_orchardServices.Authorizer.Authorize(Permissions.ManageMediaContent)) {
|
||||
return true;
|
||||
}
|
||||
if (_orchardServices.WorkContext.CurrentUser==null)
|
||||
if (_orchardServices.WorkContext.CurrentUser == null)
|
||||
return _orchardServices.Authorizer.Authorize(permission);
|
||||
// determines the folder type: public, user own folder (my), folder of another user (private)
|
||||
var rootedFolderPath = this.GetRootedFolderPath(folderPath) ?? "";
|
||||
@ -269,7 +262,7 @@ namespace Orchard.MediaLibrary.Services {
|
||||
isMyfolder = true;
|
||||
}
|
||||
|
||||
if(isMyfolder) {
|
||||
if (isMyfolder) {
|
||||
return _orchardServices.Authorizer.Authorize(Permissions.ManageOwnMedia);
|
||||
}
|
||||
else { // other
|
||||
|
||||
@ -34,7 +34,7 @@ namespace Orchard.Exceptions {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (sender is IEventBus && exception is OrchardFatalException) {
|
||||
if (sender is IEventBus && exception is OrchardFatalException) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ namespace Orchard.Exceptions {
|
||||
}
|
||||
|
||||
private static bool IsFatal(Exception exception) {
|
||||
return
|
||||
return
|
||||
exception is OrchardSecurityException ||
|
||||
exception is StackOverflowException ||
|
||||
exception is AccessViolationException ||
|
||||
|
||||
@ -1,11 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Orchard.Security;
|
||||
using System.Threading;
|
||||
using System.Security;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security;
|
||||
using System.Threading;
|
||||
using Orchard.Security;
|
||||
|
||||
namespace Orchard.Exceptions {
|
||||
public static class ExceptionExtensions {
|
||||
|
||||
@ -4,15 +4,22 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web.Hosting;
|
||||
using Orchard.Environment.Configuration;
|
||||
using Orchard.Localization;
|
||||
using Orchard.Validation;
|
||||
using Orchard.Exceptions;
|
||||
using Orchard.Localization;
|
||||
using Orchard.Utility.Extensions;
|
||||
using Orchard.Validation;
|
||||
|
||||
namespace Orchard.FileSystems.Media {
|
||||
public class FileSystemStorageProvider : IStorageProvider {
|
||||
private readonly string _storagePath; // c:\orchard\media\default
|
||||
private readonly string _virtualPath; // ~/Media/Default/
|
||||
private readonly string _publicPath; // /Orchard/Media/Default/
|
||||
public static readonly char[] HttpUnallowedCharacters =
|
||||
new char[] { '<', '>', '*', '%', '&', ':', '\\', '/', '?', '#', '"', '{', '}', '|', '^', '[', ']', '`' };
|
||||
public static readonly char[] InvalidFolderNameCharacters =
|
||||
Path.GetInvalidPathChars().Union(HttpUnallowedCharacters).ToArray();
|
||||
public static readonly char[] InvalidFileNameCharacters =
|
||||
Path.GetInvalidFileNameChars().Union(HttpUnallowedCharacters).ToArray();
|
||||
|
||||
public FileSystemStorageProvider(ShellSettings settings) {
|
||||
var mediaPath = HostingEnvironment.IsHosted
|
||||
@ -27,7 +34,7 @@ namespace Orchard.FileSystems.Media {
|
||||
appPath = HostingEnvironment.ApplicationVirtualPath;
|
||||
}
|
||||
if (!appPath.EndsWith("/"))
|
||||
appPath = appPath + '/';
|
||||
appPath += '/';
|
||||
if (!appPath.StartsWith("/"))
|
||||
appPath = '/' + appPath;
|
||||
|
||||
@ -39,21 +46,21 @@ namespace Orchard.FileSystems.Media {
|
||||
|
||||
public Localizer T { get; set; }
|
||||
|
||||
public int MaxPathLength {
|
||||
get; set;
|
||||
// The public setter allows injecting this from Sites.MyTenant.Config or Sites.config, by using
|
||||
// an AutoFac component:
|
||||
/*
|
||||
<component instance-scope="per-lifetime-scope"
|
||||
type="Orchard.FileSystems.Media.FileSystemStorageProvider, Orchard.Framework"
|
||||
service="Orchard.FileSystems.Media.IStorageProvider">
|
||||
/// <summary>
|
||||
/// The public setter allows injecting this from Sites.MyTenant.Config or Sites.config, by using an AutoFac
|
||||
/// component. See the example below.
|
||||
/// </summary>
|
||||
/*
|
||||
<component
|
||||
instance-scope="per-lifetime-scope"
|
||||
service="Orchard.FileSystems.Media.IStorageProvider"
|
||||
type="Orchard.FileSystems.Media.FileSystemStorageProvider, Orchard.Framework">
|
||||
<properties>
|
||||
<property name="MaxPathLength" value="500" />
|
||||
</properties>
|
||||
</component>
|
||||
|
||||
*/
|
||||
}
|
||||
*/
|
||||
public int MaxPathLength { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Maps a relative path into the storage path.
|
||||
@ -215,6 +222,12 @@ namespace Orchard.FileSystems.Media {
|
||||
/// <param name="path">The relative path to the folder to be created.</param>
|
||||
/// <exception cref="ArgumentException">If the folder already exists.</exception>
|
||||
public void CreateFolder(string path) {
|
||||
// We are dealing with a folder here, but GetFileName returns the last path segment, which in this case is
|
||||
// the folder name.
|
||||
if (FolderNameContainsInvalidCharacters(Path.GetFileName(path))) {
|
||||
throw new InvalidNameCharacterException(T("The directory name contains invalid character(s)").ToString());
|
||||
}
|
||||
|
||||
DirectoryInfo directoryInfo = new DirectoryInfo(MapStorage(path));
|
||||
if (directoryInfo.Exists) {
|
||||
throw new ArgumentException(T("Directory {0} already exists", path).ToString());
|
||||
@ -248,6 +261,12 @@ namespace Orchard.FileSystems.Media {
|
||||
throw new ArgumentException(T("Directory {0} does not exist", oldPath).ToString());
|
||||
}
|
||||
|
||||
// We are dealing with a folder here, but GetFileName returns the last path segment, which in this case is
|
||||
// the folder name.
|
||||
if (FolderNameContainsInvalidCharacters(Path.GetFileName(newPath))) {
|
||||
throw new InvalidNameCharacterException(T("The new directory name contains invalid character(s)").ToString());
|
||||
}
|
||||
|
||||
DirectoryInfo targetDirectory = new DirectoryInfo(MapStorage(newPath));
|
||||
if (targetDirectory.Exists) {
|
||||
throw new ArgumentException(T("Directory {0} already exists", newPath).ToString());
|
||||
@ -313,6 +332,10 @@ namespace Orchard.FileSystems.Media {
|
||||
throw new ArgumentException(T("File {0} does not exist", oldPath).ToString());
|
||||
}
|
||||
|
||||
if (FileNameContainsInvalidCharacters(Path.GetFileName(newPath))) {
|
||||
throw new InvalidNameCharacterException(T("The new file name contains invalid character(s)").ToString());
|
||||
}
|
||||
|
||||
FileInfo targetFileInfo = new FileInfo(MapStorage(newPath));
|
||||
if (targetFileInfo.Exists) {
|
||||
throw new ArgumentException(T("File {0} already exists", newPath).ToString());
|
||||
@ -342,6 +365,10 @@ namespace Orchard.FileSystems.Media {
|
||||
/// <exception cref="ArgumentException">If the file already exists.</exception>
|
||||
/// <returns>The created file.</returns>
|
||||
public IStorageFile CreateFile(string path) {
|
||||
if (FileNameContainsInvalidCharacters(Path.GetFileName(path))) {
|
||||
throw new InvalidNameCharacterException(T("The file name contains invalid character(s)").ToString());
|
||||
}
|
||||
|
||||
FileInfo fileInfo = new FileInfo(MapStorage(path));
|
||||
if (fileInfo.Exists) {
|
||||
throw new ArgumentException(T("File {0} already exists", fileInfo.Name).ToString());
|
||||
@ -427,6 +454,12 @@ namespace Orchard.FileSystems.Media {
|
||||
return (di.Attributes & FileAttributes.Hidden) != 0;
|
||||
}
|
||||
|
||||
public static bool FolderNameContainsInvalidCharacters(string folderName) =>
|
||||
folderName.IndexOfAny(InvalidFolderNameCharacters) > -1;
|
||||
|
||||
public static bool FileNameContainsInvalidCharacters(string fileName) =>
|
||||
fileName.IndexOfAny(InvalidFileNameCharacters) > -1;
|
||||
|
||||
#endregion
|
||||
|
||||
private class FileSystemStorageFile : IStorageFile {
|
||||
|
||||
@ -128,7 +128,7 @@ namespace Orchard.FileSystems.Media {
|
||||
void SaveStream(string path, Stream inputStream);
|
||||
|
||||
/// <summary>
|
||||
/// Combines to paths.
|
||||
/// Combines two paths.
|
||||
/// </summary>
|
||||
/// <param name="path1">The parent path.</param>
|
||||
/// <param name="path2">The child path.</param>
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
using System;
|
||||
|
||||
namespace Orchard.FileSystems.Media {
|
||||
public class InvalidNameCharacterException : ArgumentException {
|
||||
public InvalidNameCharacterException(string message) : base(message) { }
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Orchard.FileSystems.Media {
|
||||
public static class StorageProviderExtensions {
|
||||
|
||||
@ -45,7 +45,6 @@
|
||||
<CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
<NoWarn></NoWarn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@ -169,6 +168,7 @@
|
||||
<Compile Include="Data\Migration\Schema\DropUniqueConstraintCommand.cs" />
|
||||
<Compile Include="Environment\Extensions\Models\LifecycleStatus.cs" />
|
||||
<Compile Include="Environment\ShellBuilders\ICompositionStrategy.cs" />
|
||||
<Compile Include="FileSystems\Media\InvalidNameCharacterException.cs" />
|
||||
<Compile Include="Mvc\ModelBinders\BooleanBinderProvider.cs" />
|
||||
<Compile Include="Localization\FormatForScope.cs" />
|
||||
<Compile Include="Locking\ILockingProvider.cs" />
|
||||
@ -718,6 +718,7 @@
|
||||
<Compile Include="Messaging\Services\IMessageManager.cs" />
|
||||
<Compile Include="Messaging\Services\IMessagingChannel.cs" />
|
||||
<Compile Include="IWorkContextAccessor.cs" />
|
||||
<Compile Include="Utility\Extensions\NameValueCollectionExtensions.cs" />
|
||||
<Compile Include="Utility\Extensions\VirtualPathProviderExtensions.cs" />
|
||||
<Compile Include="Utility\NamedReaderWriterLock.cs" />
|
||||
<Compile Include="Utility\ReflectionHelper.cs" />
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
using System.Collections.Specialized;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
|
||||
namespace Orchard.Utility.Extensions {
|
||||
public static class NameValueCollectionExtensions {
|
||||
public static string ToQueryString(this NameValueCollection nameValues) =>
|
||||
string.Join(
|
||||
"&",
|
||||
(from string name in nameValues select string.Concat(name, "=", HttpUtility.UrlEncode(nameValues[name]))).ToArray());
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user