375983 - xsi:type not on root element is ignored

Assignee

Description

•

17 years ago

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3
Build Identifier: 

When a referenced, or inline, xml instance has nodes with
redefined types using xsi:type, this information is ignored.
Validator only looks for it on ValidateNode(node) that is passed
in, which is typically the root document element only and then
walks the DOM with internal methods that track location along
associated schema.  Need to check for xsi:type on elements.
Note, this could be changed if and when DOM Level 3 Core's
Element.schemaTypeInfo

Reproducible: Always

Steve Speicher

Assignee

Comment 1

•

17 years ago

Attached file test case — Details

Steve Speicher

Assignee

Comment 2

•

17 years ago

Attached patch patch — Details — Splinter Review

Attachment #260120 - Flags: review?(doronr)

Doron Rosenberg (IBM)

Comment 3

•

17 years ago

Comment on attachment 260120 [details] [diff] [review]
patch

>? xsitype.diff
>Index: nsSchemaValidator.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/extensions/schema-validation/src/nsSchemaValidator.cpp,v
>retrieving revision 1.36
>diff -u -8 -p -r1.36 nsSchemaValidator.cpp
>--- nsSchemaValidator.cpp	27 Mar 2007 21:55:06 -0000	1.36
>+++ nsSchemaValidator.cpp	30 Mar 2007 01:38:58 -0000
>@@ -170,87 +170,23 @@ nsSchemaValidator::Validate(nsIDOMNode* 
>   LOG(("--------- nsSchemaValidator::Validate called ---------"));
> 
>   if (!aElement)
>     return NS_ERROR_SCHEMAVALIDATOR_NO_DOM_NODE_SPECIFIED;
> 
>   // init the override
>   mForceInvalid = PR_FALSE;
> 
>-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(aElement);
>-  NS_ENSURE_STATE(domElement);
>-
>-  PRBool hasTypeAttribute = PR_FALSE;
>-  nsresult rv = domElement->HasAttributeNS(NS_LITERAL_STRING(
>-                                             NS_SCHEMA_INSTANCE_NAMESPACE),
>-                                           NS_LITERAL_STRING("type"),
>-                                           &hasTypeAttribute);
>-  NS_ENSURE_SUCCESS(rv, rv);
>-
>   // will hold the type to validate against
>   nsCOMPtr<nsISchemaType> type;
> 
>-  if (hasTypeAttribute) {
>-    LOG(("  -- found type attribute"));
>-
>-    nsAutoString typeAttribute;
>-    rv = domElement->GetAttributeNS(NS_LITERAL_STRING(
>-                                      NS_SCHEMA_INSTANCE_NAMESPACE),
>-                                    NS_LITERAL_STRING("type"),
>-                                    typeAttribute);
>-    NS_ENSURE_SUCCESS(rv, rv);
>-    LOG(("  Type is: %s", NS_ConvertUTF16toUTF8(typeAttribute).get()));
>-
>-    if (typeAttribute.IsEmpty())
>-      return NS_ERROR_SCHEMAVALIDATOR_NO_TYPE_FOUND;
>-
>-    // split type (ns:type) into namespace and type.
>-    nsCOMPtr<nsIParserService> parserService =
>-      do_GetService("@mozilla.org/parser/parser-service;1", &rv);
>-    NS_ENSURE_SUCCESS(rv, rv);
>-
>-    const nsAFlatString& qName = PromiseFlatString(typeAttribute);
>-    const PRUnichar *colon;
>-    rv = parserService->CheckQName(qName, PR_TRUE, &colon);
>-    NS_ENSURE_SUCCESS(rv, rv);
>-
>-    const PRUnichar* end;
>-    qName.EndReading(end);
>-
>-    nsAutoString schemaTypePrefix, schemaType, schemaTypeNamespace;
>-    if (!colon) {
>-      // colon not found, so no prefix
>-      schemaType.Assign(typeAttribute);
>-
>-      // get namespace from node
>-      aElement->GetNamespaceURI(schemaTypeNamespace);
>-    } else {
>-      schemaTypePrefix.Assign(Substring(qName.get(), colon));
>-      schemaType.Assign(Substring(colon + 1, end));
>-
>-      // get the namespace url from the prefix
>-      nsCOMPtr<nsIDOM3Node> domNode3 = do_QueryInterface(aElement);
>-      rv = domNode3->LookupNamespaceURI(schemaTypePrefix, schemaTypeNamespace);
>-      NS_ENSURE_SUCCESS(rv, rv);
>-    }
>-
>-    LOG(("  Type to validate against is %s:%s",
>-      NS_LossyConvertUTF16toASCII(schemaTypePrefix).get(),
>-      NS_LossyConvertUTF16toASCII(schemaType).get()));
>-
>-    // no schemas loaded and type is not builtin, abort
>-    if (!mSchema &&
>-        !schemaTypeNamespace.EqualsLiteral(NS_SCHEMA_1999_NAMESPACE) &&
>-        !schemaTypeNamespace.EqualsLiteral(NS_SCHEMA_2001_NAMESPACE))
>-      return NS_ERROR_SCHEMAVALIDATOR_NO_SCHEMA_LOADED;
>+  nsresult rv = GetElementXsiType(aElement, getter_AddRefs(type));
>+  NS_ENSURE_SUCCESS(rv, rv);
> 
>-    // get the type
>-    rv = GetType(schemaType, schemaTypeNamespace, getter_AddRefs(type));
>-    NS_ENSURE_SUCCESS(rv, rv);
>-  } else if (mSchema) {
>+  if (!type && mSchema) {
>     // no type attribute, look for an xsd:element in the schema that matches
>     LOG(("   -- no type attribute found, so looking for matching xsd:element"));
> 
>     // get namespace from node
>     nsAutoString schemaTypeNamespace;
>     rv = aElement->GetNamespaceURI(schemaTypeNamespace);
>     NS_ENSURE_SUCCESS(rv, rv);
> 
>@@ -4281,30 +4217,119 @@ nsSchemaValidator::ValidateComplexPartic
> 
>   leftOvers.swap(*aLeftOvers);
>   *aNotFound = notFound;
>   *aResult = isValid;
>   return rv;
> }
> 
> nsresult
>+nsSchemaValidator::GetElementXsiType(nsIDOMNode*     aNode,
>+                                  nsISchemaType** aType)
>+{
>+
>+  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(aNode);
>+  NS_ENSURE_STATE(domElement);
>+
>+  PRBool hasTypeAttribute = PR_FALSE;
>+  nsresult rv = domElement->HasAttributeNS(NS_LITERAL_STRING(
>+                                             NS_SCHEMA_INSTANCE_NAMESPACE),
>+                                           NS_LITERAL_STRING("type"),
>+                                           &hasTypeAttribute);
>+  NS_ENSURE_SUCCESS(rv, rv);
>+
>+  /* XXX: This all may need to change when 
>+     element.GetSchemaTypeInfo() is implemented from DOM Level 3 Core,
>+     see:
>+     http://www.w3.org/TR/DOM-Level-3-Core/core.html#Attr-schemaTypeInfo
>+  */
>+
>+  if (hasTypeAttribute) {
>+    LOG(("  -- found xsi:type attribute"));
>+
>+    nsAutoString typeAttribute;
>+    rv = domElement->GetAttributeNS(NS_LITERAL_STRING(
>+                                      NS_SCHEMA_INSTANCE_NAMESPACE),
>+                                    NS_LITERAL_STRING("type"),
>+                                    typeAttribute);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+    LOG(("  Type is: %s", NS_ConvertUTF16toUTF8(typeAttribute).get()));
>+
>+    if (typeAttribute.IsEmpty())
>+      return NS_ERROR_SCHEMAVALIDATOR_NO_TYPE_FOUND;
>+
>+    // split type (ns:type) into namespace and type.
>+    nsCOMPtr<nsIParserService> parserService =
>+      do_GetService("@mozilla.org/parser/parser-service;1", &rv);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+
>+    const nsAFlatString& qName = PromiseFlatString(typeAttribute);
>+    const PRUnichar *colon;
>+    rv = parserService->CheckQName(qName, PR_TRUE, &colon);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+
>+    const PRUnichar* end;
>+    qName.EndReading(end);
>+
>+    nsAutoString schemaTypePrefix, schemaType, schemaTypeNamespace;
>+    if (!colon) {
>+      // colon not found, so no prefix
>+      schemaType.Assign(typeAttribute);
>+
>+      // get namespace from node
>+      aNode->GetNamespaceURI(schemaTypeNamespace);
>+    } else {
>+      schemaTypePrefix.Assign(Substring(qName.get(), colon));
>+      schemaType.Assign(Substring(colon + 1, end));
>+
>+      // get the namespace url from the prefix
>+      nsCOMPtr<nsIDOM3Node> domNode3 = do_QueryInterface(aNode);
>+      rv = domNode3->LookupNamespaceURI(schemaTypePrefix, schemaTypeNamespace);
>+      NS_ENSURE_SUCCESS(rv, rv);
>+    }
>+
>+    LOG(("  Type to validate against is %s:%s",
>+      NS_LossyConvertUTF16toASCII(schemaTypePrefix).get(),
>+      NS_LossyConvertUTF16toASCII(schemaType).get()));
>+
>+    // no schemas loaded and type is not builtin, abort
>+    if (!mSchema &&
>+        !schemaTypeNamespace.EqualsLiteral(NS_SCHEMA_1999_NAMESPACE) &&
>+        !schemaTypeNamespace.EqualsLiteral(NS_SCHEMA_2001_NAMESPACE))
>+      return NS_ERROR_SCHEMAVALIDATOR_NO_SCHEMA_LOADED;
>+
>+    // get the type
>+    rv = GetType(schemaType, schemaTypeNamespace, aType);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+  }
>+
>+  return rv;
>+}
>+
>+nsresult
> nsSchemaValidator::ValidateComplexElement(nsIDOMNode* aNode,
>                                           nsISchemaParticle *aSchemaParticle,
>                                           PRBool *aResult)
> {
>   PRBool isValid = PR_FALSE;
> 
>   nsCOMPtr<nsISchemaElement> schemaElement(do_QueryInterface(aSchemaParticle));
> 
>   if (!schemaElement)
>     return NS_ERROR_UNEXPECTED;
> 
>+  // will hold the type to validate against
>   nsCOMPtr<nsISchemaType> type;
>-  nsresult rv = schemaElement->GetType(getter_AddRefs(type));
>-  NS_ENSURE_SUCCESS(rv, rv);
>+
>+  nsresult rv = GetElementXsiType(aNode, getter_AddRefs(type));
>+
>+  if (!type) {
>+    rv = schemaElement->GetType(getter_AddRefs(type));
>+    NS_ENSURE_SUCCESS(rv, rv);
>+  }
> 
>   if (!type)
>     return NS_ERROR_UNEXPECTED;
> 
>   PRUint16 typeValue;
>   rv = type->GetSchemaType(&typeValue);
>   NS_ENSURE_SUCCESS(rv, rv);
> 
>Index: nsSchemaValidator.h
>===================================================================
>RCS file: /cvsroot/mozilla/extensions/schema-validation/src/nsSchemaValidator.h,v
>retrieving revision 1.12
>diff -u -8 -p -r1.12 nsSchemaValidator.h
>--- nsSchemaValidator.h	13 Mar 2007 05:28:21 -0000	1.12
>+++ nsSchemaValidator.h	30 Mar 2007 01:38:59 -0000
>@@ -345,16 +345,17 @@ private:
>   nsresult ValidateSchemaAttribute(nsIDOMNode* aNode, nsISchemaAttribute *aAttr,
>                                    const nsAString & aAttrName,
>                                    PRUint32 *aFoundAttrCount, PRBool *aResult);
>   nsresult ValidateSchemaAttributeGroup(nsIDOMNode* aNode,
>                                         nsISchemaAttributeGroup *aAttr,
>                                         const nsAString & aAttrName,
>                                         PRUint32 *aFoundAttrCount,
>                                         PRBool *aResult);
>+  nsresult GetElementXsiType(nsIDOMNode* aNode, nsISchemaType** aType);
> 
> static void
> ReleaseObject(void    *aObject,
>               nsIAtom *aPropertyName,
>               void    *aPropertyValue,
>               void    *aData)
> {
>   NS_STATIC_CAST(nsISupports *, aPropertyValue)->Release();

Attachment #260120 - Flags: review?(doronr) → review+

Steve Speicher

Assignee

Updated

•

17 years ago

Attachment #260120 - Flags: review?(aaronr)

aaronr

Updated

•

17 years ago

Assignee: xforms → sspeiche

Status: UNCONFIRMED → NEW

Ever confirmed: true

aaronr

Comment 4

•

17 years ago

Comment on attachment 260120 [details] [diff] [review]
patch

>Index: nsSchemaValidator.cpp
>===================================================================

> nsresult
>+nsSchemaValidator::GetElementXsiType(nsIDOMNode*     aNode,
>+                                  nsISchemaType** aType)
>+{
>+

nit: I know the style rules in schema-validator are more lax, but at least make the parameter types line up :-)


> nsSchemaValidator::ValidateComplexElement(nsIDOMNode* aNode,
>                                           nsISchemaParticle *aSchemaParticle,
>                                           PRBool *aResult)
> {
>   PRBool isValid = PR_FALSE;
> 
>   nsCOMPtr<nsISchemaElement> schemaElement(do_QueryInterface(aSchemaParticle));
> 
>   if (!schemaElement)
>     return NS_ERROR_UNEXPECTED;
> 
>+  // will hold the type to validate against
>   nsCOMPtr<nsISchemaType> type;
>-  nsresult rv = schemaElement->GetType(getter_AddRefs(type));
>-  NS_ENSURE_SUCCESS(rv, rv);
>+
>+  nsresult rv = GetElementXsiType(aNode, getter_AddRefs(type));
>+

nit: shouldn't you NS_ENSURE_SUCCESS(rv, rv) here?

>+  if (!type) {
>+    rv = schemaElement->GetType(getter_AddRefs(type));
>+    NS_ENSURE_SUCCESS(rv, rv);
>+  }
> 
>   if (!type)
>     return NS_ERROR_UNEXPECTED;

nit: shouldn't you move this up into the if (!type) test?  Otherwise you are running the same test twice if xsi:type is set, when you don't really need to.

with those, r=me

Attachment #260120 - Flags: review?(aaronr) → review+

Steve Speicher

Assignee

Comment 5

•

17 years ago

Attached patch patch for checkin — Details — Splinter Review

aaronr

Comment 6

•

17 years ago

checked in for sspeiche

Status: NEW → RESOLVED

Closed: 17 years ago

Resolution: --- → FIXED

Whiteboard: xf-to-branch

aaronr

Comment 7

•

17 years ago

checked into 1.8 branch on 2007-04-12
checked into 1.8.0 branch on 2007-04-16

Keywords: fixed1.8.0.12, fixed1.8.1.4

Whiteboard: xf-to-branch

Nobody; OK to take it and work on it

Updated

•

8 years ago

Product: Core → Core Graveyard

test case 17 years ago Steve Speicher 2.05 KB, application/xhtml+xml		Details
patch 17 years ago Steve Speicher 8.92 KB, patch	doronr : review+ aaronr : review+	Details \| Diff \| Splinter Review
patch for checkin 17 years ago Steve Speicher 9.10 KB, patch		Details \| Diff \| Splinter Review

Bugzilla

Quick Search

xsi:type not on root element is ignored

Categories

(Core Graveyard :: XForms, defect)

Tracking

(Not tracked)

People

(Reporter: sspeiche, Assigned: sspeiche)

References

Details

(Keywords: fixed1.8.0.12, fixed1.8.1.4)

Crash Data

Security

(public)

User Story

Attachments

(3 files)

Description

Comment 1

Comment 2

Comment 3

Updated

Updated

Comment 4

Comment 5

Comment 6

Comment 7

Updated

Attachment

General

Description

File Name

Content Type