Changeset 8608

Timestamp:

05/14/07 14:50:50 (19 months ago)

Author:

jburke

Message:

Refs #2656. Porting json comment support to 0.4 branch

Location:

branches/0.4

Files:

• src/io/BrowserIO.js (modified) (2 diffs)
• src/io/common.js (modified) (1 diff)
• tests/io/data-json-comment-filtered.js (copied) (copied from trunk/tests/io/data-json-comment-filtered.js)
• tests/io/test_BrowserIO.json-comment-filtered.html (copied) (copied from trunk/tests/io/test_BrowserIO.json-comment-filtered.html)

branches/0.4/src/io/BrowserIO.js

@@ -282 +282 @@
                                         ret = null;
                                 }
-                        }else if(kwArgs.mimetype == "text/json" || kwArgs.mimetype == "application/json"){
+                        }else if(kwArgs.mimetype.substr(0, 9) == "text/json" || kwArgs.mimetype.substr(0, 16) == "application/json"){
                                 try{
-                                        ret = dj_eval("("+http.responseText+")");
+                                        ret = dj_eval("("+kwArgs.jsonFilter(http.responseText)+")");
                                 }catch(e){
                                         dojo.debug(e);
@@ -398 +398 @@
                 // multi-part mime encoded and avoid using this transport for those
                 // requests.
+                var mlc = kwArgs["mimetype"].toLowerCase()||"";
                 return hasXmlHttp
-                        && dojo.lang.inArray(["text/plain", "text/html", "application/xml", "text/xml", "text/javascript", "text/json", "application/json"], (kwArgs["mimetype"].toLowerCase()||""))
+                        && (
+                                (
+                                        dojo.lang.inArray([
+                                                "text/plain", "text/html", "application/xml", 
+                                                "text/xml", "text/javascript"
+                                                ], mlc
+                                        )
+                                ) || (
+                                        mlc.substr(0, 9) == "text/json" || mlc.substr(0, 16) == "application/json"
+                                )
+                        )
                         && !( kwArgs["formNode"] && dojo.io.formHasFile(kwArgs["formNode"]) ); //boolean
         }

branches/0.4/src/io/common.js

@@ -113 +113 @@
         /** Prevent the browser from caching this by adding a query string argument to the URL */
         preventCache: false,
+
+        jsonFilter: function(value){
+                if(     (this.mimetype == "text/json-comment-filtered")||
+                        (this.mimetype == "application/json-comment-filtered")
+                ){
+                        var cStartIdx = value.indexOf("\/*");
+                        var cEndIdx = value.lastIndexOf("*\/");
+                        if((cStartIdx == -1)||(cEndIdx == -1)){
+                                dojo.debug("your JSON wasn't comment filtered!"); // FIXME: throw exception instead?
+                                return "";
+                        }
+                        return value.substring(cStartIdx+2, cEndIdx);
+                }
+                dojo.debug("please consider using a mimetype of text/json-comment-filtered to avoid potential security issues with JSON endpoints");
+                return value;
+        },
         
         // events stuff