style单元测试、模型图层的更改等

XSSAttachs/ModelingProject1/LayerDiagram1.layerdiagram

@@ -3,8 +3,8 @@
   <layers>
     <layer Id="f2d0cbad-a27f-431f-975e-5250af0d9e1b" name="CssDocument">
       <dependencyToLayers>
-        <dependencyFromLayerToLayer Id="fb962e84-20ba-4eca-9766-6f0da89905aa" direction="Forward">
+        <dependencyFromLayerToLayer Id="2132ddc2-da19-45ef-951d-e9dd136f6a4e" direction="Forward">
-          <layerMoniker Id="9609f090-bb1c-488d-a923-75c951538c3d" />
+          <layerMoniker Id="f1997a98-8045-4ca4-951b-bc05e97bcc20" />
         </dependencyFromLayerToLayer>
       </dependencyToLayers>
       <references>
@@ -64,5 +64,12 @@
         </reference>
       </references>
     </layer>
+    <layer Id="f5892981-5841-4acb-a884-0243586d91d4" name="HtmlDocument">
+      <dependencyToLayers>
+        <dependencyFromLayerToLayer Id="748fab3b-204a-4101-857f-af48cceac19f" direction="Forward">
+          <layerMoniker Id="4f3f48d9-e496-4f06-94bf-a4fadd97a6db" />
+        </dependencyFromLayerToLayer>
+      </dependencyToLayers>
+    </layer>
   </layers>
 </layerModel>

XSSAttachs/ModelingProject1/LayerDiagram1.layerdiagram.layout

@@ -2,7 +2,7 @@
 <layerDiagram dslVersion="1.0.0.0" Id="e4e5e990-b8af-4025-a7b9-0074955c302a" absoluteBounds="0, 0, 11, 8.5" name="LayerDiagram1">
   <layerModelMoniker Id="8a584fa7-1be7-4ae4-aea1-2c4e7779f056" />
   <nestedChildShapes>
-    <layerShape Id="386bcbe4-6d9b-453d-b626-4a8bb6602463" absoluteBounds="8.25, 1.875, 2, 0.75" customColor="161, 199, 231">
+    <layerShape Id="386bcbe4-6d9b-453d-b626-4a8bb6602463" absoluteBounds="5.375, 1.75, 2, 0.75" customColor="161, 199, 231">
       <layerMoniker Id="f2d0cbad-a27f-431f-975e-5250af0d9e1b" />
     </layerShape>
     <layerShape Id="3621805e-ecb4-45d5-ae72-c5936bd8f305" absoluteBounds="2.625, 3.625, 7.5, 1.75" customColor="161, 199, 231">
@@ -19,12 +19,23 @@
         </layerShape>
       </nestedChildShapes>
     </layerShape>
-    <dependencyConnector edgePoints="[(9.1875 : 2.625); (9.1875 : 3.625)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110">
+    <layerShape Id="d1d69a94-5418-4928-b4ac-7f159d2d67e6" absoluteBounds="2.5, 1.75, 2, 0.75" customColor="161, 199, 231">
-      <dependencyFromLayerToLayerMoniker Id="fb962e84-20ba-4eca-9766-6f0da89905aa" />
+      <layerMoniker Id="f5892981-5841-4acb-a884-0243586d91d4" />
+    </layerShape>
+    <dependencyConnector edgePoints="[(3.8125 : 2.5); (3.8125 : 4)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110">
+      <dependencyFromLayerToLayerMoniker Id="748fab3b-204a-4101-857f-af48cceac19f" />
+      <relativeChildShapes />
+      <nodes>
+        <layerShapeMoniker Id="d1d69a94-5418-4928-b4ac-7f159d2d67e6" />
+        <layerShapeMoniker Id="955fdd9f-bbae-4ac5-9a55-f3bfac7909c0" />
+      </nodes>
+    </dependencyConnector>
+    <dependencyConnector edgePoints="[(6.4375 : 2.5); (6.4375 : 4)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110">
+      <dependencyFromLayerToLayerMoniker Id="2132ddc2-da19-45ef-951d-e9dd136f6a4e" />
       <relativeChildShapes />
       <nodes>
         <layerShapeMoniker Id="386bcbe4-6d9b-453d-b626-4a8bb6602463" />
-        <layerShapeMoniker Id="3621805e-ecb4-45d5-ae72-c5936bd8f305" />
+        <layerShapeMoniker Id="d1250d28-79a0-436d-a6c1-39d1a764649e" />
       </nodes>
     </dependencyConnector>
   </nestedChildShapes>

XSSAttachs/UnitTestProject1/UnitTest1.cs

@@ -25,8 +25,8 @@ namespace UnitTestProject1
           
             Assert.IsTrue(FilterAttacks("<div style=\"position:absolute\">", str => str.IndexOf("position") == -1));
             Assert.IsTrue(FilterAttacks("<style>b { position:absolute }</style>", str => str.IndexOf("position") == -1));
-            Assert.IsTrue(FilterAttacks("<div style=\"z-index:25\">", str => str.IndexOf("position") == -1));
+            Assert.IsTrue(FilterAttacks("<div style=\"z-index:25\">", str => str.IndexOf("z-index:25")>0));
-            Assert.IsTrue(FilterAttacks("<style>z-index:25</style>", str => str.IndexOf("position") == -1));
+            Assert.IsTrue(FilterAttacks("<style>z-index:25</style>", str => str.IndexOf("z-index:25") == -1));
 
 
             Assert.IsTrue(FilterAttacks("<LINK REL=\"stylesheet\" HREF=\"javascript:alert('XSS'));\">", str => str.IndexOf("href") == -1));

XSSAttachs/UnitTestProject1/obj/Debug/UnitTestProject1.csproj.FileListAbsolute.txt

@@ -8,3 +8,13 @@ F:\学习\编程类\Web安全技术学习\XSSAttachs\UnitTestProject1\bin\Debug\
 F:\学习\编程类\Web安全技术学习\XSSAttachs\UnitTestProject1\obj\Debug\UnitTestProject1.csprojResolveAssemblyReference.cache
 F:\学习\编程类\Web安全技术学习\XSSAttachs\UnitTestProject1\obj\Debug\UnitTestProject1.dll
 F:\学习\编程类\Web安全技术学习\XSSAttachs\UnitTestProject1\obj\Debug\UnitTestProject1.pdb
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\UnitTestProject1.dll
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\UnitTestProject1.pdb
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\StyleSheetsParser.dll
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\XSSAttacksFilter.dll
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\HtmlAgilityPack.dll
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\StyleSheetsParser.pdb
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\bin\Debug\XSSAttacksFilter.pdb
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\obj\Debug\UnitTestProject1.csprojResolveAssemblyReference.cache
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\obj\Debug\UnitTestProject1.dll
+E:\GIT\web-security\XSSAttachs\UnitTestProject1\obj\Debug\UnitTestProject1.pdb