remove empty AttributeStatement element in Response when no attribute…

…s (fix 139)
italia · Jun 19, 2021 · 9b29f2b · 9b29f2b
1 parent 6818202
commit 9b29f2b
Show file tree

Hide file tree

Showing 86 changed files with 91 additions and 256 deletions.
diff --git a/spid-validator/server/lib/saml-utils.js b/spid-validator/server/lib/saml-utils.js
@@ -103,7 +103,12 @@ class TestSuite {
                     }
                 }         
 
-                compiled = compiled.replace("{{Attributes}}", attributesCompiled);  
+                if(attributesCompiled!='') {
+                    let attributeStatementCompiled = "<saml:AttributeStatement>" + attributesCompiled + "</saml:AttributeStatement>";
+                    compiled = compiled.replace("{{Attributes}}", attributeStatementCompiled);  
+                } else {
+                    compiled = compiled.replace("{{Attributes}}", "");
+                }
 
             } else {
                 compiled = compiled.replaceAll(e, eVal);

diff --git a/spid-validator/test/base-nosession.xml b/spid-validator/test/base-nosession.xml
@@ -38,8 +38,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/base.xml b/spid-validator/test/base.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-08.xml b/spid-validator/test/case-08.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-09.xml b/spid-validator/test/case-09.xml
@@ -38,8 +38,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-10.xml b/spid-validator/test/case-10.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-109.xml b/spid-validator/test/case-109.xml
@@ -41,8 +41,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-11.xml b/spid-validator/test/case-11.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-110.xml b/spid-validator/test/case-110.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-12.xml b/spid-validator/test/case-12.xml
@@ -38,8 +38,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-13.xml b/spid-validator/test/case-13.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-16.xml b/spid-validator/test/case-16.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-17.xml b/spid-validator/test/case-17.xml
@@ -37,8 +37,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-19.xml b/spid-validator/test/case-19.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-20.xml b/spid-validator/test/case-20.xml
@@ -38,8 +38,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-21.xml b/spid-validator/test/case-21.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-22.xml b/spid-validator/test/case-22.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-23.xml b/spid-validator/test/case-23.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-24.xml b/spid-validator/test/case-24.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-25.xml b/spid-validator/test/case-25.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-26.xml b/spid-validator/test/case-26.xml
@@ -40,8 +40,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-27.xml b/spid-validator/test/case-27.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-28.xml b/spid-validator/test/case-28.xml
@@ -38,8 +38,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-29.xml b/spid-validator/test/case-29.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-30.xml b/spid-validator/test/case-30.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-31.xml b/spid-validator/test/case-31.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-33.xml b/spid-validator/test/case-33.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-34.xml b/spid-validator/test/case-34.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-35.xml b/spid-validator/test/case-35.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-36.xml b/spid-validator/test/case-36.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-37.xml b/spid-validator/test/case-37.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-38.xml b/spid-validator/test/case-38.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-39.xml b/spid-validator/test/case-39.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-40.xml b/spid-validator/test/case-40.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-41.xml b/spid-validator/test/case-41.xml
@@ -29,8 +29,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-42.xml b/spid-validator/test/case-42.xml
@@ -27,8 +27,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-43.xml b/spid-validator/test/case-43.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-44.xml b/spid-validator/test/case-44.xml
@@ -35,8 +35,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>
diff --git a/spid-validator/test/case-45.xml b/spid-validator/test/case-45.xml
@@ -39,8 +39,6 @@
                 <saml:AuthnContextClassRef>{{AuthnContextClassRef}}</saml:AuthnContextClassRef>
             </saml:AuthnContext>
         </saml:AuthnStatement>
-        <saml:AttributeStatement>
-            {{Attributes}}
-        </saml:AttributeStatement>
+        {{Attributes}}
     </saml:Assertion>
 </samlp:Response>