Changeset 31230 in webkit

Timestamp:

Mar 22, 2008 2:49:58 AM (16 years ago)

Author:

eric@webkit.org

Message:

Reviewed by mjs.

Fix createElementNS to throw exceptions for invalid qualified names
Fixes Acid3 sub-test 23
​http://bugs.webkit.org/show_bug.cgi?id=16833

Tests: fast/dom/Document/createAttributeNS-namespace-err.html

fast/dom/Document/createElementNS-namespace-err.html

• dom/Document.cpp: (WebCore::Document::createElement): (WebCore::hasNamespaceError): (WebCore::Document::createElementNS): (WebCore::Document::createAttributeNS):
• dom/Document.idl:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/dom/xhtml/level3/core/documentsetstricterrorchecking02-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/Document/createAttributeNS-namespace-err-expected.txt (added)
• LayoutTests/fast/dom/Document/createAttributeNS-namespace-err.html (added)
• LayoutTests/fast/dom/Document/createElementNS-namespace-err-expected.txt (added)
• LayoutTests/fast/dom/Document/createElementNS-namespace-err.html (added)
• LayoutTests/fast/dom/Document/resources/TEMPLATE.html (added)
• LayoutTests/fast/dom/Document/resources/createAttributeNS-namespace-err.js (added)
• LayoutTests/fast/dom/Document/resources/createElementNS-namespace-err.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (8 diffs)
• WebCore/dom/Document.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by mjs.
+
+        Fix createElementNS to throw exceptions for invalid qualified names
+        Fixes Acid3 sub-test 23
+        http://bugs.webkit.org/show_bug.cgi?id=16833
+
+        * dom/xhtml/level3/core/documentsetstricterrorchecking02-expected.txt:
+        * fast/dom/Document/createAttributeNS-namespace-err-expected.txt: Added.
+        * fast/dom/Document/createAttributeNS-namespace-err.html: Copied from LayoutTests/fast/dom/Element/dimension-properties-unrendered.html.
+        * fast/dom/Document/createElementNS-namespace-err-expected.txt: Added.
+        * fast/dom/Document/createElementNS-namespace-err.html: Copied from LayoutTests/fast/dom/EntityReference/readonly-exceptions.html.
+        * fast/dom/Document/resources/TEMPLATE.html: Copied from LayoutTests/fast/dom/Element/resources/TEMPLATE.html.
+        * fast/dom/Document/resources/createAttributeNS-namespace-err.js: Added.
+        * fast/dom/Document/resources/createElementNS-namespace-err.js: Added.
+
 2008-03-21  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/LayoutTests/dom/xhtml/level3/core/documentsetstricterrorchecking02-expected.txt

@@ -1 +1 @@
 Test    http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetstricterrorchecking02
-Status  failure
-Message NAMESPACE_ERR_documentsetstricterrorchecking02: assertTrue failed
+Status  Success

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by mjs.
+
+        Fix createElementNS to throw exceptions for invalid qualified names
+        Fixes Acid3 sub-test 23
+        http://bugs.webkit.org/show_bug.cgi?id=16833
+
+        Tests: fast/dom/Document/createAttributeNS-namespace-err.html
+               fast/dom/Document/createElementNS-namespace-err.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::createElement):
+        (WebCore::hasNamespaceError):
+        (WebCore::Document::createElementNS):
+        (WebCore::Document::createAttributeNS):
+        * dom/Document.idl:
+
 2008-03-21  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/WebCore/dom/Document.cpp

@@ -108 +108 @@
 #include "WheelEvent.h"
 #include "XMLHttpRequest.h"
+#include "XMLNames.h"
 #include "XMLTokenizer.h"
 #include "kjs_binding.h"
@@ -515 +516 @@
 PassRefPtr<Element> Document::createElement(const String &name, ExceptionCode& ec)
 {
-    if (m_isXHTML) {
-        if (!isValidName(name)) {
-            ec = INVALID_CHARACTER_ERR;
-            return 0;
-        }
-
-        return HTMLElementFactory::createHTMLElement(AtomicString(name), this, 0, false);
-    } else
-        return createElementNS(nullAtom, name, ec);
+    if (!isValidName(name)) {
+        ec = INVALID_CHARACTER_ERR;
+        return 0;
+    }
+
+    if (m_isXHTML)
+        return HTMLElementFactory::createHTMLElement(name, this, 0, false);
+
+    return createElement(QualifiedName(nullAtom, name, nullAtom), false, ec);
 }
 
@@ -717 +718 @@
 }
 
+static bool hasNamespaceError(const QualifiedName& qName)
+{
+    static const AtomicString xmlnsNamespaceURI = "http://www.w3.org/2000/xmlns/";
+    static const AtomicString xmlns = "xmlns";
+    static const AtomicString xml = "xml";
+
+    // These checks are from DOM Core Level 2, createElementNS
+    // http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-DocCrElNS
+    if (qName.prefix() == emptyAtom) // createElementNS(null, ":div")
+        return true;
+    if (qName.localName().isEmpty()) // createElementNS(null, ""), createElementNS(null, null), createElementNS()
+        return true;
+    if (!qName.prefix().isEmpty() && qName.namespaceURI().isNull()) // createElementNS(null, "html:div")
+        return true;
+    if (qName.prefix() == xml && qName.namespaceURI() != XMLNames::xmlNamespaceURI) // createElementNS("http://www.example.com", "xml:lang")
+        return true;
+
+    // Required by DOM Level 3 Core and unspecified by DOM Level 2 Core:
+    // http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS
+    // createElementNS("http://www.w3.org/2000/xmlns/", "foo:bar"), createElementNS(null, "xmlns:bar")
+    if ((qName.prefix() == xmlns && qName.namespaceURI() != xmlnsNamespaceURI) || (qName.prefix() != xmlns && qName.namespaceURI() == xmlnsNamespaceURI))
+        return true;
+
+    return false;
+}
+
 // FIXME: This should really be in a possible ElementFactory class
 PassRefPtr<Element> Document::createElement(const QualifiedName& qName, bool createdByParser, ExceptionCode& ec)
@@ -733 +760 @@
         e = new Element(qName, document());
     
+    // FIXME: The element factories should be fixed to not ignore qName.prefix()
+    // Instead they should pass the entire qName into element creation so we don't
+    // need to manually set the prefix after creation.
+    // Then this code can become ASSERT(qName == e.qname());
+    // and Document::createElement can stop taking ExceptionCode& as well.
     if (e && !qName.prefix().isNull()) {
         ec = 0;
@@ -738 +770 @@
         if (ec)
             return 0;
-    }    
+    }
     
     return e.release();
 }
 
-PassRefPtr<Element> Document::createElementNS(const String &_namespaceURI, const String &qualifiedName, ExceptionCode& ec)
+PassRefPtr<Element> Document::createElementNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode& ec)
 {
     String prefix, localName;
@@ -751 +783 @@
     }
 
-    RefPtr<Element> e;
-    QualifiedName qName = QualifiedName(AtomicString(prefix), AtomicString(localName), AtomicString(_namespaceURI));
-    
+    QualifiedName qName(prefix, localName, namespaceURI);
+    if (hasNamespaceError(qName)) {
+        ec = NAMESPACE_ERR;
+        return 0;
+    }
+
     return createElement(qName, false, ec);
 }
@@ -2785 +2820 @@
 }
 
-bool Document::parseQualifiedName(const String &qualifiedName, String &prefix, String &localName)
+bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, String& localName)
 {
     unsigned length = qualifiedName.length();
@@ -3490 +3525 @@
 }
 
-PassRefPtr<Attr> Document::createAttributeNS(const String &namespaceURI, const String &qualifiedName, ExceptionCode& ec)
-{
-    if (qualifiedName.isNull()) {
+PassRefPtr<Attr> Document::createAttributeNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode& ec)
+{
+    String prefix, localName;
+    if (!parseQualifiedName(qualifiedName, prefix, localName)) {
+        ec = INVALID_CHARACTER_ERR;
+        return 0;
+    }
+
+    QualifiedName qName(prefix, localName, namespaceURI);
+    if (hasNamespaceError(qName)) {
         ec = NAMESPACE_ERR;
         return 0;
     }
 
-    String localName = qualifiedName;
-    String prefix;
-    int colonpos;
-    if ((colonpos = qualifiedName.find(':')) >= 0) {
-        prefix = qualifiedName.substring(0, colonpos);
-        localName = qualifiedName.substring(colonpos + 1);
-    }
-
-    if (!isValidName(localName)) {
-        ec = INVALID_CHARACTER_ERR;
+    // Spec: DOM Level 2 Core: http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-DocCrAttrNS
+    if (qName.localName() == "xmlns" && qName.namespaceURI() != "http://www.w3.org/2000/xmlns/") {
+        ec = NAMESPACE_ERR;
         return 0;
     }
-    
+
     // FIXME: Assume this is a mapped attribute, since createAttribute isn't namespace-aware.  There's no harm to XML
     // documents if we're wrong.
-    return new Attr(0, this, new MappedAttribute(QualifiedName(prefix, localName, namespaceURI), StringImpl::empty()));
+    return new Attr(0, this, new MappedAttribute(qName, StringImpl::empty()));
 }
 

trunk/WebCore/dom/Document.idl

@@ -34 +34 @@
         readonly attribute Element documentElement;
 
-        Element            createElement(in DOMString tagName)
+        Element            createElement(in [ConvertNullToNullString] DOMString tagName)
             raises (DOMException);
         DocumentFragment   createDocumentFragment();
@@ -56 +56 @@
             raises (DOMException);
         [OldStyleObjC] Element createElementNS(in [ConvertNullToNullString] DOMString namespaceURI,
-                                               in DOMString qualifiedName)
+                                               in [ConvertNullToNullString] DOMString qualifiedName)
             raises (DOMException);
         [OldStyleObjC] Attr createAttributeNS(in [ConvertNullToNullString] DOMString namespaceURI,
-                                              in DOMString qualifiedName)
+                                              in [ConvertNullToNullString] DOMString qualifiedName)
             raises (DOMException);
         [OldStyleObjC] NodeList getElementsByTagNameNS(in [ConvertNullToNullString] DOMString namespaceURI,