diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/AntiSamy.csproj b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/AntiSamy.csproj index f65bee0..b44accc 100644 --- a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/AntiSamy.csproj +++ b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/AntiSamy.csproj @@ -10,7 +10,7 @@ Properties AntiSamy AntiSamy - v3.5 + v2.0 512 diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.dll deleted file mode 100644 index 9466fdd..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.dll.config b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.dll.config deleted file mode 100644 index e59af44..0000000 --- a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.dll.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.pdb b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.pdb deleted file mode 100644 index 8a05c96..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/AntiSamy.pdb and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/Flute.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/Flute.dll deleted file mode 100644 index 5b378e6..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/Flute.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/HtmlAgilityPack.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/HtmlAgilityPack.dll deleted file mode 100644 index 0d8a63f..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/HtmlAgilityPack.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.core.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.core.dll deleted file mode 100644 index b306fae..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.core.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.core.interfaces.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.core.interfaces.dll deleted file mode 100644 index 4053b0d..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.core.interfaces.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.framework.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.framework.dll deleted file mode 100644 index 780727f..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/bin/Debug/nunit.framework.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csproj.FileListAbsolute.txt b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csproj.FileListAbsolute.txt index 628514b..752314c 100644 --- a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csproj.FileListAbsolute.txt +++ b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csproj.FileListAbsolute.txt @@ -20,3 +20,14 @@ F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\AntiSa F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\obj\Debug\AntiSamy.dll F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\obj\Debug\AntiSamy.pdb F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\obj\Debug\AntiSamy.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\AntiSamy.dll.config +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\AntiSamy.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\AntiSamy.pdb +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\Flute.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\HtmlAgilityPack.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\nunit.core.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\nunit.core.interfaces.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\bin\Debug\nunit.framework.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\obj\Debug\AntiSamy.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\obj\Debug\AntiSamy.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\AntiSamy\obj\Debug\AntiSamy.pdb diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csprojResolveAssemblyReference.cache b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csprojResolveAssemblyReference.cache deleted file mode 100644 index 65077b4..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.dll b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.dll deleted file mode 100644 index 9466fdd..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.dll and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.pdb b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.pdb deleted file mode 100644 index 8a05c96..0000000 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/AntiSamy.pdb and /dev/null differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 76371c6..e5867fb 100644 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/XSS-Filter-OwaspAntisamy/dotNet/AntiSamy/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5a04c03..593ef7e 100644 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csproj.FileListAbsolute.txt b/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csproj.FileListAbsolute.txt index 1d7beaf..007ecf9 100644 --- a/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csproj.FileListAbsolute.txt +++ b/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csproj.FileListAbsolute.txt @@ -8,3 +8,14 @@ F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\TestWe F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\obj\Debug\TestWebsite.csprojResolveAssemblyReference.cache F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\obj\Debug\TestWebsite.dll F:\学习\编程类\Web安全技术学习\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\obj\Debug\TestWebsite.pdb +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\TestWebsite.dll.config +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\TestWebsite.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\TestWebsite.pdb +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\AntiSamy.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\Flute.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\HtmlAgilityPack.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\nunit.framework.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\bin\AntiSamy.pdb +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\obj\Debug\TestWebsite.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\obj\Debug\TestWebsite.dll +E:\GIT\web-security\XSS-Filter-OwaspAntisamy\dotNet\TestWebsite\obj\Debug\TestWebsite.pdb diff --git a/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csprojResolveAssemblyReference.cache b/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csprojResolveAssemblyReference.cache index c7532e1..7cc9b27 100644 Binary files a/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csprojResolveAssemblyReference.cache and b/XSS-Filter-OwaspAntisamy/dotNet/TestWebsite/obj/Debug/TestWebsite.csprojResolveAssemblyReference.cache differ diff --git a/XSSAttachs/StyleSheetsParser/CssAttribute.cs b/XSSAttachs/StyleSheetsParser/CssAttribute.cs index a200fce..7705ff1 100644 --- a/XSSAttachs/StyleSheetsParser/CssAttribute.cs +++ b/XSSAttachs/StyleSheetsParser/CssAttribute.cs @@ -9,9 +9,9 @@ namespace StyleSheetsParser { public class CssAttribute:CssRule { - public CssAttribute(string name, string value=null) + public CssAttribute(string name, string value = null) : base(name) - { this.Value =Regex.Replace( value.Replace("\n", " ").Replace("\r", ""),@"\s{2}"," "); } + { if (value != null) { this.Value = Regex.Replace(value.Trim().Replace("\n", " ").Replace("\r", ""), @"\s{2}", " "); } } public string Value { get;set; } protected override string GetCssString() { diff --git a/XSSAttachs/StyleSheetsParser/CssParser.cs b/XSSAttachs/StyleSheetsParser/CssParser.cs index f5cef9e..41e2cec 100644 --- a/XSSAttachs/StyleSheetsParser/CssParser.cs +++ b/XSSAttachs/StyleSheetsParser/CssParser.cs @@ -191,6 +191,7 @@ namespace StyleSheetsParser { attrName = sb.ToString(); sb.Clear(); + RemoveSpace(); } } else if (ch == ';' || ch == '}') diff --git a/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.dll b/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.dll index c4ec610..a4969c0 100644 Binary files a/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.dll and b/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.dll differ diff --git a/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.pdb b/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.pdb index 02d8c95..4371c11 100644 Binary files a/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.pdb and b/XSSAttachs/StyleSheetsParser/bin/Debug/StyleSheetsParser.pdb differ diff --git a/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.csproj.FileListAbsolute.txt b/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.csproj.FileListAbsolute.txt index bbbcdd7..cea33da 100644 --- a/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.csproj.FileListAbsolute.txt +++ b/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.csproj.FileListAbsolute.txt @@ -12,3 +12,8 @@ F:\学习\编程类\Web安全技术学习\XSSAttachs\StyleSheetsParser\bin\Debug F:\学习\编程类\Web安全技术学习\XSSAttachs\StyleSheetsParser\obj\Debug\StyleSheetsParser.dll F:\学习\编程类\Web安全技术学习\XSSAttachs\StyleSheetsParser\obj\Debug\StyleSheetsParser.pdb F:\学习\编程类\Web安全技术学习\XSSAttachs\StyleSheetsParser\obj\Debug\StyleSheetsParser.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSSAttachs\StyleSheetsParser\bin\Debug\StyleSheetsParser.dll +E:\GIT\web-security\XSSAttachs\StyleSheetsParser\bin\Debug\StyleSheetsParser.pdb +E:\GIT\web-security\XSSAttachs\StyleSheetsParser\obj\Debug\StyleSheetsParser.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSSAttachs\StyleSheetsParser\obj\Debug\StyleSheetsParser.dll +E:\GIT\web-security\XSSAttachs\StyleSheetsParser\obj\Debug\StyleSheetsParser.pdb diff --git a/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.dll b/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.dll index c4ec610..a4969c0 100644 Binary files a/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.dll and b/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.dll differ diff --git a/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.pdb b/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.pdb index 02d8c95..4371c11 100644 Binary files a/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.pdb and b/XSSAttachs/StyleSheetsParser/obj/Debug/StyleSheetsParser.pdb differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite.v12.suo b/XSSAttachs/TestXSSAttacksFilterSite.v12.suo index f614aa9..7e5e643 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite.v12.suo and b/XSSAttachs/TestXSSAttacksFilterSite.v12.suo differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx b/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx index f4233fe..d586cba 100644 --- a/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx +++ b/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx @@ -9,7 +9,11 @@ @@ -17,10 +21,9 @@
<%= html==null?null:HttpUtility.HtmlEncode(html).Replace("\n","
") %>
- - - -
+
+
+
submit
diff --git a/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.cs b/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.cs index b5189db..5b9a2fe 100644 --- a/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.cs +++ b/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.cs @@ -20,14 +20,18 @@ namespace TestXSSAttacksFilterSite public StringBuilder html; protected void Page_Load(object sender, EventArgs e) { + if (string.IsNullOrWhiteSpace(txtPolicy.Text)) { txtPolicy.Text = "/resources/testPolicy.config"; } } + string _policyFilePath; + string PolicyFilePath { get { if (_policyFilePath == null)_policyFilePath = Server.MapPath(txtPolicy.Text.Trim()); return _policyFilePath; } } void FilterAttacks(string str, Func fn=null,[CallerMemberName] string propertyName = null) { + var richtext = new RichText(str, PolicyFilePath); html.Append("\n== in == "+propertyName+" ==================================================\n原文:\n" + str + "\n"); //html.Append("===================================================================================================="); - html.Append("JavaScript：\n" + ((RichText)str).JavascriptEncode); - html.Append("\n过滤:\n" + ((RichText)str)); + //html.Append("JavaScript：\n" + richtext.JavascriptEncode); + html.Append("\n过滤:\n" + richtext.ToString()); html.Append((fn == null ? null : "\n状态：" + (fn(str) ? "成功！" : "失败"))); } protected void btn_Click(object sender, EventArgs e) diff --git a/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.designer.cs b/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.designer.cs index 89d3a54..be9793b 100644 --- a/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.designer.cs +++ b/XSSAttachs/TestXSSAttacksFilterSite/Test.aspx.designer.cs @@ -21,6 +21,15 @@ namespace TestXSSAttacksFilterSite { /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + /// + /// txtPolicy 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.TextBox txtPolicy; + /// /// txt 控件。 /// diff --git a/XSSAttachs/TestXSSAttacksFilterSite/TestPolicy.aspx.cs b/XSSAttachs/TestXSSAttacksFilterSite/TestPolicy.aspx.cs index 964bc07..a8058d7 100644 --- a/XSSAttachs/TestXSSAttacksFilterSite/TestPolicy.aspx.cs +++ b/XSSAttachs/TestXSSAttacksFilterSite/TestPolicy.aspx.cs @@ -20,10 +20,12 @@ namespace TestXSSAttacksFilterSite get { if (_filter==null) - _filter = new HtmlFilter(Server.MapPath("/resources/testPolicy.config")); + _filter = new HtmlFilter(PolicyFilePath); return _filter; } } + string _policyFilePath; + string PolicyFilePath { get { if (_policyFilePath == null)_policyFilePath = Server.MapPath("/resources/testPolicy.config"); return _policyFilePath; } } protected string txt; protected void Page_Load(object sender, EventArgs e) { @@ -42,14 +44,14 @@ namespace TestXSSAttacksFilterSite } void FilterAttacks(string str, Func fn,[CallerMemberName] string propertyName = null) { - txt += "\n==== in " + propertyName + " ==================================================\n原文:\n" + ((RichText)str).HtmlEncode + "\n"; + var richtext = new RichText(str, PolicyFilePath); + txt += "\n==== in " + propertyName + " ==================================================\n原文:\n" + richtext.HtmlEncode + "\n"; //这里是启用默认的安全策略 - str = "过滤\n" + HttpUtility.HtmlEncode((RichText)str); + str = "过滤\n" + HttpUtility.HtmlEncode(richtext.ToString()); ////这里是使用指定的安全策略 //str = "过滤\n" + HttpUtility.HtmlEncode(Filter.Filters(str)); - txt += str + "\n状态：" + (fn(str) ? "成功！" : "失败"); } void testScriptAttacks() diff --git a/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.dll b/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.dll index c4ec610..a4969c0 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.dll and b/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.dll differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.pdb b/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.pdb index 02d8c95..4371c11 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.pdb and b/XSSAttachs/TestXSSAttacksFilterSite/bin/StyleSheetsParser.pdb differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.dll b/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.dll index 9c02474..3ada709 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.dll and b/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.dll differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.pdb b/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.pdb index 42c0ccc..a989659 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.pdb and b/XSSAttachs/TestXSSAttacksFilterSite/bin/TestXSSAttacksFilterSite.pdb differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.dll b/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.dll index 2eefd17..88d12ee 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.dll and b/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.dll differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.pdb b/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.pdb index 0e8ee02..b0990aa 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.pdb and b/XSSAttachs/TestXSSAttacksFilterSite/bin/XSSAttacksFilter.pdb differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csproj.FileListAbsolute.txt b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csproj.FileListAbsolute.txt index 394f5f3..bfb2cad 100644 --- a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csproj.FileListAbsolute.txt +++ b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csproj.FileListAbsolute.txt @@ -29,3 +29,14 @@ F:\学习\编程类\Web安全技术学习\XSSAttachs\TestXSSAttacksFilterSite\ob F:\学习\编程类\Web安全技术学习\XSSAttachs\TestXSSAttacksFilterSite\obj\Debug\TestXSSAttacksFilterSite.dll F:\学习\编程类\Web安全技术学习\XSSAttachs\TestXSSAttacksFilterSite\obj\Debug\TestXSSAttacksFilterSite.pdb F:\学习\编程类\Web安全技术学习\XSSAttachs\TestXSSAttacksFilterSite\bin\TestXSSAttacksFilterSite.dll.config +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\TestXSSAttacksFilterSite.dll.config +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\TestXSSAttacksFilterSite.dll +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\TestXSSAttacksFilterSite.pdb +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\StyleSheetsParser.dll +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\XSSAttacksFilter.dll +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\HtmlAgilityPack.dll +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\StyleSheetsParser.pdb +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\bin\XSSAttacksFilter.pdb +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\obj\Debug\TestXSSAttacksFilterSite.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\obj\Debug\TestXSSAttacksFilterSite.dll +E:\GIT\web-security\XSSAttachs\TestXSSAttacksFilterSite\obj\Debug\TestXSSAttacksFilterSite.pdb diff --git a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csprojResolveAssemblyReference.cache b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csprojResolveAssemblyReference.cache index 2cd6b8e..261f4f5 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csprojResolveAssemblyReference.cache and b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.csprojResolveAssemblyReference.cache differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.dll b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.dll index 9c02474..3ada709 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.dll and b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.dll differ diff --git a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.pdb b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.pdb index 42c0ccc..a989659 100644 Binary files a/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.pdb and b/XSSAttachs/TestXSSAttacksFilterSite/obj/Debug/TestXSSAttacksFilterSite.pdb differ diff --git a/XSSAttachs/XSSAttacksFilters/FilterPolicy.cs b/XSSAttachs/XSSAttacksFilters/FilterPolicy.cs index e155be9..80eebf4 100644 --- a/XSSAttachs/XSSAttacksFilters/FilterPolicy.cs +++ b/XSSAttachs/XSSAttacksFilters/FilterPolicy.cs @@ -141,8 +141,8 @@ namespace XSSAttacksFilter /// public static bool ValidateAttribute(PolicyAttribute attr, string value) { - if (attr == null) return false; - value = HtmlEntity.DeEntitize(value); + if (attr == null || string.IsNullOrWhiteSpace(value)) return false; + value = HtmlEntity.DeEntitize(value.Trim()); ////验证是否在限定的值之内 if (attr.AllowedValues != null) { diff --git a/XSSAttachs/XSSAttacksFilters/PolicyHtmlTag.cs b/XSSAttachs/XSSAttacksFilters/PolicyHtmlTag.cs index bc5c6a0..49afae1 100644 --- a/XSSAttachs/XSSAttacksFilters/PolicyHtmlTag.cs +++ b/XSSAttachs/XSSAttacksFilters/PolicyHtmlTag.cs @@ -37,7 +37,7 @@ namespace XSSAttacksFilter var a = allowedAttributes.ContainsKey(name) ? allowedAttributes[name] : null; if (a == null) { - a = Policy.GlobalHtmlAttribute(name); + a = Policy.CommonHtmlAttribute(name);// Policy.GlobalHtmlAttribute(name); } return a; } diff --git a/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.dll b/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.dll index c4ec610..a4969c0 100644 Binary files a/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.dll and b/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.dll differ diff --git a/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.pdb b/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.pdb index 02d8c95..4371c11 100644 Binary files a/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.pdb and b/XSSAttachs/XSSAttacksFilters/bin/Debug/StyleSheetsParser.pdb differ diff --git a/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.dll b/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.dll index 2eefd17..88d12ee 100644 Binary files a/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.dll and b/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.dll differ diff --git a/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.pdb b/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.pdb index 0e8ee02..b0990aa 100644 Binary files a/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.pdb and b/XSSAttachs/XSSAttacksFilters/bin/Debug/XSSAttacksFilter.pdb differ diff --git a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.dll b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.dll index 2eefd17..88d12ee 100644 Binary files a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.dll and b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.dll differ diff --git a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.pdb b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.pdb index 0e8ee02..b0990aa 100644 Binary files a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.pdb and b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilter.pdb differ diff --git a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csproj.FileListAbsolute.txt b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csproj.FileListAbsolute.txt index 4e801a4..aa24d25 100644 --- a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csproj.FileListAbsolute.txt +++ b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csproj.FileListAbsolute.txt @@ -20,3 +20,10 @@ F:\学习\编程类\Web安全技术学习\XSSAttachs\XSSAttacksFilters\bin\Debug F:\学习\编程类\Web安全技术学习\XSSAttachs\XSSAttacksFilters\obj\Debug\XSSAttacksFilters.csprojResolveAssemblyReference.cache F:\学习\编程类\Web安全技术学习\XSSAttachs\XSSAttacksFilters\obj\Debug\XSSAttacksFilter.dll F:\学习\编程类\Web安全技术学习\XSSAttachs\XSSAttacksFilters\obj\Debug\XSSAttacksFilter.pdb +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\bin\Debug\XSSAttacksFilter.dll +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\bin\Debug\XSSAttacksFilter.pdb +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\bin\Debug\StyleSheetsParser.dll +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\bin\Debug\StyleSheetsParser.pdb +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\obj\Debug\XSSAttacksFilters.csprojResolveAssemblyReference.cache +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\obj\Debug\XSSAttacksFilter.dll +E:\GIT\web-security\XSSAttachs\XSSAttacksFilters\obj\Debug\XSSAttacksFilter.pdb diff --git a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csprojResolveAssemblyReference.cache b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csprojResolveAssemblyReference.cache index 92ae1eb..4e175ce 100644 Binary files a/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csprojResolveAssemblyReference.cache and b/XSSAttachs/XSSAttacksFilters/obj/Debug/XSSAttacksFilters.csprojResolveAssemblyReference.cache differ