SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

small QoL improvements: more edge cases and constraints for base64

Browse source
This commit is contained in:
lucas.hipolito 2025-07-10 10:44:35 +02:00
parent 792155c794
commit f6e1ed093a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/modules/Elsa.IO.Compression/Activities/CreateZipArchive.cs
View file

@ -125,8 +125,7 @@ public class CreateZipArchive : CodeActivity<Stream>
var entryName = binaryContent.Name?.GetNameAndExtension()
?? string.Format(DefaultEntryNameFormat, entryIndex + 1);
// Get a unique name following Windows convention
entryName = GetUniqueEntryName(zipArchive, entryName);
var archiveEntry = zipArchive.CreateEntry(entryName, compressionLevel);

15
src/modules/Elsa.IO/Extensions/ContentTypeExtensions.cs
View file

@ -98,19 +98,20 @@ public static class ContentTypeExtensions
// Check padding position and count
var paddingIndex = s.IndexOf('=');
if (paddingIndex > 0)
switch (paddingIndex)
{
// Padding cannot be at index 0
case <= 0:
// Padding must be at the end
if (paddingIndex < s.Length - 2)
return false;
case > 0 when paddingIndex < s.Length - 2:
// All characters after first '=' must also be '='
if (s.Substring(paddingIndex).Any(c => c != '='))
case > 0 when s[paddingIndex..].Any(c => c != '='):
return false;
}
// Check for valid Base64 characters
for (int i = 0; i < (paddingIndex > 0 ? paddingIndex : s.Length); i++)
for (var i = 0; i < paddingIndex; i++)
{
var c = s[i];
var isValid =
@ -124,7 +125,7 @@ public static class ContentTypeExtensions
}
// Additional check for short strings that are just lowercase+numbers
// This catches "content2" and similar false positives
// This catches "whatever" and similar false positives
if (s.Length <= 10 && s.All(c => char.IsLower(c) || char.IsDigit(c)))
return false;