arachni 0.3 → 0.4

data/lib/{ui → arachni/ui}/web/server/views/instance.erb

@@ -2,7 +2,7 @@
         <div id="page-intro">
             <h2 id="page_header">Attached to instance @<%=remove_proto( params['url'] )%></h2>
             <p id="page_description">
-                This page allows you to see what's going on at the other end of the wire (i.e. get status messages directly from the remote scanner).
+                This page allows you to see what's going on at the other end of the wire -- i.e. get progress information directly from the scanner Instance(s).
                 <br/>
                 <br/>
             </p>
@@ -36,29 +36,34 @@
         <%= erb :flash, {:layout => false} %>
 
         <div id="scan_data">
-            <h3>Scan statisics</h3>
             <div class="left">
+                <h3>Scan statisics</h3>
                 <ul>
                     <li>Pages discovered: <span id="crawled">0</span></li>
                     <li>Progress: <span id="percentage">0</span>%</li>
+                    <li>Est. remaining time: <span id="eta">--:--:--</span></li>
+                    <li>Requests/second: <span id="avg">0</span></li>
                     <li>Runtime: <span id="runtime">00:00:00</span></li>
-                </ul>
-            </div>
-            <div>
-                <ul>
                     <li>Current max concurrency: <span id="max_concurrency">0</span> requests</li>
-                    <li>Average response time: <span id="average_res_time">0</span> ms</li>
+                    <li>Average response time: <span id="average_res_time">0</span>s</li>
                     <li>Timed-out requests: <span id="time_out_count">0</span></li>
-                    <li>Current page: <span id="current_page">0</span></li>
+
                 </ul>
+            </div>
 
+            <div class="right">
+                <h3>Instances</h3>
+                <div style="height: 245px; overflow-y: scroll" id="currently_auditing">
+                </div>
             </div>
 
-            <p><em>
-                (Due to the fact that Arachni discovers pages using 2 complementary systems (the Spider and the Trainer)
-                you may see some backwards progress or other weird progress behavior.)
-            </em></p>
-            <div id="progressbar"></div>
+            <div>
+                <p><em>
+                    (Due to the fact that Arachni discovers pages using 2 complementary systems (the Spider and the Trainer)
+                    you may see some backwards progress or other weird progress behavior.)
+                </em></p>
+                <div id="progressbar"></div>
+            </div>
 
             <div class="left">
                 <h3>Scanner output:</h3>
@@ -70,21 +75,7 @@
                 <div class="output" id="output_results"></div>
             </div>
 
-            <div style="display: none" id="dialog-loading" title="Loading the scan report...">
-                <p>
-                    Please wait while the scan report is being loaded. <br/>
-                    This process maybe take a while depending on the size of the report.
-                </p>
-                <p>
-                    <em>
-                        If the loading process takes an unusually long time the zombie reaper
-                        may have beaten you to it.<br/>
-                        Use the "Reports" tab to view the report.
-                    </em>
-                </p>
-            </div>
-
-            <div style="display: none" id="dialog-shutdown" title="The scanner has been shutdown...">
+            <div style="display: none" id="dialog-shutdown" title="Instance has been shutdown...">
                 <p>
                     The report is waiting for you <a href="/reports">here</a>.
                 </p>
@@ -121,59 +112,59 @@
                     if( stats == undefined ){ return }
 
                     document.getElementById( 'crawled' ).innerHTML = stats.sitemap_size;
-                    document.getElementById( 'current_page' ).innerHTML = stats.current_page;
                     document.getElementById( 'average_res_time' ).innerHTML = stats.average_res_time;
+                    document.getElementById( 'avg' ).innerHTML = stats.avg;
                     document.getElementById( 'time_out_count' ).innerHTML = stats.time_out_count;
                     document.getElementById( 'max_concurrency' ).innerHTML = stats.max_concurrency;
 
                     document.getElementById( 'runtime' ).innerHTML = stats.time;
-                    document.getElementById( 'percentage' ).innerHTML = parseInt( stats.progress );
-                }
+                    document.getElementById( 'eta' ).innerHTML = stats.eta;
+                    document.getElementById( 'percentage' ).innerHTML = stats.progress;
+
+                    elem = document.getElementById( 'currently_auditing');
+                    elem.innerHTML = '';
+                    for( i in stats.instances ) {
+
+                        elem.innerHTML += '<strong>' + stats.instances[i].url +
+                        ' - ' + stats.instances[i].progress + '%' +
+                        ' - Est. remaining time: ' + stats.instances[i].eta + '</strong> <br/>';
+
+                        status = stats.instances[i].status
+                        if( status == 'busy' ) {
+                            page = stats.instances[i].current_page;
+
+                            elem.innerHTML += 'Currently auditing: ' + '<a href="' +
+                            page + '">' + page + '</a>';
+                        } else {
+                            elem.innerHTML += status.charAt(0).toUpperCase() + status.slice(1);
+                        }
+
+                        elem.innerHTML += '<div style="height:20px" id="progressbar_' + i + '"></div> <br/>';
+
+                        $( "#progressbar_" + i ).progressbar({
+                            value: stats.instances[i].progress
+                        });
+
+                    }
 
-                function updateProgressBar(){
-                    var stats_url = "/instance/<%= escape( params['url'].to_s ) %>/stats.json";
-                    $.getJSON( stats_url, function(data) {
-                        if( data.stats == undefined ){ return }
-                        setStats( data.stats );
-                        setProgressBar( parseInt( data.stats.progress ) );
-                    });
                 }
 
                 function updateOutput() {
-                    if( !document.getElementById( 'output' ) ) return;
-
                     var output_url = "/instance/<%= escape( params['url'].to_s ) %>/output.json";
                     $.getJSON( output_url, function(data) {
 
                         if( data.status == 'finished' ){
                             showShutdownDialog( );
                         } else {
-                            if( data.report == undefined ) {
-                                document.getElementById( 'output' ).innerHTML = data.data;
-                            } else {
-                                showReportLoadingDialog();
-                                showReport( data.report );
-                                $( "#dialog-loading" ).dialog('close')
-                            }
-                        }
 
-                    });
-                }
+                            document.getElementById( 'output' ).innerHTML = data.messages.data;
+                            document.getElementById( 'output_results' ).innerHTML = data.issues.data;
 
-                function updateResults() {
-                    if( !document.getElementById( 'output_results' ) ) return;
-
-                    var output_results_url = "/instance/<%= escape( params['url'].to_s ) %>/output_results.json";
-                    $.getJSON( output_results_url, function(data) {
-                        document.getElementById( 'output_results' ).innerHTML = data.data;
-                    });
-                }
-
-                function showReportLoadingDialog( ) {
-                    $( "#dialog-loading" ).dialog({
-                        height: 200,
-                        width: 720,
-                        modal: true
+                            if( data.stats.avg != undefined ){
+                                setStats( data.stats );
+                                setProgressBar( parseInt( data.stats.progress ) );
+                            }
+                        }
                     });
                 }
 
@@ -189,20 +180,9 @@
 
                     setProgressBar( 0 );
 
-                    updateProgressBar();
-                    setInterval( function() {
-                        updateProgressBar();
-                    }, 3000 );
-
                     updateOutput( );
                     setInterval( function() {
                           updateOutput( );
-                    }, 1500 );
-
-
-                    updateResults( )
-                    setInterval( function() {
-                          updateResults( );
                     }, 5000 );
 
                 })

data/lib/arachni/ui/web/server/views/js/home.erb

@@ -0,0 +1,32 @@
+
+        <script type="text/javascript">
+            function updateHpgVisibility(){
+                <% hpg= {}; stats.each do |k, v| hpg[k] = !v['neighbours'].empty? end %>
+                hpg = <%=hpg.to_json%>;
+
+                if( !hpg[ $("#dispatcher option:selected").val() ] ) {
+                    $('.hpg').hide();
+                    $('.hpg_options').hide();
+                } else {
+                    $('.hpg').show();
+                }
+            }
+
+            function updateHpgOptionsVisibility(){
+                if( !$("#high_performance_checkbox").is(':checked') ) {
+                    $('.hpg_options').hide();
+                } else {
+                    $('.hpg_options').show();
+                }
+            }
+
+            updateHpgOptionsVisibility();
+            $('#high_performance_checkbox').change(function () {
+                updateHpgOptionsVisibility();
+            });
+
+            updateHpgVisibility();
+            $('#dispatcher').change(function () {
+                updateHpgVisibility();
+            });
+        </script>

data/lib/{ui → arachni/ui}/web/server/views/layout.erb

@@ -77,10 +77,10 @@
             <div class="footer-box">
                 <h4>Help</h4>
                 <ul>
+                  <li><a href="https://github.com/Zapotek/arachni/wiki/Web-user-interface">WebUI User Guide</a></li>
                   <li><a href="http://github.com/Zapotek/arachni/wiki">Wiki</a></li>
                   <li><a href="http://groups.google.com/group/arachni">Google Group</a></li>
                   <li><a href="https://github.com/Zapotek/arachni/issues">Found a bug?</a></li>
-                  <li><a href="http://zapotek.github.com/arachni/">API documentation</a></li>
 
                 </ul>
             </div>
@@ -101,7 +101,7 @@
             <div class="clear"></div>
         </div>
         <div id="footer-links">
-            <p>&copy; <a href="mailto:tasos.laskos@gmail.com">Tasos "Zapotek" Laskos</a> 2011 <a href="http://www.spyka.net"></a></p>
+            <p>&copy; <a href="mailto:tasos.laskos@gmail.com">Tasos "Zapotek" Laskos</a> 2011-2012 <a href="http://www.spyka.net"></a></p>
         </div>
     </div>
 </body>

data/lib/arachni/ui/web/server/views/module.erb

@@ -0,0 +1,30 @@
+
+                        <h4>
+                            <input type="checkbox" class="<%=class_name%>" name="modules[<%=mod['mod_name']%>]"
+                                <% if session['opts']['modules'] && ( session['opts']['modules'][0] == '*' || session['opts']['modules'].include?( mod['mod_name'] ) ) %> checked="checked" <% end %> />
+                                <%=escape( mod['name'] )%>
+                        </h4>
+                        <pre class="notice"> <%=prep_description( escape( mod['description'] ) )%></pre>
+                        <p>
+                            <% if mod['references'] && !mod['references'].empty? %>
+                                <strong>References:</strong>
+                                <% mod['references'].each.with_index do |item, i| %>
+                                    <a href="<%=item[1]%>"><%= escape( item[0] ) %> </a>
+                                    <%if mod['references'].size !=  i+1%>
+                                    ,
+                                    <%end%>
+                                <%end%>
+                                <br/>
+                            <%end%>
+
+                            <% if mod['elements'] && !mod['elements'].empty? %>
+                                <strong>Elements:</strong> <%= mod['elements'].join( ', ' ) %><br/>
+                            <%end%>
+
+                            <% if mod['issue'] && mod['issue']['tags'] && !mod['issue']['tags'].empty? %>
+                                <strong>Tags:</strong> <%= mod['issue']['tags'].join( ', ' ) %><br/>
+                            <%end%>
+
+                            <strong>Version:</strong> <%=mod['version']%><br/>
+                            <strong>Author:</strong> <%=escape( mod['author'].join( ", " ))%>
+                        </p>

data/lib/{ui → arachni/ui}/web/server/views/modules.erb

@@ -27,17 +27,7 @@
 
                     <% modules.each do |mod|%>
                     <% next if mod['path'] =~ /recon/ %>
-                        <h4>
-                            <input type="checkbox" class="audit" name="modules[<%=mod['mod_name']%>]"
-                                <% if session['opts']['modules'] && ( session['opts']['modules'][0] == '*' || session['opts']['modules'].include?( mod['mod_name'] ) ) %> checked="checked" <% end %> />
-                                <%=escape( mod['name'] )%>
-                        </h4>
-                        <pre class="notice"> <%=prep_description( escape( mod['description'] ) )%></pre>
-                        <p>
-                            <strong>Version:</strong> <%=mod['version']%><br/>
-                            <strong>Author:</strong> <%=escape( mod['author'])%>
-                        </p>
-
+                    <%= erb :module, { :layout => false }, :mod => mod, :class_name => 'audit' %>
                     <% end %>
                 </fieldset>
             </div>
@@ -53,19 +43,9 @@
 
                     <% modules.each do |mod|%>
                     <% next if mod['path'] =~ /audit/ %>
-                        <h4>
-                            <input type="checkbox" class="recon" name="modules[<%=mod['mod_name']%>]"
-                                <% if session['opts']['modules'] && ( session['opts']['modules'][0] == '*' || session['opts']['modules'].include?( mod['mod_name'] ) ) %> checked="checked" <% end %> />
-                                <%=escape( mod['name'] )%>
-                        </h4>
-                        <pre class="notice"> <%=prep_description( escape( mod['description'] ) )%></pre>
-                        <p>
-                            <strong>Version:</strong> <%=mod['version']%><br/>
-                            <strong>Author:</strong> <%=escape( mod['author'])%>
-                        </p>
+                    <%= erb :module, { :layout => false }, :mod => mod, :class_name => 'recon' %>
                     <% end %>
                 </fieldset>
             </div>
 
-
         </form>

data/lib/{ui → arachni/ui}/web/server/views/output_results.erb

@@ -17,7 +17,7 @@
                      at <a href="<%= issue.url %>"><%= issue.url %></a>.
                      <br/>
 
-                 <% if (issue.variations[0]['response'] && !issue.variations[0]['response'].empty?) && issue.variations[0]['regexp_match'] %>
+                 <% if (issue.variations[0] && issue.variations[0]['response'] && !issue.variations[0]['response'].empty?) && issue.variations[0]['regexp_match'] %>
 
                  <div style="display: none" id="inspection-dialog_<%=i%>" title="Relevant content is shown in red.">
                      <% match = CGI.escapeHTML( issue.variations[0]['regexp_match'] )%>
@@ -28,9 +28,6 @@
                      <input onclick="javascript:inspect( '#inspection-dialog_<%=i%>')" type="button" value="Inspect" />
                  </form>
 
-                 <%end%>
-
-
                  <% if issue.method && (issue.elem.downcase == 'form' || issue.elem.downcase == 'link' ) &&
                        ( issue.method.downcase == 'get' || issue.method.downcase == 'post' ) %>
                     <form style="display:inline" action="<%=issue.variations[0]['url']%>" target="_blank" method="<%=issue.method.downcase%>">
@@ -43,6 +40,9 @@
                     </form>
                  <%end%>
 
+
+                 <%end%>
+
             </p>
             <%end%>
 

data/lib/{ui → arachni/ui}/web/server/views/plugins.erb

@@ -18,25 +18,36 @@
 
             <%= erb :flash, {:layout => false} %>
             <% plugins.each do |plugin|%>
-                <fieldset>
-                    <legend>
-                        <input <%if plugin_has_required_file_option?( plugin['options'] )%> disabled="disabled" <%end%> type="checkbox" class="plugin" name="plugins[<%=plugin['plug_name']%>]"
-                        <% if session['opts']['plugins'] && session['opts']['plugins'].include?( plugin['plug_name'] ) %> checked="checked" <% end %> />
-                        <%=plugin['name']%>
-                        <%if plugin_has_required_file_option?( plugin['options'] )%>
+                <h3>
+                    <input <%if plugin_has_required_file_option?( plugin['options'] )%>
+                        disabled="disabled" <%end%> type="checkbox"
+                        class="plugin" name="plugins[<%=plugin['plug_name']%>]"
+
+                        <% if session['opts']['plugins'] &&
+                              session['opts']['plugins'].include?( plugin['plug_name'] ) %>
+                              checked="checked"
+                      <% end %>
+                    />
+
+                    <%=plugin['name']%>
+
+                    <%if plugin_has_required_file_option?( plugin['options'] )%>
                         <em> (This plugin requires an option type which is not yet supported by the WebUI)</em>
-                        <%end%>
-                    </legend>
-                <h5>Description</h5>
+                    <%end%>
+                </h3>
+                <h4>Description</h4>
                 <pre class="notice"> <%=prep_description( escape( plugin['description'] ) )%></pre>
 
-                <%= erb :options, { :layout => false }, :component => plugin, :session_options => session_options%>
+                <% if plugin['tags'] && !plugin['tags'].empty? %>
+                    <strong>Tags:</strong> <%= plugin['tags'].join( ', ' ) %><br/>
+                <%end%>
+
+                <%= erb :options, { :layout => false }, :component => plugin, :session_options => session_options %>
 
                 <p>
                     <strong>Version:</strong> <%=plugin['version']%><br/>
-                    <strong>Author:</strong> <%=escape( plugin['author'])%>
+                    <strong>Author:</strong> <%=escape( plugin['author'].join( ", " ))%>
                 </p>
-                </fieldset>
             <% end %>
 
         </form>

data/lib/{ui → arachni/ui}/web/server/views/report_formats.erb

@@ -24,7 +24,7 @@
 
                 <p>
                     <strong>Version:</strong> <%=report['version']%><br/>
-                    <strong>Author:</strong> <%=escape( report['author'])%>
+                    <strong>Author:</strong> <%=escape( report['author'].join( ", " ))%>
                 </p>
                 </fieldset>
             <% end %>

data/lib/{ui → arachni/ui}/web/server/views/reports.erb

@@ -35,7 +35,7 @@
                 <td><%=report.id%></td>
                 <td><%=report.host%></td>
                 <td><%=report.issue_count%></td>
-                <td><%=report.datestamp%></td>
+                <td><%=report.datestamp.to_time%></td>
 
                 <td>
                     <ul class="reports">

data/lib/{ui → arachni/ui}/web/server/views/settings.erb

@@ -1,17 +1,27 @@
-    <script type="text/javascript">
-        $(function() {
-            $( "#slider" ).slider({
-                value: <%=session['opts']['settings']['http_req_limit']%>,
-                min: 1,
-                max: 200,
-                step: 1,
-                slide: function( event, ui ) {
-                    $( "#http_req_limit" ).val( ui.value );
-                }
+        <div id='help' style='display: none' title="Help">
+            <h2>Settings</h2>
+            <p>
+                These settings have the same effect as their <a href="https://github.com/Zapotek/arachni/wiki/Command-line-user-interface">Command Line Interface</a> counterparts.
+            </p>
+
+        </div>
+
+        <button onclick="$('#help').dialog( { height: 530, width: 500 } );"/>Help</button>
+
+        <script type="text/javascript">
+            $(function() {
+                $( "#slider" ).slider({
+                    value: <%=session['opts']['settings']['http_req_limit']%>,
+                    min: 1,
+                    max: 200,
+                    step: 1,
+                    slide: function( event, ui ) {
+                        $( "#http_req_limit" ).val( ui.value );
+                    }
+                });
+                $( "#http_req_limit" ).val( $( "#slider" ).slider( "value" ) );
             });
-            $( "#http_req_limit" ).val( $( "#slider" ).slider( "value" ) );
-        });
-    </script>
+        </script>
 
         <form action="/settings" method="post" enctype="multipart/form-data">
 
@@ -20,7 +30,6 @@
                     <h2>Settings</h2>
                     <p>General settings regarding the internals of the Arachni Framework.
                         <br/>
-                        <br/>
                      </p>
                     <p>
                         <input type="submit" class="reset" value="Save" />
@@ -53,7 +62,7 @@
                 <fieldset>
                     <legend>HTTP options</legend>
                     <p>
-                        Cocurrent HTTP request limit: <label for="http_req_limit"></label>
+                        Concurrent HTTP request limit: <label for="http_req_limit"></label>
                                                       <input id="http_req_limit" name="http_req_limit"/>
                         <div id="slider"></div>
                         <br/>
@@ -70,6 +79,34 @@
                     <p>
                         Authorized by: <input name="authed_by" value="<%=session['opts']['settings']['authed_by']%>"/>
                     </p>
+                    <p>
+                        Proxy address: <input name="proxy_addr" value="<%=session['opts']['settings']['proxy_addr']%>"/>
+                    </p>
+                    <p>
+                        Proxy port: <input name="proxy_port" value="<%=session['opts']['settings']['proxy_port']%>"/>
+                    </p>
+                    <p>
+                        Proxy username: <input name="proxy_user" value="<%=session['opts']['settings']['proxy_user']%>"/>
+                    </p>
+                    <p>
+                        Proxy password: <input name="proxy_pass" value="<%=session['opts']['settings']['proxy_pass']%>"/>
+                    </p>
+                    <p>
+                        Proxy type:
+                        <select style="float: right" name="proxy_type">
+                            <option value="http">HTTP 1.1</option>
+                            <option value="http_1_0">HTTP 1.0</option>
+                            <option value="socks4">SOCKS v4</option>
+                            <option value="socks5">SOCKS v5</option>
+                            <option value="socks4a">SOCKS v4a</option>
+                        </select>
+
+                    </p>
+                    <p>
+                        Custom HTTP headers: <textarea rows="2" cols="20" name="custom_headers"><%= format_custom_headers( session['opts']['settings']['custom_headers'] ) %></textarea>
+                    <br/>(Newline separated)
+                    <br/>(<em>header=value</em>)
+                    </p>
 
                 </fieldset>
             </div>
@@ -110,8 +147,14 @@
                         Obey robot.txt file: <input type="checkbox" name="obey_robots_txt" <% if session['opts']['settings']['obey_robots_txt'] == true %> checked="checked" <% end %> />
                     </p>
                     <p>
-                        Spider first: <input type="checkbox" name="spider_first" <% if session['opts']['settings']['spider_first'] == true %> checked="checked" <% end %> />
+                        Extend paths: <input type="file" name="extend_paths" size="25" />
+                        <br/>(Newline separated)
                     </p>
+                    <p>
+                        Restrict paths: <input type="file" name="restrict_paths" size="25" />
+                        <br/>(Newline separated)
+                    </p>
+
                 </fieldset>
 
             </div>