Changeset 5533

Timestamp:

02/15/10 20:26:29 (6 months ago)

Author:

rcarvalho

Message:

updated stuff

Location:

branch/umitweb-ng

Files:

• share/umit/templates/index.html (modified) (5 diffs)
• share/umit/umitweb_media/css/common.css (modified) (2 diffs)
• share/umit/umitweb_media/css/layout.css (modified) (4 diffs)
• share/umit/umitweb_media/css/style.css (modified) (1 diff)
• share/umit/umitweb_media/js/common.js (modified) (1 diff)
• share/umit/umitweb_media/js/common.mootools.js (added)
• share/umit/umitweb_media/js/index.js (modified) (2 diffs)
• share/umit/umitweb_media/js/index.mootools.js (added)
• share/umit/umitweb_media/js/scan.js (modified) (1 diff)
• share/umit/umitweb_media/js/scan.mootools.js (added)
• umit/web/Urls.py (modified) (1 diff)
• umit/web/views/main.py (modified) (3 diffs)

branch/umitweb-ng/share/umit/templates/index.html

@@ -11 +11 @@
         <link rel="stylesheet" href="/media/css/layout.css"/>
         <link rel="stylesheet" href="/media/css/tabber.css"/>
+        <link rel="stylesheet" href="/media/css/output_highlight.css"/>
         <link rel="icon" href="/favicon.ico" type="image/vnd.microsoft.icon"/>
-        <!-- <script type='text/javascript' 
-                src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script> -->
-        <script type="text/javascript" src="/media/js/mootools.v1.11-old.js"></script>
+
+        <!-- <script type="text/javascript" src="/media/js/mootools.v1.11-old.js"></script>
         <script type="text/javascript" src="/media/js/common.js"></script>
         <script type="text/javascript" src="/media/js/dialog.js"></script>
@@ -20 +20 @@
         <script type="text/javascript" src="/media/js/command-wizard.js"></script>
         <script type="text/javascript" src="/media/js/scan-dialog.js"></script>
+        <script type="text/javascript" src="/media/js/index.js"></script> -->
+        
+        
+        <script type="text/javascript" src="/media/js/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript" src="/media/js/common.js"></script>
         <script type="text/javascript" src="/media/js/index.js"></script>
         <script type="text/javascript" src="/media/js/scan.js"></script>
@@ -32 +37 @@
           <img src="/media/images/spinner.gif"/>
         </div>
-        <div id="body" class="hide">
+        <div id="body" class="hide" style="width:100%">
             <div id="options">
              <ul>
@@ -49 +54 @@
             <!-- <div><form method="post" onsubmit="return runScan()"> -->
             <div><form method="post" action="/scan/" id="frmScan">
-                <label for="target">Target:</label><input type="text" name="target" size="25" id="target" onblur="fillCommand(this.value)"/>
-                &nbsp;&nbsp;&nbsp;<label for="profiles">Profile:</label><select id="profiles" style="width:294px;" name="profile"></select><br/>
+                <label for="target">Target:</label>
+                <input type="text" name="target" size="25" id="target"/>
+                &nbsp;&nbsp;&nbsp;<label for="profiles">Profile:</label>
+                <select id="profiles" style="width:294px;" name="profile"></select><br/>
+                
                 <label for="command">Command: </label><span class="code"></span>
-                <input type='text' id='command' name='command' size='50' value='-v <target>'/><input type="SUBMIT" value="Scan now!"/>
-                <input type='HIDDEN' name="profile_name" id="profile_name"/>
+                <input type='text' id='command' name='command' size='50' value='-v <target>'/>
+                <input type="submit" value="Scan now!"/>
+                <input type='hidden' name="profile_name" id="profile_name"/>
             </form></div>
         <div id="result_window">
@@ -152 +161 @@
                 </div>
             </div>
+            <div class="clear">&nbsp;</div>
         </div>
             <div id="footer">Copyright (C) 2007 Adriano Monteiro Marques.</div>

branch/umitweb-ng/share/umit/umitweb_media/css/common.css

@@ +1 @@
+body{
+  height: 100%;
+}
+
 body, table{
    font-family: sans;
@@ -108 +112 @@
   color: #474747;
 }
+
+.clear{
+  clear: both;
+  width: 0;
+  height: 0;
+}

branch/umitweb-ng/share/umit/umitweb_media/css/layout.css

@@ -7 +7 @@
 }
 
+#result_window{
+  height: 100%;
+}
 
 #hosts_services{
@@ -14 +17 @@
     margin-left: 3px;
     margin-right: 3px;
-    margin-top: 2px;
     margin-bottom: 2px;
+    margin-bottom: 2px;
+    height: 100%;
     /*border: 1px solid black;*/
 }
@@ -28 +32 @@
     /*border: 1px solid black;*/
     width: 81%;
+    height: 100%;
 }
 
@@ -43 +48 @@
 #body{
     margin: 0;
-    /*width: 100%;*/
-    position: absolute;
+    margin-top: 5px;
+    width: 100%;
 }
 

branch/umitweb-ng/share/umit/umitweb_media/css/style.css

@@ -23 +23 @@
     padding-left: 190px;
     padding-top: 65px;
-    width: 98%;
 }
 

branch/umitweb-ng/share/umit/umitweb_media/js/common.js

@@ -1 @@
-var last_host_scanned = "<target>";
-var slides = {};
-
-fillCommand = function(value){
-    $('command').value = $('command').value.replace(last_host_scanned, value);
-    last_host_scanned = value;
+// ---------------------
+// UmitWeb Object
+// it contains main values for UmitWeb, like scan status, etc.
+
+// prevents UmitWeb to be overriden by other script include call
+if(typeof UmitWeb == "undefined"){
+  var UmitWeb = {
+    nmapOutput: "",
+    scan:{
+      saved: false,
+      locked: false,
+      id: null,
+      object: null
+    },
+    lastTarget: "<target>",
+    inputs:{
+      target: null,
+      command: null,
+      profiles: null,
+      profile_name: null
+    },
+    scanForm: null,
+    resultBox: null
+  }
 }
 
-function clearScanData(){
-    $("ports_table").getElement("tbody").empty();
-    $("hosts_tab").empty();
-    $("scan_details").empty();
-    $("tabber-result").tabber.tabShow(1);
-    $("services_table").getElement("tbody").empty();
-    $("nmap-output").empty();
-}
-
-function toggle(target){
-    var tgDiv = $(target + "-detail")
-    
-    var tgSwitcher = $(target + "-switch")
-    
-    tgDiv.toggleClass("hide");
-
-    if(tgSwitcher.hasClass("sw-collapsed")){
-        tgSwitcher.removeClass("sw-collapsed")
-        tgSwitcher.addClass("sw-expanded")
-    }else{
-        tgSwitcher.removeClass("sw-expanded")
-        tgSwitcher.addClass("sw-collapsed")
-    }  
-}
-
-function getViewportSize(){
-    /*return [window.getScrollWidth, window.getScrollHeight()];*/
-    var size = [0, 0];
-    if (typeof window.innerWidth != 'undefined')
-    {
-     size = [ window.innerWidth, window.innerHeight ];
+(function($){
+  // extend jQuery object.
+  var UmitStyleMethods = {
+    // Style methods
+    active: function(value){ 
+      if(value == null){
+        $(this).hasClass("active");
+      }else if(value == true){
+        $(this).addClass("active");
+      }else{
+        $(this).removeClass("active");
+      }
+    },
+    toggleWith: function(element){
+      $(this).css("display", "block");
+      $(element).css("display", "none");
+    },
+  
+    collapsed: function(){ return $(this).hasClass("sw-collapsed"); },
+    expanded: function(){ return $(this).hasClass("sw-expanded"); },
+  }
+
+  var UmitApplicationManager = {
+    // Umit methods
+    loadProfiles: function(callback){
+      UmitWeb.inputs.profiles = $(this);
+      var url = "/scan/profiles/";
+      var _self = $(this);
+      $.getJSON(url, null, function(data){
+        $.each(data, function(i, item){
+          var opt = $('<option value="' + item[1] + '">' + item[0] + "</option>");
+          _self.append(opt);
+        });
+      
+        if(callback){
+          callback.call(_self, data);
+        }
+      });
+      
+      $(this).change(function(){
+        UmitWeb.inputs.profile_name.val($(this).children("option:selected").text());
+      });
+    },
+  
+    formatOutput: function(){
+      var results = [];
+    
+      var output = $(this).text();
+      if(output.trim().length == 0) return;
+    
+        // Break output into lines
+        var results = output.split("\n").map(function(){
+          if(output.trim().length == 0){
+            return "&nbsp;";
+          }
+          
+          var result = '';
+          var found = false;
+          var txt = this;
+          
+          // Iterate over the highlight regular expressions.
+          $.each(highlights, function(key, value){
+            var this_found = false;
+            var txt_temp = txt;
+            
+            var regex = new RegExp(value);
+            
+            // Go to the next step if we have no replaces do
+            // be made.
+            if(!regex.test(txt_temp)) return;
+            
+            while(regex.test(txt_temp)){
+              this_found = true;
+              found = true;
+              
+              var m = txt_temp.match(regex)[0];
+              
+              // replaces the occurrence with a styled text
+              var replacement = "<span class='scan-" + key + "'>" + m + "</span>";
+              var new_string = txt_temp.replace(m, replacement);
+              result = txt.replace(txt_temp, new_string);
+              
+              // cuts off the string
+              txt_temp = txt_temp.substring(txt_temp.search(regex) +
+                                            txt_temp.match(regex)[0].length);
+              txt = result;
+            }
+            
+            if(this_found) txt = result;
+            
+          });
+          
+          if(!found) result = output; 
+          
+          var brt_match = /([Bb][Rr][Aa][Ss][Ii][Ll]|BRT)/
+          if(brt_match.test(result)){
+            var value = result.match(brt_match)[0];
+            var str_fmt = "<span style='background-color:#00ca30; font-weight: bold'>";
+                        var colors = ["yellow", "blue", "white"];
+                        var x = 0;
+                        var y = 0;
+                        for(x = 0, y = 0; x < value.length; x++, y++){
+                                if(y == colors.length){
+                                        y = 0;
+                                }
+                                str_fmt += "<span style='color:" + colors[y] + "'>"
+                                str_fmt += value.substring(x, x+1)
+                                str_fmt += "</span>"
+                        }
+                        str_fmt += "</span>";
+                        result = result.replace(value, strFmt);
+          }
+          
+          return result;
+        });
+        
+        $(this).html(results.join("<br/>"));
+    },
+  
+    clearScan: function(){
+        $("#ports_table").empty("tbody");
+        $("#hosts_tab").empty();
+        $("#scan_details").empty();
+        $("#tabber-result").tabber.tabShow(1);
+        $("#services_table").empty("tbody");
+        $("#nmap-output").empty();
+    },
+  
+    scanTarget: function(){
+      UmitWeb.inputs.target = $(this);
+      $(this).keyup(function(){
+        var command = UmitWeb.inputs.command;
+        var value = $(this).val();
+        if(value.trim().length == 0) value = "<target>";
+        command.val(command.val().replace(UmitWeb.lastTarget, value));
+        UmitWeb.lastTarget = value;
+      });
+    },
+  
+    scanCommand: function(){
+      UmitWeb.inputs.command = $(this);
+    },
+  
+    scanForm: function(){
+      UmitWeb.scanForm = $(this);
+      $(this).submit(function(){
+        UmitScanner.run();
+        return false;
+      });
+    },
+    
+    scanProfileName: function(){
+      UmitWeb.inputs.profile_name = $(this);
+    },
+    
+    resultBox: function(){
+      UmitWeb.resultBox = $(this);
+    },
+    
+    prepareForScan:function(){
+      if($(this) != UmitWeb.resultBox) return;
+      this.empty().addClass("ajax-loading");
+      alert("prepared for scan!");
     }
-    else if (typeof document.documentElement != 'undefined' &&
-             typeof document.documentElement.clientWidth != 'undefined' &&
-             document.documentElement.clientWidth != 0)
-    {
-     size = [ document.documentElement.clientWidth, document.documentElement.clientHeight ];
-    }
-    else
-    {
-     size = [ document.getElementsByTagName('body')[0].clientWidth,
-              document.getElementsByTagName('body')[0].clientHeight ];
-    }
-   
-    return size;   
-}
-
-function addTableRow(table, row, lineAttrs){
-        var tr = new Element("tr");
-        if(lineAttrs){
-                for(var attr in lineAttrs){
-                    tr[attr] = lineAttrs[attr];
-                }
-        }
-        for(var i = 0; i < row.length; i++){
-                var td = new Element("td")
-                if($type(row[i]) == "string"){
-                    td.setHTML(row[i]);
-                }else if($type(row[i]) == "element"){
-                    td.adopt(row[i]);
-                }else{
-            for(var attr in row[i].attrs){
-                td[attr] = row[i].attrs[attr]
-            }
-            if($type(row[i].value) == "string"){
-                td.setHTML(row[i].value);
-            }else{
-                td.adopt(row[i].value);
-            }
-                }
-                tr.adopt(td)
-        }
-        table.adopt(tr)
-    return tr;
-}
-
-function showError(req, target){
-        var messages = {
-                403: {"title": "Access Denied",
-                      "description": "Your access has been " +
-                                "denied when you tried to " +
-                                "request this page.<br/>" +
-                                "Check with you system " +
-                                "administrator if you have " +
-                                "access to access this page."}
-        }
-        var div = new Element("div", {'class': "error"})
-        if(messages[req.status]){
-                div.setHTML(messages[req.status]["description"]);
-                var header = new Element("h3", {styles: {"display": "block", "color": "red"}});
-                header.setText(messages[req.status]['title']);
-                $(target).empty().adopt(div);
-                header.injectBefore(div);
-        }else{
-                var regexp = /.*Message:((.*[\r]?[\n]?)*)/g
-                var txt = req.responseText.match(regexp)[0]
-                //txt = req.responseText
-                var header = new Element("h3", {styles: {"display": "block", "color": "red"}});
-                header.setText("Response Code:" + req.status)
-                $(target).empty().adopt(div);
-                header.injectBefore(div);
-                div.setHTML(txt);
-        }
-}
-
-function removeCommand(value){
-        commandLine = $("divCommandConstructor");
-        var oldValue = commandLine.value;
-        var regex = new RegExp(value.replace(" ", "[ ]+").replace("%s", "[^ ^$]*"));
-        
-        if(oldValue.match(regex)){
-                commandLine.value = oldValue.replace(regex, "");
-        }
-        commandLine.value = commandLine.value.trim();
-}
-
-function updateProfiles(){
-    new Json.Remote("/scan/profiles/", {onComplete: function(result){
-        $("profiles").empty();
-                for(var i = 0; i < result.length; i++){
-                        var opt = new Element("option", {"value": result[i][1]})
-                        opt.setText(result[i][0]);
-                        $("profiles").adopt(opt);
-                }
-                var cmd = $("profiles").options[0].value;
-                if($("target").value != ""){
-                        cmd = cmd.replace("<target>", $("target").value);
-                }
-                $("command").value = cmd;
-        }}).send();
-}
-
-function emptyTBody(tbody){
-    for(var i = 0; i < tbody.rows.length; i++){
-        tbody.deleteRow(0);
-    }
-}
-
-window.addEvent("domready", function(){
-    var size = getViewportSize();
-    $$("div[class='tab-placeholder']").each(function(div){
-            div.style.height = (size[1]-271) + "px";
+  }
+
+  $.fn.extend(UmitStyleMethods);
+  $.fn.extend(UmitApplicationManager);
+  $.expander = function(selectors){
+    $(selectors).live("click", function(){
+      var target = $("#" + $(this).attr("id") + "-detail");
+    
+      var source = $(this);
+    
+      target.toggleClass("hide");
+    
+      if(source.collapsed()){
+        source.removeClass("sw-collapsed").addClass("sw-expanded");
+      }else{
+        source.removeClass("sw-expanded").addClass("sw-collapsed");
+      }
     });
-        
-    if($defined($("hosts")))
-            $("hosts").style.height = (size[1]-220) + "px";
-    if($defined($("services")))
-            $("services").style.height = (size[1]-220) + "px";
-        
-    if($defined($("body"))){
-            $("body").setStyle("width", (size[0]) + "px");
-        $("umit-title").setStyle("width", size[0]-60 + "px");
-    }
-    if($defined($("footer")))
-       $("footer").injectInside($("body"));
-    if($defined($("nmap-output"))){
-        $("nmap-output").style.height = size[1]-320 + "px";
-    }
-});
+  }
+})(jQuery);

branch/umitweb-ng/share/umit/umitweb_media/js/index.js

@@ +1 @@
+/*
 var varData = "";
 
@@ -54 +55 @@
         rs.run();
 }
+*/
 
-window.addEvent("domready", function(){
-    if($defined($("frmScan"))){
-        $("frmScan").addEvent("submit", runScan);
-        
-            $("toggleHosts").addEvent("click", function(e){
-                    if(!this.hasClass("active")){
-                    var ts = $("toggleServices");
-                    this.addClass("active");
-                    ts.removeClass("active");
-                    $("hosts").setStyle("display", "block");
-                    $("services").setStyle("display", "none");
-                }
-                new Event(e).stop();
-        });
-        
-            $("toggleServices").addEvent("click", function(e){
-            if(!this.hasClass("active")){
-                    var th = $("toggleHosts");
-                    this.addClass("active");
-                    th.removeClass("active");
-                    $("hosts").setStyle("display", "none");
-                    $("services").setStyle("display", "block");
-                }
-                new Event(e).stop();
-        });
-
-        $("toggleHosts").addClass("active");
-        $("services").setStyle("display", "none");
-        
-        updateProfiles();
-        
-            $("profiles").addEvent("change", function(event){
-                var cmd = this.options[this.selectedIndex].value;
-                if($("target").value != ""){
-                        cmd = cmd.replace("<target>", $("target").value);
-                }
-                $("command").value = cmd;
-                new Event(event).stop();
-        });
-        $("divSpinner").addClass("hide");
-        $("body").removeClass("hide");
+$(function(){
+  $("#frmScan").scanForm(); 
+  $("#target").scanTarget();
+  $("#command").scanCommand();
+  $("#result_window").resultBox();
+  $("#profile_name").scanProfileName();
+  $("#profiles").loadProfiles(function(data){
+    var cmd = $(this).children("option:first").val();
+    if(UmitWeb.inputs.target.val().length > 0){
+      cmd = cmd.replace("<target>", UmitWeb.inputs.target.val());
     }
-
-   $("highlight_out").addEvent("change", function(e){
-            new Event(e).stop();
-        if(!nmapOutput || nmapOutput.trim().length == 0){ return }
-        if(this.checked){
-                $("nmap-output").setHTML(formatNmapOutput(nmapOutput));
-        }else{
-                $("nmap-output").setText(nmapOutput);
-        }
-   });
+    
+    $("#command").val(cmd);
+  });
+  
+  $("#toggleHosts").click("click", function(){
+    if($(this).active()) return false;
+    
+    $(this).active(true);
+    $("#toggleServices").active(false);
+    $("#hosts").toggleWith("#services");
+    return false;
+  });
+  
+  $("#toggleServices").click(function(){
+    if($(this).active()) return false;
+    $(this).active(true);
+    
+    $("#toggleHosts").active(false);
+    $("#services").toggleWith("#hosts");
+    return false;
+  });
+  
+  $("#toggleHosts").active(true);
+  $("#hosts").toggleWith("#services");
+  
+  $("#profiles").change(function(){
+    var cmd = $(this).children("option:selected").val();
+    if($("#target")[0] != undefined && $("#target")[0].value.length > 0){
+      cmd = cmd.replace("<target>", $("#target").val());
+    }
+    $("#command").val(cmd);
+    return false;
+  });
+  
+  $("#divSpinner").fadeOut(1000, function(){$("#body").fadeIn(500)});
+  
+  $("#highlight_out").change(function(){
+    if(nmapOutput.trim().length == 0) return;
+    $("#nmap-output").text(nmapOutput);
+    if(this.checked) $("#nmap-output").formatScanOutput();
+  });
+  
+  $.expander(".sw-expanded, .sw-collapsed");
 });

branch/umitweb-ng/share/umit/umitweb_media/js/scan.js

@@ -1 @@
-var h;
+var UmitScanner = new Object();
 
-function loadHosts(html){
-  $("hosts").setHTML(html);
-  attachHostsEvents();
+UmitScanner.run = function(){
+  send = true;
+  if(!UmitWeb.scan.saved && UmitWeb.scan.id){
+    var text = "The given scan has unsaved changes!\n" +
+               "If you want to continue, click 'OK'.\n" +
+               "WARNING: all unsaved data will be lost.";
+    if(!confirm(text)) send = false;
+  }
+  
+  if(!send) return;
+  
+  var resultBox = UmitWeb.resultBox;
+  if(!resultBox) return;
+  
+  resultBox.prepareForScan();
+  
+  this.post();
 }
 
-function loadServices(html){
-  $("services").setHTML(html);
-  attachServiceEvents();
+UmitScanner.prepareForScan = function(){
+  var rb = UmitWeb.resultBox;
+  rb.children("#nmap-output").empty().addClass("ajax-loading");
+  var loading_line = $("<tr><td><img src='/media/images/spinner.gif'/></td>" + 
+                     "<td>Running...</td></tr>");
+  rb.children("#hosts_table").children("tbody").empty().append(loading_line);
+  
+  rb.children("#hosts_tab").empty();
+  rb.children("#scan_details").empty();
+  rb.children("#tabber-result").tabber.tabShow(1);
+  rb.children("#ports_table").children("tbody").empty();
+  rb.children("#services_table").children("tbody").empty();
 }
 
-function attachHostsEvents(){
-  $("hosts").getElements("a").each(function(lnk){
-    lnk.addEvent("click", function(e){
-      var event = new Event(e);
-      selectHost(this.getAttribute("href"));
-      event.stop();
-      return false;
-    });
+UmitScanner.post = function(){
+  var _self = this;
+  $.post("/scan/", UmitWeb.scanForm.serialize(), function(data, textStatus){ 
+    _self.formPosted(data, textStatus)
+  }, "json");
+}
+
+var _e = "hey";
+UmitScanner.formPosted = function(data, textStatus){
+  _e = this;
+  if(data.result == "OK"){
+    this.checkStatus(data.id);
+  }
+}
+
+// TODO: implement failure http
+UmitScanner.checkStatus = function(id){
+  var url = "/scan/" + id + "/check/";
+  var _self = this;
+  $.getJSON(url, function(data, textStatus){
+    if(data.result != "OK"){
+      _self.showErrorMessage(data.status);
+      return;
+    }
+    
+    if(data.status == "FINISHED"){
+      _self.loadResult(id, data);
+    }else if(result.status == "RUNNING"){
+      UmitWeb.nmapOutput = data.output.text;
+      UmitWeb.resultBox.text(UmitWeb.nmapOutput).formatOutput();
+      setTimeout(function(){_self.checkStatus(id)}, 1000);
+    }
+    
+    UmitWeb.scan.locked = false;
   });
 }
 
-function attachServiceEvents(){
-  $("services").getElements("a").each(function(lnk){
-    lnk.addEvent("click", function(e){
-      var event = new Event(e);
-      try{selectService(this.getAttribute("href"));}catch(e){alert(e)}
-      event.stop();
-      return false;
-    })
+UmitScanner.showErrorMessage = function(text){
+  UmitWeb.resultBox.addClass("ajax-error").text(text);
+}
+
+UmitScanner.loadResult = function(id, data){
+  UmitWeb.resultBox.removeClass("ajax-loading");
+  UmitWeb.resultBox.text(data.output.plain).formatOutput();
+  UmitWeb.scan.id = id;
+  UmitWeb.scan.object = data;
+  this.renderResponse();
+}
+
+UmitScanner.renderResponse = function(){
+  var tabs = UmitWeb.scan.object.output.tabs;
+  this.loadHosts(tabs.hosts);
+  this.loadServices(tabs.services);
+  
+  $("#ports_table_placeholder").html(tabs.ports); // ports tab
+  $("#hosts_tab").html(tabs.host_details);        // host details tab
+  $("#scan_details").html(tabs.scan_info);        // scan info tab
+  try{this.selectHost(0);}catch(e){}              // Select the first host
+  UmitWeb.scan.saved = false;
+}
+
+UmitScanner.loadHosts = function(html){
+  $("#hosts").html(html);
+  var _self = this;
+  $("#hosts").children("a").click(function(){
+    _self.selectHost(parseInt($(this).attr("href")));
+    return false;
   });
 }
 
-function selectHost(index){
-  index = parseInt(index);
-  $("ports_table_placeholder").setStyle("display", "block");
-  $("hosts_s_table_placeholder").setStyle("display", "none");
+UmitScanner.loadServices = function(html){
+  $("#services").html(html);
+  var _self = this;
+  $("#services").children("a").click(function(){
+    _self.selectService(parseInt($(this).attr("href")));
+    return false;
+  });
+}
 
+UmitScanner.selectHost = function(id){
+  $("#ports_table_placeholder").toggleWith("#hosts_s_table_placeholder");
+  
   // TODO: implement Ctrl/Command and Shift key modifiers
+  if(!$("#host-" + id)) return;
   
-  if(!$defined($("host-" + index))) return;
   // cleanup previously selected items
-  $("hosts_table").getElements("tr").removeClass("selected");
-  $("host-" + index).toggleClass("selected");
+  $("#hosts_table").children("tr").removeClass("selected");
+  $("#host-" + id).toggleClass("selected");
   
   // Show the message that tells to select a host, while we are rendering
   // the screen details.
-  $("none-host-detail-selected").removeClass("hide");
-  $("none-host-selected").removeClass("hide");
+  $("#none-host-detail-selected, #none-host-selected").removeClass("hide");
   
   // Show hosts tab
-  $("hosts_tab").getElements(".host_detail_tab_element").addClass("hide");
-  $$(".ports-table, .services-table, #none-host-selected").addClass("hide");
-  $("host" + index + "-detail").removeClass("hide");  
+  $("#hosts_tab").children(".host_detail_tab_element").addClass("hide");
+  $("#host" + id + "-detail").removeClass("hide");  
   
   // Show ports/services tab
-  $("ports_table_placeholder").getElements(".ports-table").addClass("hide");
-  $("host-" + index + "-ports-div").removeClass("hide");
+  $("#ports_table_placeholder").children(".ports-table").addClass("hide");
+  $("#host-" + id + "-ports-div").removeClass("hide");
 
   // Hide the message that tells to select a host
-  $("none-host-selected").addClass("hide");
-  $("none-host-detail-selected").addClass("hide");
+  $("#none-host-selected, #none-host-detail-selected, .ports-table, .services-table").addClass("hide");
+  return false;
 }
 
-function selectService(service_id){
-
+UmitScanner.selectService = function(id){
   // TODO: implement Ctrl / Shift behavior
   
-  $("services_table").getElement("tBody").getElements("tr").each(function(el){
-    el.removeClass("selected");
-  });
-
-  $("service-" + service_id).toggleClass("selected");
+  $("#services_table").children("tr").removeClass("selected");
+  $("#service-" + id).toggleClass("selected");
   
   // hide other port tables
-  $$(".ports-table, .services-table, #none-host-selected").addClass("hide");
+  $(".ports-table, .services-table, #none-host-selected").addClass("hide");
   
   // show this table
-  $("service-" + service_id + "-services-div").removeClass("hide");
+  $("#service-" + id + "-services-div").removeClass("hide");
 
   return false;
 }
-
-function loadPortsTab(html){ $("ports_table_placeholder").setHTML(html); }
-
-function loadHostsTab(html){ $("hosts_tab").setHTML(html); }
-
-function loadScanInfo(html){ $("scan_details").setHTML(html); }
-
-var _e;
-function loadScanData(scan){
-  var tabs = scan.output.tabs;
-  loadHosts(tabs.hosts);
-  loadServices(tabs.services);
-  loadPortsTab(tabs.ports);
-  loadHostsTab(tabs.host_details);
-  loadScanInfo(tabs.scan_info);
-  try{selectHost(0);}catch(e){}
-  saved = false;
-}
-
-function checkScanStatus(scanID){
-    checkUrl = "/scan/" + scanID + "/check/"
-    new Json.Remote(checkUrl, {onComplete: function(result){
-        if(result.result == "OK"){
-            resultBox = $("nmap-output");
-            if(result.status == "FINISHED"){
-              resultBox.removeClass("ajax-loading");
-              nmapOutput = result.output.plain;
-              if(!$("highlight_out").checked){
-                resultBox.setText(nmapOutput)
-              }else{
-                resultBox.setHTML(formatNmapOutput(nmapOutput))
-              }
-              scanId = scanID
-              varData = result.output.full
-              loadScanData(result)
-            }else if(result.status == "RUNNING"){
-              setTimeout("checkScanStatus('" + scanID + "')", 1000)
-              nmapOutput = result.output.text
-              if(!$("highlight_out").checked){
-                resultBox.empty().setText(nmapOutput)
-              }else{
-                resultBox.empty().setHTML(formatNmapOutput(nmapOutput))
-              }
-            }
-        }else{
-            resultBox.addClass("ajax-error").setText(result.status);
-        }
-        scanLock = false;
-            },
-            onFailure: function(req){
-              $("nmap-output").removeClass("ajax-loading");
-              emptyTBody($("hosts_table").getElement("tbody"));
-              
-        if(req.status == 200){
-          $("nmap-output").setHTML(req.responseText);
-        }else{
-          showError(req, $("nmap-output").empty())
-        }
-        scanLock = false;
-            }
-            }).send();
-}
-
-function runScan(e){
-  e = new Event(e);
-  isToBeSent = true;
-  if(saved == false && scanId != null){
-    text = "The given scan has unsaved changes!\n" +
-      "If you want to continue, click 'OK'.\n" +
-      "WARNING: all unsaved data will be lost.";
-    if(!confirm(text)){
-      isToBeSent = false;
-    }
-  }
-  
-  if(isToBeSent){
-    scanEvent = e;
-    result_box = $("nmap-output");
-    result_box.empty().addClass("ajax-loading");
-    tbHosts = $("hosts_table").getElement("tbody");
-    emptyTBody(tbHosts);
-    tr = new Element("tr");
-    td1 = new Element("td");
-    td1.adopt(new Element("img", {'src': '/media/images/spinner.gif'}));
-    tr.adopt(td1);
-    td2 = new Element("td");
-    td2.setText("Running...");
-    tr.adopt(td2);
-    tbHosts.adopt(tr);
-    //tr2 = tr.cloneNode();
-    
-    emptyTBody($("ports_table").getElement("tbody"));
-    $("hosts_tab").empty();
-    $("scan_details").empty();
-    $("tabber-result").tabber.tabShow(1);
-    emptyTBody($("services_table").getElement("tbody"));
-    var txtContent = $("profiles")[$("profiles").selectedIndex].textContent;
-    $("profile_name").value = txtContent;
-  
-    args = {
-      target: $("target").value,
-      command: $("command").value,
-      profile: $("profiles")[$("profiles").selectedIndex].value,
-      profile_name: $("profiles")[$("profiles").selectedIndex].textContent
-    }
-    
-    reqObj = new XHR("post");
-    reqObj.send("/scan/", Object.toQueryString(args));
-    checkIfFinished();
-  }
-  e.stop();
-}
-var reqObj = null;
-function checkIfFinished(){
-  response = null;
-  try{
-    eval("response = " + reqObj.transport.responseText);
-    reqObj.cancel();
-    checkScanStatus(response.id);
-  }catch(e){
-    setTimeout("checkIfFinished()", 1000);
-  }
-}

branch/umitweb-ng/umit/web/Urls.py

@@ -67 +67 @@
     (r'^media/js/output_highlight.js$', 'umit.web.views.main.output_highlight'),
     (r'^media/js/diff_colors.js$', 'umit.web.views.compare_results.diff_colors'),
+    (r'^media/css/output_highlight.css$', 'umit.web.views.main.output_highlight_css'),
     (r'^media/(?P<path>.*)$', 'umit.web.views.main.serve_media'),
     (r'^docs/(?P<path>.*)$', 'umit.web.views.main.serve_docs')

branch/umitweb-ng/umit/web/views/main.py

@@ -29 +29 @@
 from umit.web.WebPaths import WPath as Path
 from umit.web.Security import Context
+from umit.web import simplejson as json
 import mimetypes
 
@@ -44 +45 @@
 @authenticate(ERROR)
 def output_highlight(req):
+    """Generates automatically a Javascript file containing the
+    regular expression definitions for scan highlights.
+    """
     response = HttpResponse()
     response['Content-type'] = "text/javascript; charset=utf-8"
@@ -49 +53 @@
     attrDic = {}
 
-    response.write("highlights = {};\n")
+    out = {}
     for attr in ["closed_port", "date", "details", "filtered_port",
                  "hostname", "ip", "open_port", "port_list"]:
         attribute = getattr(highlight, attr)
-        response.write("highlights['%s'] = {};\n" % attr)
-        for index, value in enumerate(['bold', 'italic', 'underline', 'text', 'highlight', 'regex']):
-            if type(attribute[index]) == ListType:
-                propValue = "#%s%s%s" % tuple(map(lambda value: "%0.2x" % floor(sqrt(value)), attribute[index]))
-            elif type(attribute[index]) == StringType:
-                propValue = attribute[index].replace("\\", "\\\\")
-            else:
-                propValue = attribute[index]
-            response.write("highlights['%s']['%s'] = '%s';\n" % (attr, value, propValue))
+        out[attr] = attribute[-1]
+    response.write("var highlights = " + json.dumps(out))
+    return response
+
+@authenticate(ERROR)
+def output_highlight_css(req):
+    """Generates automatically a CSS file containing the style
+    definitions for scan highlight.
+    """
+    response = HttpResponse()
+    response['Content-type'] = "text/css; charset=utf-8"
+    highlights = JsOutputHighlight()
+    for attr in ["closed_port", "date", "details", "filtered_port",
+                 "hostname", "ip", "open_port", "port_list"]:
+        attribute = getattr(highlights, attr)
+        response.write(".scan-%s{" % attr)
+        
+        color = "#%s%s%s" % tuple(map(lambda value: "%0.2x" % floor(sqrt(value)), attribute[3]))
+        response.write("color: %s; " % color)
+        
+        bgcolor = "#%s%s%s" % tuple(map(lambda value: "%0.2x" % floor(sqrt(value)), attribute[4]))
+        response.write("background-color: %s; " % bgcolor)
+        
+        # bold
+        if attribute[0]:
+            response.write("font-weight: bold; ");
+        # italic
+        if attribute[1]:
+            response.write("font-style: italic; ");
+        # underline
+        if attribute[2]:
+            response.write("text-decoration: underline; ");
+        response.write("}\n")
     return response