Open-Harbor/dotnet-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mistake should of been \ not / to escape -

Browse Source
This commit is contained in:
David Lebee 2020-08-20 19:44:08 -04:00
parent 8314145b44
commit 21cb1d11bf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PoweredSoft.Storage.S3/S3StorageProvider.cs
View File

@ -227,7 +227,7 @@ namespace PoweredSoft.Storage.S3
public string SanitizeFileName(string key, string replacement) public string SanitizeFileName(string key, string replacement)
{ {
string pattern = @"[^a-zA-Z0-9.!/-_*'()]"; string pattern = @"[^a-zA-Z0-9.!\-_*'()]";
string substitution = replacement; string substitution = replacement;
string input = key; string input = key;
RegexOptions options = RegexOptions.Multiline; RegexOptions options = RegexOptions.Multiline;
@ -240,7 +240,7 @@ namespace PoweredSoft.Storage.S3
public bool IsFileNameAllowed(string fileName) public bool IsFileNameAllowed(string fileName)
{ {
string pattern = @"[^a-zA-Z0-9.!/-_*'()]"; string pattern = @"[^a-zA-Z0-9.!\-_*'()]";
RegexOptions options = RegexOptions.Multiline; RegexOptions options = RegexOptions.Multiline;
Regex regex = new Regex(pattern, options); Regex regex = new Regex(pattern, options);
var hasMatches = regex.IsMatch(fileName); var hasMatches = regex.IsMatch(fileName);

7
PoweredSoft.Storage.Test/S3Tests.cs
View File

@ -15,6 +15,13 @@ namespace PoweredSoft.Storage.Test
Assert.IsFalse(space.IsFileNameAllowed("Operations$$.pdf"), "Should not be valid"); Assert.IsFalse(space.IsFileNameAllowed("Operations$$.pdf"), "Should not be valid");
} }
[TestMethod]
public void CanContainDash()
{
var space = GetMockS3Space();
Assert.IsTrue(space.IsFileNameAllowed("Operations-yay.pdf"), "Should be allowed");
}
[TestMethod] [TestMethod]
public void NameSanitation() public void NameSanitation()
{ {