SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.
Python attacksurfacecticybersecurityfootprintinghackinginformation-gatheringinformation-securityinfosecintelligence-gatheringosintosint-frameworkosint-reconnaissanceosint-toolpentestingpythonreconsecurity-toolsthreat-intelligencethreatintel
UI tidy-ups.
smicallef85ad4d43c64a
diff --git a/dyn/HEADER.tmpl b/dyn/HEADER.tmplindex 37140b7e..dd11d9b4 100644--- a/dyn/HEADER.tmpl+++ b/dyn/HEADER.tmpl@@ -70,7 +70,6 @@ class="nav-item"><a href="${docroot}/opts" class="nav-link"><i class="glyphicon<div class="modal-body"><p>SpiderFoot is an open source, GPL-licensed footprinting tool, created by <a href='https://twitter.com/binarypool' target=_new>Steve Micallef</a>. It is designed to be easy to use, fast and extensible.</p><p>If you have any bugs to report, or requests for enhancements, please contact the support mailing list at <a href=mailto:[email protected]>[email protected]</a>.- <br><p>You are running version <b>3.1-DEV</b>.</p><p> Visit the project website at <a href='https://www.spiderfoot.net/r.php?u=aHR0cHM6Ly93d3cuc3BpZGVyZm9vdC5uZXQv&s=os_int' target=_new>https://www.spiderfoot.net/</a>.</p><p> View the documentation at <a href='https://www.spiderfoot.net/documentation/' target=_new>https://www.spiderfoot.net/documentation/</a>.</p>@@ -81,7 +80,7 @@ class="nav-item"><a href="${docroot}/opts" class="nav-link"><i class="glyphicon</div><div class="modal-footer">- <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>+ <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button></div></div>diff --git a/dyn/newscan.tmpl b/dyn/newscan.tmplindex ddbe1c80..85e9d89c 100644--- a/dyn/newscan.tmpl+++ b/dyn/newscan.tmpl@@ -1,15 +1,15 @@<%include file="HEADER.tmpl"/><script src="${docroot}/static/js/spiderfoot.newscan.js"></script><h2>New Scan</h2>-<br>+<div style='padding-top: 20px'><form class="form" action='${docroot}/startscan' method='POST'><label for="scanname">Scan Name</label><div class="input-group" style='padding-bottom: 10px'>- <input class='form-control' type="text" id="scanname" name="scanname" value="${scanname}" placeholder="Descriptive name for this scan.">+ <input class='form-control' type="text" id="scanname" style='width: 400px' name="scanname" value="${scanname}" placeholder="Descriptive name for this scan."></div><label for="scantarget">Seed Target</label><div class="input-group">- <input class='form-control' type="text" value="${scantarget}" data-toggle='popover' data-html=true data-animation=true data-title='Usage' data-content='The <i>Seed Target</i> can be one of the following. SpiderFoot will automatically detect the target type based on the format of your input.<br><br><b>Domain Name</b>: e.g. <i>example.com</i><br><b>IPv4 Address</b>: e.g. <i>1.2.3.4</i><br><b>IPv6 Address</b>: e.g. <i>2606:4700:4700::1111</i><br><b>Hostname/Sub-domain</b>: e.g. <i>abc.example.com</i><br><b>Subnet</b>: e.g. <i>1.2.3.0/24</i><br><b>ASN</b>: e.g. <i>1234</i><br><b>E-mail address</b>: e.g. <i>[email protected]</i><br><b>Phone Number</b>: e.g. <i>+12345678901</i> (E.164 format)<br><b>Human Name</b>: e.g. <i>"John Smith"</i> (must be in quotes)<br><b>Username</b>: e.g. <i>"jsmith2000"</i> (must be in quotes)' data-placement='right' id="scantarget" name="scantarget" placeholder="Starting point for the scan.">+ <input class='form-control' type="text" style='width: 400px' value="${scantarget}" data-toggle='popover' data-html=true data-animation=true data-title='Usage' data-content='The <i>Seed Target</i> can be one of the following. SpiderFoot will automatically detect the target type based on the format of your input.<br><br><b>Domain Name</b>: e.g. <i>example.com</i><br><b>IPv4 Address</b>: e.g. <i>1.2.3.4</i><br><b>IPv6 Address</b>: e.g. <i>2606:4700:4700::1111</i><br><b>Hostname/Sub-domain</b>: e.g. <i>abc.example.com</i><br><b>Subnet</b>: e.g. <i>1.2.3.0/24</i><br><b>ASN</b>: e.g. <i>1234</i><br><b>E-mail address</b>: e.g. <i>[email protected]</i><br><b>Phone Number</b>: e.g. <i>+12345678901</i> (E.164 format)<br><b>Human Name</b>: e.g. <i>"John Smith"</i> (must be in quotes)<br><b>Username</b>: e.g. <i>"jsmith2000"</i> (must be in quotes)' data-placement='right' id="scantarget" name="scantarget" placeholder="Starting point for the scan."></div><p></p>@@ -25,12 +25,12 @@</div></ul><table class="table table-striped table-condensed" id="usetable">- <tr><td><input type=radio name='usecase' value='all' id="usecase_all" checked></td><td>All</td><td><b>Get anything and everything about the target.</b><br><br>All SpiderFoot modules will be enabled (slow) but every possible piece of information about the target will be obtained and analysed.<br><br></td></tr>- <tr><td><input type=radio name='usecase' value='Footprint' id="usecase_footprint"></td><td>Footprint</td><td><b>Understand what information this target exposes to the Internet.</b><br><br>Gain an understanding about the target's network perimeter, associated identities and other information that is obtained through a lot of web crawling and search engine use.+ <tr><td style='width: 50px'><input type=radio name='usecase' value='all' id="usecase_all" checked></td><td>All</td><td><b>Get anything and everything about the target.</b><br><br>All SpiderFoot modules will be enabled (slow) but every possible piece of information about the target will be obtained and analysed.<br><br></td></tr>+ <tr><td style='width: 50px'><input type=radio name='usecase' value='Footprint' id="usecase_footprint"></td><td>Footprint</td><td><b>Understand what information this target exposes to the Internet.</b><br><br>Gain an understanding about the target's network perimeter, associated identities and other information that is obtained through a lot of web crawling and search engine use.<br><br></td></tr>- <tr><td><input type=radio name='usecase' value='Investigate' id="usecase_investigate"></td><td>Investigate</td><td><b>Best for when you suspect the target to be malicious but need more information.</b><br><br>Some basic footprinting will be performed in addition to querying of blacklists and other sources that may have information about your target's maliciousness.+ <tr><td style='width: 50px'><input type=radio name='usecase' value='Investigate' id="usecase_investigate"></td><td>Investigate</td><td><b>Best for when you suspect the target to be malicious but need more information.</b><br><br>Some basic footprinting will be performed in addition to querying of blacklists and other sources that may have information about your target's maliciousness.<br><br></td></tr>- <tr><td><input type=radio name='usecase' value='Passive' id="usecase_passive"></td><td>Passive</td><td><b>When you don't want the target to even suspect they are being investigated.</b><br><br>As much information will be gathered without touching the target or their affiliates, therefore only modules that do not touch the target will be enabled.+ <tr><td style='width: 50px'><input type=radio name='usecase' value='Passive' id="usecase_passive"></td><td>Passive</td><td><b>When you don't want the target to even suspect they are being investigated.</b><br><br>As much information will be gathered without touching the target or their affiliates, therefore only modules that do not touch the target will be enabled.</td></tr></table>@@ -76,11 +76,11 @@<div class="controls"><input type=hidden id='modulelist' name='modulelist' value=''><input type=hidden id='typelist' name='typelist' value=''>- <button id="btn-run-scan" class="btn btn-danger">Run Scan</button>- <span class="help-block">Note: Scan will be started immediately.</span>+ <button id="btn-run-scan" class="btn btn-danger">Run Scan Now</button></div></div></form>+</div><script type='text/javascript'>if ("${selectedmods}" != "") {diff --git a/dyn/opts.tmpl b/dyn/opts.tmplindex a8281ee0..41ca7257 100644--- a/dyn/opts.tmpl+++ b/dyn/opts.tmpl@@ -46,15 +46,15 @@<thead><tr> <th>Option</th> <th>Value</th></tr></thead><tbody>% for opt in sorted(opts.keys()):% if not opt.startswith("__"):- <tr><td>${opts['__globaloptdescs__'][opt]}</td><td style='width: 75%;vertical-align: middle'>+ <tr><td>${opts['__globaloptdescs__'][opt]}</td><td style='vertical-align: middle'>% if type(opts[opt]) is int:- <div class='input-group-lg' style='width: 100px'>+ <div class='input-group'><input id='${opt}' class='form-control' type=text value="${opts[opt]}"></div>% endif% if type(opts[opt]) is str:- <div class='input-group-lg'>- <input id='${opt}' class='form-control' type=text value="${opts[opt]}">+ <div class='input-group'>+ <input id='${opt}' style='width: 500px' class='form-control' type=text value="${opts[opt]}"></div>% endif% if type(opts[opt]) is bool:@@ -73,13 +73,13 @@% endif% if type(opts[opt]) is list and type(opts[opt][0]) is str:<% expandedopt = ','.join(opts[opt]) %>- <div class='input-group-lg'>- <input id='${opt}' class='form-control' type=text value="${expandedopt}">+ <div class='input-group'>+ <input id='${opt}' style='width: 500px' class='form-control' type=text value="${expandedopt}"></div>% endif% if type(opts[opt]) is list and type(opts[opt][0]) is int:<% expandedopt = ','.join(str(x) for x in opts[opt]) %>- <div class='input-group-lg' style='width: 100px'>+ <div class='input-group'><input id='${opt}' class='form-control' type=text value="${expandedopt}"></div>% endif@@ -106,15 +106,15 @@optdesc = opts['__modules__'][mod]['optdescs'][opt]%>- <tr><td>${optdesc}</td><td style='width: 75%;vertical-align: middle'>+ <tr><td>${optdesc}</td><td style='vertical-align: middle'>% if type(modopts[opt]) is int:- <div class='input-group-lg' style='width: 100px'>+ <div class='input-group'><input id='${mod}:${opt}' class='form-control' type=text value="${modopts[opt]}"></div>% endif% if type(modopts[opt]) is str:- <div class='input-group-lg'>- <input id='${mod}:${opt}' class='form-control' type=text value="${modopts[opt]}">+ <div class='input-group'>+ <input id='${mod}:${opt}' style='width: 500px' class='form-control' type=text value="${modopts[opt]}"></div>% endif% if type(modopts[opt]) is bool:@@ -133,13 +133,13 @@% endif% if type(modopts[opt]) is list and type(modopts[opt][0]) is str:<% expandedopt = ','.join(modopts[opt]) %>- <div class='input-group-lg'>- <input id='${mod}:${opt}' class='form-control' type=text value="${expandedopt}">+ <div class='input-group'>+ <input id='${mod}:${opt}' style='width: 500px' class='form-control' type=text value="${expandedopt}"></div>% endif% if type(modopts[opt]) is list and type(modopts[opt][0]) is int:<% expandedopt = ','.join(str(x) for x in modopts[opt]) %>- <div class='input-group-lg' style='width: 100px'>+ <div class='input-group'><input id='${mod}:${opt}' class='form-control' type=text value="${expandedopt}"></div>% endifdiff --git a/dyn/scandelete.tmpl b/dyn/scandelete.tmplindex cb263ad6..5c2fd2b3 100644--- a/dyn/scandelete.tmpl+++ b/dyn/scandelete.tmpl@@ -7,13 +7,14 @@ Please confirm you wish to delete the scan '${name}'<br><br><a class='btn btn-danger' href='${docroot}/scandelete?id=${id}&confirm=1'>Confirm Deletion</a>% endif% if len(ids) > 0:-Please confirm you wish to delete the scans:<br>+Please confirm you wish to delete the scans:<br /><ul>% for nm in names:<li>${nm}</li>% endfor<% idlist = ','.join(ids) %></ul>+<br /><a class='btn btn-danger' href='${docroot}/scandeletemulti?ids=${idlist}&confirm=1'>Confirm Deletion</a>% endif</div>diff --git a/dyn/scaninfo.tmpl b/dyn/scaninfo.tmplindex 693e8676..e749cb44 100644--- a/dyn/scaninfo.tmpl+++ b/dyn/scaninfo.tmpl@@ -11,8 +11,8 @@</div><div class='btn-group pull-right'><div id='btn-search' class='input-group pull-right'>- <input class='form-control' id='searchvalue' type='text' placeholder='Search...' data-toggle='popover' data-html='true' data-animation='true' data-title='Usage' data-content="Supply a regular expression encapsulated in '/', e.g. <i>/searchregex/</i> or a simple wildcard search, e.g. <i>*string*</i> or an exact value, e.g. <i>string</i>.<br><br><b>Note</b> that the current scope is what's searched.">- <div class='input-group-btn'>+ <input class='form-control' id='searchvalue' type='text' placeholder='Search...' data-toggle='popover' data-html='true' data-animation='true' data-title='Usage' data-content="Supply a regular expression encapsulated in '/', e.g. <i>/searchregex/</i> or a simple wildcard search, e.g. <i>*string*</i> or an exact value, e.g. <i>string</i>.<br /><br /><b>Note</b> that the current scope is what's searched.">+ <div class='input-group-btn' style='width: 0px'> <!-- Chrome fix --><button class='btn btn-primary' id='searchbutton' type='button' onClick="$('#btn-search').popover('toggle');searchDirector('${id}')"><i class='glyphicon glyphicon-search glyphicon glyphicon-white'></i></button>@@ -196,7 +196,7 @@// Visualisationfunction graphEvents(instanceId) {- grid = "<div id='scansummary-content'><br>"+ grid = "<div id='scansummary-content'><br />"grid += "<div class='col-md-12 graph-container' id='graph-container'></div>"grid += "</div>"@@ -218,6 +218,11 @@sigma.parsers.json("${docroot}/scanviz?id=" + instanceId + "&gexf=0", {container: 'graph-container'}, function(s) {+ if (s.renderers[0].nodesOnScreen.length == 0) {+ $("#graph-container").append("<div class='alert alert-danger'>Insufficient data to produce a graph.</div>");+ $("#loader").hide();+ return;+ }sharedSigma = s;s.settings({edgeColor: 'default',@@ -255,20 +260,20 @@function scanStatusView(instanceId) {grid = "<div id='scansummary-content'>"grid += "<div class='row'>"- grid += "<div class='col-md-12'>"- grid += "<div class='btn-toolbar text-center'>"- grid += "<div class='btn-group'><button class='btn disabled btn-lg btn-default'>Total</span></button>"+ grid += "<div class='col-md-12 text-center'>"+ grid += "<div class='btn-toolbar'>";+ grid += "<div class='btn-group' style='float: unset'><button class='btn disabled btn-lg btn-secondary'>Total</span></button>"grid += "<button class='btn disabled btn-lg btn-default' id='tcounter'>?</button></div>"- grid += "<div class='btn-group'><button class='btn disabled btn-lg btn-default'>Unique</button>"+ grid += "<div class='btn-group' style='float: unset'><button class='btn disabled btn-lg btn-secondary'>Unique</button>"grid += "<button class='btn disabled btn-lg btn-default' id='ucounter'>?</button></div>"- grid += "<div class='btn-group'><button class='btn disabled btn-lg btn-default'>Status</button>"+ grid += "<div class='btn-group' style='float: unset'><button class='btn disabled btn-lg btn-secondary'>Status</button>"grid += "<button class='btn disabled btn-lg btn-default' id='status'>?</button></div>"- grid += "<div class='btn-group'><button class='btn disabled btn-lg btn-default'>Errors</button>"+ grid += "<div class='btn-group' style='float: unset'><button class='btn disabled btn-lg btn-secondary'>Errors</button>"grid += "<button class='btn disabled btn-lg btn-default' id='errors'>?</button></div>"- grid += "</div></div></div><br>"+ grid += "</div></div></div><br />"grid += "<div class='row'>"grid += "<div class='col-md-12' id='vbarsummary'></div>"- grid += "</div><br>"+ grid += "</div><br />"grid += "<div class='row'>"grid += "<div class='col-md-12' id='logtable'></div>"grid += "</div></div>"@@ -506,7 +511,7 @@table += "<tr>";table += "<td class='text-center'><input type='checkbox' id='cb_" + data[i][7] + "'>";if (data[i][8] == "1") {- table += "<br><i class='glyphicon glyphicon-ban-circle' class='vertical-align-bottom' />";+ table += "<br /><i class='glyphicon glyphicon-ban-circle' class='vertical-align-bottom' />";}table += "</td>";table += "<td><pre class='table-border-bg-inherit'>";diff --git a/static/css/spiderfoot.css b/static/css/spiderfoot.cssindex 4e655aaf..58912405 100644--- a/static/css/spiderfoot.css+++ b/static/css/spiderfoot.css@@ -111,3 +111,9 @@ display: none;background: #fff;}+input[type=checkbox] {+ width: 14px;+ height: 14px;+ margin: 0px;+ display: inline;+}