JacksonBruce/HtmlSanitizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix/ignore code analysis issues

Browse Source
This commit is contained in:
Michael Ganss
2020-01-24 13:40:13 +01:00
parent 088a429ff4
commit 4afaf4bd57
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/HtmlSanitizer/HtmlSanitizer.cs
View File

@@ -676,7 +676,7 @@ namespace Ganss.XSS
SanitizeStyle(tag, baseUrl);
var checkClasses = AllowedCssClasses != null;
var allowedTags = AllowedCssClasses?.ToArray() ?? new string[0];
var allowedTags = AllowedCssClasses?.ToArray() ?? Array.Empty<string>();
// sanitize the value of the attributes
foreach (var attribute in tag.Attributes.ToList())
@@ -976,10 +976,12 @@ namespace Ganss.XSS
{
return new Uri(baseUri, iri.Value).AbsoluteUri;
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (UriFormatException)
{
iri = null;
}
#pragma warning restore CA1031 // Do not catch general exception types
}
else iri = null;
}

6
test/HtmlSanitizer.Tests/Tests.cs
View File

@@ -1497,6 +1497,7 @@ S
{
Assert.Equal(expected, actual, ignoreCase: true);
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception)
{
@@ -1508,6 +1509,7 @@ S
Assert.Equal(expectedNet35, actual, ignoreCase: true);
}
#pragma warning restore CA1031 // Do not catch general exception types
}
/// <summary>
@@ -2907,11 +2909,13 @@ zqy1QY1kkPOuMvKWvvmFIwClI2393jVVcp91eda4+J+fIYDbfJa7RY5YcNrZhTuV//9k="">
if (Interlocked.Decrement(ref waiting) == 0) allGo.Set();
m.Invoke(tests, null);
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
{
Interlocked.CompareExchange(ref firstException, ex, null);
Interlocked.Increment(ref failures);
}
#pragma warning restore CA1031 // Do not catch general exception types
})).ToList();
foreach (var thread in threads)
@@ -2969,7 +2973,7 @@ zqy1QY1kkPOuMvKWvvmFIwClI2393jVVcp91eda4+J+fIYDbfJa7RY5YcNrZhTuV//9k="">
public void RemoveClassAttributeIfNoAllowedClassesTest()
{
// Empty array for allowed classes = no classes allowed
var sanitizer = new HtmlSanitizer(allowedAttributes: new[] { "class" }, allowedCssClasses: new string[0]);
var sanitizer = new HtmlSanitizer(allowedAttributes: new[] { "class" }, allowedCssClasses: Array.Empty<string>());
var html = @"<div class=""good bad"">Test</div>";
var actual = sanitizer.Sanitize(html);