Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dotIndex logic to accommodate ItemNames having Periods #1319

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated dotIndex logic to accommodate ItemNames having Periods #1319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a91e0a
Updated dotIndex logic to accommodate ItemNames with Period; Allowing…
Dec 19, 2023
c083152
removed tolower
Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 66 additions & 19 deletions src/Spe/sitecore modules/PowerShell/Services/RemoteScriptCall.ashx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,12 @@ public void ProcessRequest(HttpContext context)

if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password) && !string.IsNullOrEmpty(authHeader))
{
if (authHeader.StartsWith("Basic")) {
if (authHeader.StartsWith("Basic"))
{
var encodedUsernamePassword = authHeader.Substring("Basic ".Length).Trim();
var encoding = Encoding.GetEncoding("iso-8859-1");
var usernamePassword = encoding.GetString(System.Convert.FromBase64String(encodedUsernamePassword));

var separatorIndex = usernamePassword.IndexOf(':');

username = usernamePassword.Substring(0, separatorIndex);
Expand Down Expand Up @@ -175,7 +176,7 @@ public void ProcessRequest(HttpContext context)
var unpackZip = requestParameters.Get("skipunpack").IsNot("true");
var skipExisting = requestParameters.Get("skipexisting").Is("true");
var scDb = requestParameters.Get("sc_database");

var useContextDatabase = apiVersion.Is("file") || apiVersion.Is("handle") || !isAuthenticated ||
string.IsNullOrEmpty(originParam) || originParam.Is("current");

Expand Down Expand Up @@ -288,7 +289,7 @@ private static bool CheckServiceAuthentication(HttpContext context, string servi
private static void RejectAuthenticationMethod(HttpContext context, string serviceName, Exception ex = null)
{
var errorMessage = $"A request to the {serviceName} service could not be completed because the provided credentials are invalid.";

context.Response.StatusCode = 401;
context.Response.StatusDescription = errorMessage;
context.Response.SuppressFormsAuthenticationRedirect = true;
Expand Down Expand Up @@ -485,17 +486,19 @@ private static void ProcessMediaUpload(Stream content, Database db, string path,
path = path.Replace('\\', '/').TrimEnd('/');
path = (path.StartsWith("/") ? path : "/" + path);
var originalPath = path;
var dotIndex = path.IndexOf(".", StringComparison.OrdinalIgnoreCase);
var dotIndex = path.LastIndexOf(".", StringComparison.OrdinalIgnoreCase);
string extension = string.Empty;
if (dotIndex > -1)
{
PowerShellLog.Warn($"The File Dot Index {dotIndex} {path}.");
extension = path.Substring(dotIndex + 1);
path = path.Substring(0, dotIndex);
}

if (!path.StartsWith(Constants.MediaLibraryPath))
{
path = Constants.MediaLibraryPath + (path.StartsWith("/") ? path : "/" + path);
}

var mediaItem = (MediaItem)db.GetItem(path);

if (mediaItem == null && Regex.IsMatch(originalPath, guidPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase))
Expand All @@ -507,7 +510,11 @@ private static void ProcessMediaUpload(Stream content, Database db, string path,
if (mediaItem == null)
{
var fileName = Path.GetFileName(originalPath);
var itemName = Path.GetFileNameWithoutExtension(path);
var itemName = string.Empty;
if (fileName.Count(f => f == '.') > 1)
itemName = fileName.Substring(0, fileName.LastIndexOf('.'));
else
itemName = Path.GetFileNameWithoutExtension(path);
var dirName = (Path.GetDirectoryName(path) ?? string.Empty).Replace('\\', '/');

if (String.IsNullOrEmpty(fileName))
Expand All @@ -534,17 +541,57 @@ private static void ProcessMediaUpload(Stream content, Database db, string path,
{
if (skipExisting) return;

var mediaUri = MediaUri.Parse(mediaItem);
var media = MediaManager.GetMedia(mediaUri);
var siblings = db.GetItem(path).Parent.Children; //To find duplicate items if any.
var matches = from sibling in siblings
where db.GetItem(path.ToLower()).Paths.Path.ToLower() == sibling.Paths.Path.ToLower() &&
sibling["Extension"].ToLower() == extension.ToLower()
select sibling;
if (!matches.Any()) //This section is to create a new item When we already have an Item in same Level with different extension
{
var fileName = Path.GetFileName(originalPath);
var itemName = string.Empty;
if (fileName.Count(f => f == '.') > 1)
itemName = fileName.Substring(0, fileName.LastIndexOf('.'));
else
itemName = Path.GetFileNameWithoutExtension(path);
var dirName = (Path.GetDirectoryName(path) ?? string.Empty).Replace('\\', '/');

using (var ms = new MemoryStream())
if (String.IsNullOrEmpty(fileName))
{
PowerShellLog.Warn($"The filename cannot be determined for the entry {fileName}.");
return;
}

var mco = new MediaCreatorOptions
{
Database = db,
Versioned = Settings.Media.UploadAsVersionableByDefault,
OverwriteExisting = false,
Destination = $"{dirName}/{itemName}",
};

var mc = new MediaCreator();
using (var ms = new MemoryStream())
{
content.CopyTo(ms);
mc.CreateFromStream(ms, fileName, mco);
}
}
else
{
content.CopyTo(ms);
using (new EditContext(mediaItem, SecurityCheck.Disable))
mediaItem = matches.First();
var mediaUri = MediaUri.Parse(mediaItem);
var media = MediaManager.GetMedia(mediaUri);

using (var ms = new MemoryStream())
{
using (var mediaStream = new MediaStream(ms, media.Extension, mediaItem))
content.CopyTo(ms);
using (new EditContext(mediaItem, SecurityCheck.Disable))
{
media.SetStream(mediaStream);
using (var mediaStream = new MediaStream(ms, media.Extension, mediaItem))
{
media.SetStream(mediaStream);
}
}
}
}
Expand Down Expand Up @@ -614,7 +661,7 @@ private static void ProcessScript(HttpContext context, HttpRequest request, bool
using (var ms = new MemoryStream())
{
request.InputStream.CopyTo(ms);
var shouldDecompress = request.Headers["Content-Encoding"]?.Contains("gzip") ?? false ;
var shouldDecompress = request.Headers["Content-Encoding"]?.Contains("gzip") ?? false;
var bytes = shouldDecompress ? ConvertFromGzipBytes(ms.ToArray()) : ms.ToArray();
var requestBody = Encoding.UTF8.GetString(bytes);
var splitBody = requestBody.Split(new[] { $"<#{sessionId}#>" }, StringSplitOptions.RemoveEmptyEntries);
Expand Down Expand Up @@ -830,15 +877,15 @@ private static void ProcessHandle(HttpContext context, string originParam)
private static ApiScriptCollection GetApiScripts(string dbName)
{
Assert.ArgumentNotNullOrEmpty(dbName, "dbName");
if(HttpRuntime.Cache[ApiScriptsKey] is ApiScriptCollection apiScripts) return apiScripts;
if (HttpRuntime.Cache[ApiScriptsKey] is ApiScriptCollection apiScripts) return apiScripts;

apiScripts = new ApiScriptCollection();

if (ApplicationSettings.ScriptLibraryDb.Equals(dbName, StringComparison.OrdinalIgnoreCase))
{
var roots = ModuleManager.GetFeatureRoots(IntegrationPoints.WebApi);
GetAvailableScripts(roots, apiScripts);
}
}
else if (!apiScripts.ContainsKey(dbName))
{
var newValue = new SortedDictionary<string, ApiScript>(StringComparer.OrdinalIgnoreCase);
Expand Down Expand Up @@ -907,5 +954,5 @@ internal class ApiScript
public ID Id { get; set; }
}

internal class ApiScriptCollection : ConcurrentDictionary<string, SortedDictionary<string, ApiScript>> {}
internal class ApiScriptCollection : ConcurrentDictionary<string, SortedDictionary<string, ApiScript>> { }
}