Align iframe[sandbox] checking with spec

Fixes https://github.com/validator/validator/issues/138

diff --git a/common.rnc b/common.rnc
index 97c09dea79cc16026e2985886e674d11adc78d71..3352fd8e7dfae3b969756fee6f7cf94367b2b8a0 100644 (file)
--- a/common.rnc
+++ b/common.rnc
@@ -394,6 +394,10 @@ common.attrs.other =
        common.data.integrity =
                w:integrity-metadata
 
+## List of sandbox keywords
+       common.data.sandbox-allow-list =
+               w:string "" | w:sandbox-allow-list
+
 ## Microdata Properties
   common.data.microdata-properties =
     list { w:microdata-property+ }

diff --git a/embed.rnc b/embed.rnc
index 1b20ba86c373cf5c3c84453f7f50b976bdc1cb18..27b3ab63e5ddcaef2495fcfeead6b779d3ac394e 100644 (file)
--- a/embed.rnc
+++ b/embed.rnc
@@ -465,152 +465,9 @@ namespace local = ""
                                w:string "seamless" | w:string ""
                        } & v5only
                iframe.attrs.sandbox =
-                       attribute sandbox
-                               {       list 
-                                       {       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       }
-                               |       list 
-                                       {       ( w:string "allow-scripts" )?
-                                       ,       ( w:string "allow-forms" )?
-                                       ,       ( w:string "allow-same-origin" )?
-                                       ,       ( w:string "allow-top-navigation" )?
-                                       }
-                               } & v5only
+                       attribute sandbox {
+                               common.data.sandbox-allow-list
+                       } & v5only
                iframe.attrs.allowfullscreen =
                        attribute allowfullscreen {
                                w:string "allowfullscreen" | w:string ""