Changeset 7285

Timestamp:

02/11/07 22:56:11 (22 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Get tree double-click to work, and add some protection to php script so it doesn't allow fetching any file from the server.

Location:

trunk/buildscripts

Files:

• buildUtil.js (modified) (1 diff)
• makeDojoJsWeb.js (modified) (1 diff)
• webbuild/index.html (modified) (4 diffs)

trunk/buildscripts/buildUtil.js

@@ -292 +292 @@
         //Insert all the provide statements at the provide insertion marker.
         var provideString = "";
-        for(var i = 0; i < provideList.length; i++){
-                provideString += 'dojo.provide("' + provideList[i] + '");' + lineSeparator;
+        if(provideList && provideList.length > 0){
+                for(var i = 0; i < provideList.length; i++){
+                        provideString += 'dojo.provide("' + provideList[i] + '");' + lineSeparator;
+                }
         }
         dojoContents = dojoContents.replace(/__DOJO_PROVIDE_INSERTION__/, provideString);

trunk/buildscripts/makeDojoJsWeb.js

@@ -10 +10 @@
 
 depList = depList.split(",");
-provideList = provideList.split(",");
+
+//Check if there were no provideList (the caller can send string "null"
+//to indicate that the command line parameter is empty. We need some string
+//to make sure all the arguments are in the right spot.
+if(provideList == "null"){
+        provideList = "[]";
+}else{
+        provideList = provideList.split(",");
+        provideList = '["' + provideList.join('","') + '"]';
+}
 
 var dependencyResult;
-eval('dependencyResult = {depList: ["' + depList.join('","') + '"], provideList: ["' + provideList.join('","') + '"]};');
+eval('dependencyResult = {depList: ["' + depList.join('","') + '"], provideList: ' + provideList + '};');
 
-//Load dojo (needed for string interning)
-djConfig={
-        baseRelativePath: "../"
-};
-load('../dojo.js');
-dojo.require("dojo.string.extras");
-
-var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
-
-//Add copyright, and intern strings.
-contents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, [["dojo", "src"]], [], true);
-
-if(xdDojoUrl){
-        contents = buildUtilXd.setXdDojoConfig(contents, xdDojoUrl);
+//Make sure we are dealing with JS files and that the paths are not outside
+//of the working area. Do this to discourage fetching arbitrary files from
+//the server.
+var deps = dependencyResult.depList;
+var isInputOk = true;
+for(var i = 0; i < deps.length; i++){
+        var matches = deps[i].match(/\.\./g);
+        if((matches && matches.length > 1) || !deps[i].match(/\.js$/) || deps[i].indexOf(0) == '/'){
+                print("Error: Invalid file set.");
+                isInputOk = false;
+                break;
+        }
 }
 
-print(contents);
+if(isInputOk){
+        //Load dojo (needed for string interning)
+        djConfig={
+                baseRelativePath: "../"
+        };
+        load('../dojo.js');
+        dojo.require("dojo.string.extras");
+        
+        var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
+        
+        //Add copyright, and intern strings.
+        contents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, [["dojo", "src"]], [], true);
+        
+        if(xdDojoUrl){
+                contents = buildUtilXd.setXdDojoConfig(contents, xdDojoUrl);
+        }
+        
+        print(contents);
+}

trunk/buildscripts/webbuild/index.html

@@ -159 +159 @@
         }
 
+superMessage = null;
+        function onTreeSelect(message){
+                //summary: event called when a tree node is selected.
+                //Adds item to module list for build.
+                superMessage = message;
+                var treeItem = message.node;
+                var moduleName = treeItem["dojoModuleName"];
+                if(moduleName){
+                        var existingDeps = getNormalizedDependencies();
+                        var matchRegExp = new RegExp(moduleName.replace('"' + /\./g, "\\.").replace(/\*/g, "\\*") + '"(,|$)');
+                        if(!existingDeps.match(matchRegExp)){
+                                var depTextArea = dojo.byId("dependencyList");
+                                var textValue = depTextArea.value;
+                                if(textValue && textValue.charAt(depTextArea.value.length - 1) != "\n"){
+                                        textValue += "\n";
+                                }
+                                depTextArea.value = textValue + moduleName + "\n";
+                        }
+                }
+        }
+        
         dojo.addOnLoad(function(){
                 startup();
@@ -171 +192 @@
                 var treeWidget = dojo.widget.createWidget("TreeV3", {listeners: [selector.widgetId, controller.widgetId]});
 
-                dojo.event.topic.subscribe(selector.eventNames.select, this, "onTreeSelect")
+                dojo.event.topic.subscribe(selector.eventNames.dblselect, window, "onTreeSelect")
 
                 if(typeof treeData == "undefined"){
@@ -207 +228 @@
         });
         
-        function startBuild(){
+        function getNormalizedDependencies(){
                 var deps = dojo.byId('dependencyList').value.replace(/^\s+/, "").replace(/\s+$/, "");
                 
@@ -224 +245 @@
                         deps = goodParts.join(",");
                 }
-                
-                builderFrame.startBuild(deps, version, xdDojoUrl);
+                return deps;            
+        }
+        
+        function startBuild(){
+                builderFrame.startBuild(getNormalizedDependencies(), version, xdDojoUrl);
         }