Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Remove SSH observatory. #235

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove SSH observatory. #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/10acdf1955be9d46fce6.index.css → dist/139eb1ad22af7797a9c4.index.css
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/10acdf1955be9d46fce6.index.js → dist/139eb1ad22af7797a9c4.index.js
View file
Open in desktop

Large diffs are not rendered by default.

175 changes: 2 additions & 173 deletions dist/analyze/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="shortcut icon" href="/images/favicons/favicon.ico">

<title>Mozilla Observatory</title>
<link href="../10acdf1955be9d46fce6.index.css" rel="stylesheet" integrity="sha256-fyxqm28AWXL9JWNRLZ7JCcUc8umqUlOr8HX2DQwjXk0=" crossorigin="anonymous"></head>
<link href="../139eb1ad22af7797a9c4.index.css" rel="stylesheet" integrity="sha256-3yrWumI2IPrGdksuawyM0BQuaIKkWBS2r9eqrqPttJQ=" crossorigin="anonymous"></head>
<body>
<header class="mb-0 mb-md-3">
<!-- ex-survey, saved for future uses
Expand Down Expand Up @@ -65,7 +65,6 @@
<div id="nav-tab" class="nav nav-tabs flex-column flex-md-row" role="tablist">
<a class="nav-item nav-link active" id="nav-http-tab" href="#http" data-toggle="tab" data-target="#http-tab" role="tab" aria-controls="nav-http" aria-selected="true"><span data-octicon="chevron-right"> </span>HTTP Observatory</a>
<a class="nav-item nav-link" id="nav-tls-tab" href="#tls" data-toggle="tab" data-target="#tls-tab" role="tab" aria-controls="nav-tls"><span data-octicon="chevron-right"> </span>TLS Observatory</a>
<a class="nav-item nav-link" id="nav-ssh-tab" href="#ssh" data-toggle="tab" data-target="#ssh-tab" role="tab" aria-controls="nav-ssh"><span data-octicon="chevron-right"> </span>SSH Observatory</a>
<a class="nav-item nav-link" id="nav-third-party-tab" href="#third-party" data-toggle="tab" data-target="#third-party-tab" role="tab" aria-controls="nav-third"><span data-octicon="chevron-right"> </span>Third-party Tests</a>
</div>
</nav>
Expand Down Expand Up @@ -779,176 +778,6 @@
</div>
</div>

<!-- SSH Observatory -->
<div class="tab-pane" id="ssh-tab" role="tabpanel" aria-labelledby="nav-ssh-tab">
<div id="ssh-scan-initiator" class="mt-3">
<button class="btn btn-light expandy-panel-button align-middle py-3 w-100" id="ssh-scan-initiator-btn" type="button">
SSH Observatory scans are not performed automatically. Click here to initiate a scan.
</button>
</div>

<!-- Notice about which system hosts the scans -->
<div class="alert alert-danger d-none mt-3 mx-3 px-3 py-3 rounded" id="ssh-scanner-alert" role="alert">
<div class="pb-3"><strong>Scan Failed: </strong>The Mozilla SSH Observatory scans from <code class="bg-light mb-3 px-1 py-1 rounded">sshscan.rubidus.com</code> at <code class="bg-light px-1 py-1 rounded">45.55.176.164</code>.</div>

<div>Many systems are configured with firewalls that block SSH access. To successfully scan with the SSH Observatory, access must be granted to Mozilla's scanning system.</div>
</div>

<!-- progress bar -->
<span id="ssh-progress-bar-container" class="d-none">
<div id="ssh-progress">
<div class="card card-primary">
<div class="card-header bg-primary text-white">
<span class="h3">Scan Summary</span>
</div>

<div class="row">
<div class="col-xs-12 col-md-8 offset-md-2">
<div id="ssh-progress-bar" class="progress progress-lg mx-xs-3 mx-sm-3 mx-md-0">
<div id="ssh-progress-bar-text" class="progress-bar progress-bar-lg progress-bar-striped progress-bar-animated w-100" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
Loading Results
</div>
</div>
</div>
</div>
</div>
</div>

</span>

<div class="d-none" id="ssh-results">
<!-- SSH Observatory scan results -->
<div class="card card-primary" id="ssh-summary">
<div class="card-header bg-primary text-center text-md-left text-white">
<span class="h3">Scan Summary</span>
</div>

<div class="card-body pb-1">
<div class="row">
<div class="col-xs-12 col-md-3 col-lg-2 mb-3 text-center">
<span class="grade-container text-center" id="ssh-grade-container">
<span class="grade-letter" id="ssh-grade-letter"></span>
<sup class="grade-letter-modifier" id="ssh-grade-modifier"></sup>
</span>
</div>
<div class="col-xs-12 col-md-9 col-lg-10 table-responsive">
<table class="table table-striped table-sm summary">
<tr>
<td>Host:</td>
<td class="text-break"><span id="ssh-hostname"></span> <span class="deemphasize">(<span id="ssh-ip"></span>:<span id="ssh-port"></span>)</span></td>
</tr>
<tr>
<td>Scan ID #:</td>
<td id="ssh-uuid"></td>
</tr>
<tr>
<td>End Time:</td>
<td id="ssh-end_time_l"></td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td><a href="https://infosec.mozilla.org/guidelines/openssh">Mozilla SSH Standards Compliant:</a></td>
<td id="ssh-compliant"></td>
</tr>
</table>
</div>
</div>
</div>
</div>

<!-- SSH Observatory recommendations -->
<!-- SSH Observatory recommendations panel -->
<div class="card card-success mt-4" id="ssh-recommendations">
<div class="card-header bg-success text-center text-md-left text-white">
<span class="h3">Recommendations</span>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped" id="ssh-recommendations-table">
</table>
</div>
<div class="text-center d-none" id="ssh-no-recommendations">
🎉🎉🎉 <em>We don't have any! Keep up the good work!</em> 🎉🎉🎉
</div>
</div>
</div>


<!-- SSH Observatory miscellaneous -->
<!-- SSH Observatory miscellaneous panel -->
<div class="card card-primary mt-4" id="ssh-misc">
<div class="card-header bg-primary text-center text-md-left text-white">
<span class="h3">Miscellaneous</span>
</div>
<div class="card-body pb-0">
<div class="table-responsive">
<table class="table tablesaw table-striped summary" id="ssh-misc-table" data-tablesaw-mode="stack" data-tablesaw-hide-empty data-tablesaw-no-labels>
<thead class="d-none">
<th scope="column"></th>
<th scope="column"></th>
<th scope="column" class="tablesaw-hideable"></th>
</thead>
<tbody>
<tr>
<td>Authentication Methods:</td>
<td id="ssh-auth_methods"></td>
<td class="tablesaw-hideable tablesaw-center"><span class="octicon" data-octicon="info" data-toggle="popover" title="Authentication Methods" data-content="We recommend disabling authentication based solely upon passwords and instead using public key authentication alone or in combination with other authentication methods."></span></td>
</tr>
<tr>
<td>Compression:</td>
<td id="ssh-compression"></td>
<td class="tablesaw-hideable tablesaw-center"><span class="octicon" data-octicon="info" data-toggle="popover" title="Compression" data-content="Allowing compression can improve data transmission speeds over slow or high latency connections."></span></td>
</tr>
<tr>
<td>Duplicate Host Keys:</td>
<td id="ssh-duplicate_host_keys"></td>
<td class="tablesaw-hideable tablesaw-center"><span class="octicon" data-octicon="info" data-toggle="popover" title="Duplicate Host Keys" data-content="Using the same host key on multiple machines can be dangerous. If one machine gets compromised, it can impersonate other systems using the same key."></span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>


<!-- SSH Observatory version information -->
<!-- SSH Observatory version information panel -->
<div class="card card-primary mt-4" id="ssh-version">
<div class="card-header bg-primary text-center text-md-left text-white">
<span class="h3">Version Information</span>
</div>
<div class="card-body pb-0">
<div class="table-responsive">
<table class="table tablesaw table-striped summary" id="ssh-version-table" data-tablesaw-mode="stack" data-tablesaw-hide-empty data-tablesaw-no-labels>
<thead>
<th scope="column"></th>
<th scope="column"></th>
</thead>
<tbody>
<tr>
<td>Server Banner:</td>
<td id="ssh-server_banner"></td>
</tr>
<tr>
<td>Operating System Identifier:</td>
<td id="ssh-os_cpe"></td>
</tr>
<tr>
<td>SSH Library Identifier:</td>
<td id="ssh-ssh_lib_cpe"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>

</div>
</div>

<!-- Third party stuff -->
<div class="tab-pane" id="third-party-tab" role="tabpanel" aria-labelledby="nav-third-party-tab">
<h3 class="mt-4 mt-sm-3">
Expand Down Expand Up @@ -1280,6 +1109,6 @@ <h3 class="mt-5">Miscellaneous</h3>

<!-- main content -->
</div>
<script type="text/javascript" src="../10acdf1955be9d46fce6.index.js" integrity="sha256-fg8FWK1CQoxyUTXcrcuvZL9htdWILWd75u1z/P2WadA=" crossorigin="anonymous"></script></body>
<script type="text/javascript" src="../139eb1ad22af7797a9c4.index.js" integrity="sha256-4FzLI71eJ1D0eRotGio2nNmg4PaT47sH7t9fPbQHWxg=" crossorigin="anonymous"></script></body>
</html>

4 changes: 2 additions & 2 deletions dist/faq/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="shortcut icon" href="/images/favicons/favicon.ico">

<title>Mozilla Observatory</title>
<link href="../10acdf1955be9d46fce6.index.css" rel="stylesheet" integrity="sha256-fyxqm28AWXL9JWNRLZ7JCcUc8umqUlOr8HX2DQwjXk0=" crossorigin="anonymous"></head>
<link href="../139eb1ad22af7797a9c4.index.css" rel="stylesheet" integrity="sha256-3yrWumI2IPrGdksuawyM0BQuaIKkWBS2r9eqrqPttJQ=" crossorigin="anonymous"></head>
<body>
<header class="mb-0 mb-md-3">
<!-- ex-survey, saved for future uses
Expand Down Expand Up @@ -204,7 +204,7 @@ <h3 class="h4">What is hstspreload.org?</h3>

<!-- main content -->
</div>
<script type="text/javascript" src="../10acdf1955be9d46fce6.index.js" integrity="sha256-fg8FWK1CQoxyUTXcrcuvZL9htdWILWd75u1z/P2WadA=" crossorigin="anonymous"></script></body>
<script type="text/javascript" src="../139eb1ad22af7797a9c4.index.js" integrity="sha256-4FzLI71eJ1D0eRotGio2nNmg4PaT47sH7t9fPbQHWxg=" crossorigin="anonymous"></script></body>
</html>


6 changes: 3 additions & 3 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="shortcut icon" href="/images/favicons/favicon.ico">

<title>Mozilla Observatory</title>
<link href="10acdf1955be9d46fce6.index.css" rel="stylesheet" integrity="sha256-fyxqm28AWXL9JWNRLZ7JCcUc8umqUlOr8HX2DQwjXk0=" crossorigin="anonymous"></head>
<link href="139eb1ad22af7797a9c4.index.css" rel="stylesheet" integrity="sha256-3yrWumI2IPrGdksuawyM0BQuaIKkWBS2r9eqrqPttJQ=" crossorigin="anonymous"></head>
<body>
<header class="mb-0 mb-md-3">
<!-- ex-survey, saved for future uses
Expand Down Expand Up @@ -76,7 +76,7 @@ <h1 id="whatami" class="h6 margin-bottom">
</div>
<div class="alert alert-danger alert-hidden" id="scan-alert-ip" role="alert">
<strong>Error: </strong>
<span>It appears that <span id="scan-alert-ip-address"></span> is an IP address, which only works for SSH scans. If this is what you intended, please <a id="scan-alert-ip-link">click here</a> to continue.</span>
<span>It appears that <span id="scan-alert-ip-address"></span> is an IP address, please enter a valid DNS hostname to continue.</span>
</div>
<form id="scantron-form">
<div class="input-group mt-2 mb-3">
Expand Down Expand Up @@ -114,6 +114,6 @@ <h1 id="whatami" class="h6 margin-bottom">

<!-- main content -->
</div>
<script type="text/javascript" src="10acdf1955be9d46fce6.index.js" integrity="sha256-fg8FWK1CQoxyUTXcrcuvZL9htdWILWd75u1z/P2WadA=" crossorigin="anonymous"></script></body>
<script type="text/javascript" src="139eb1ad22af7797a9c4.index.js" integrity="sha256-4FzLI71eJ1D0eRotGio2nNmg4PaT47sH7t9fPbQHWxg=" crossorigin="anonymous"></script></body>
</html>

26 changes: 2 additions & 24 deletions dist/statistics/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="shortcut icon" href="/images/favicons/favicon.ico">

<title>Mozilla Observatory</title>
<link href="../10acdf1955be9d46fce6.index.css" rel="stylesheet" integrity="sha256-fyxqm28AWXL9JWNRLZ7JCcUc8umqUlOr8HX2DQwjXk0=" crossorigin="anonymous"></head>
<link href="../139eb1ad22af7797a9c4.index.css" rel="stylesheet" integrity="sha256-3yrWumI2IPrGdksuawyM0BQuaIKkWBS2r9eqrqPttJQ=" crossorigin="anonymous"></head>
<body>
<header class="mb-0 mb-md-3">
<!-- ex-survey, saved for future uses
Expand Down Expand Up @@ -153,32 +153,10 @@ <h1 class="page-header h2 page-header-half-margin-top">TLS Observatory</h1>
</table>
</div>

<h1 class="page-header h2 page-header-half-margin-top">SSH Observatory</h1>

<div>
<table class="table table-striped table-bordered">
<tbody>
<tr>
<td>Number of Successfully Completed Scans</td>
<td class="text-right" id="ssh-observatory-stats-numSuccessfulScans"></td>
</tr>
<tr>
<td>Number of Attempted Scans</td>
<td class="text-right" id="ssh-observatory-stats-numScans"></td>
</tr>
</tbody>
</table>
</div>

<div>
<h2 class="h4">Grade Distribution</h2>
<canvas id="ssh-observatory-chart-grade-distribution" height="200"></canvas>
</div>

</div>

<!-- main content -->
</div>
<script type="text/javascript" src="../10acdf1955be9d46fce6.index.js" integrity="sha256-fg8FWK1CQoxyUTXcrcuvZL9htdWILWd75u1z/P2WadA=" crossorigin="anonymous"></script></body>
<script type="text/javascript" src="../139eb1ad22af7797a9c4.index.js" integrity="sha256-4FzLI71eJ1D0eRotGio2nNmg4PaT47sH7t9fPbQHWxg=" crossorigin="anonymous"></script></body>
</html>

4 changes: 2 additions & 2 deletions dist/terms/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="shortcut icon" href="/images/favicons/favicon.ico">

<title>Mozilla Observatory</title>
<link href="../10acdf1955be9d46fce6.index.css" rel="stylesheet" integrity="sha256-fyxqm28AWXL9JWNRLZ7JCcUc8umqUlOr8HX2DQwjXk0=" crossorigin="anonymous"></head>
<link href="../139eb1ad22af7797a9c4.index.css" rel="stylesheet" integrity="sha256-3yrWumI2IPrGdksuawyM0BQuaIKkWBS2r9eqrqPttJQ=" crossorigin="anonymous"></head>
<body>
<header class="mb-0 mb-md-3">
<!-- ex-survey, saved for future uses
Expand Down Expand Up @@ -80,6 +80,6 @@ <h1 class="border-bottom border-light mb-4 pb-2">Legal &amp; Privacy Terms</h1>

<!-- main content -->
</div>
<script type="text/javascript" src="../10acdf1955be9d46fce6.index.js" integrity="sha256-fg8FWK1CQoxyUTXcrcuvZL9htdWILWd75u1z/P2WadA=" crossorigin="anonymous"></script></body>
<script type="text/javascript" src="../139eb1ad22af7797a9c4.index.js" integrity="sha256-4FzLI71eJ1D0eRotGio2nNmg4PaT47sH7t9fPbQHWxg=" crossorigin="anonymous"></script></body>
</html>

4 changes: 1 addition & 3 deletions src/css/_tablesaw.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ $tablesaw-width: 39.9375em;

#server-headers-table tr td:nth-child(1),
#tls-certificate-table tr td:nth-child(1),
#tls-misc-table tr td:nth-child(1),
#ssh-misc-table tr td:nth-child(1),
#ssh-version-table tr td:nth-child(1) {
#tls-misc-table tr td:nth-child(1) {
white-space: nowrap;
}
}
Expand Down
10 changes: 2 additions & 8 deletions src/css/httpobs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,7 @@ div.progress-lg + div.row {
/* test name */
#server-headers-table tr td:nth-child(1),
#tls-certificate-table tr td:nth-child(1),
#tls-misc-table tr td:nth-child(1),
#ssh-misc-table tr td:nth-child(1),
#ssh-version-table tr td:nth-child(1) {
#tls-misc-table tr td:nth-child(1) {
font-weight: 600;
padding-right: 1em;
}
Expand Down Expand Up @@ -326,10 +324,6 @@ div.progress-lg + div.row {
margin-bottom: 0;
}

#ssh-recommendations-table ul {
margin-bottom: 0;
}

/* qualys third party test */
#qualys-logo {
margin: 1.5em .75em -1em 0;
Expand Down Expand Up @@ -399,7 +393,7 @@ sup, sub {
font-weight: bold;
}

#next-steps a, #test-scores a, #ssh-summary a {
#next-steps a, #test-scores a {
border-bottom: 1px dotted #4582ec;
text-decoration: none;
}
Expand Down
1 change: 0 additions & 1 deletion src/js/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = {
title: 'Mozilla Observatory',
urls: {
api: 'https://http-observatory.security.mozilla.org/api/v1/',
ssh: 'https://sshscan.rubidus.com/api/v1/',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes me wonder: can we link to some other SSH scan tool for people who have been using Observatory for SSH scanning?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could link users directly to the CLI tool here? https://github.com/mozilla/ssh_scan

tls: 'https://tls-observatory.services.mozilla.com/api/v1/',
},
}
Expand Down
18 changes: 1 addition & 17 deletions src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,7 @@ const Observatory = {

const successCallback = function f(data) {
if (data.error !== undefined && data.error !== 'site down') {
// if it's an IP address error, let them click through
if (data.error === 'invalid-hostname-ip') {
$('#scan-alert-ip-link').attr('href', window.location.href + 'analyze/' + url.host + '#ssh');
$('#scan-alert-ip-address').text(url.host);
$('#scan-alert-ip').removeClass('alert-hidden');
} else {
Observatories.HTTP.displayError(data.text);
}

Observatories.HTTP.displayError(data.text);
return false;
}

Expand Down Expand Up @@ -171,14 +163,6 @@ const Observatory = {
Observatories.HTTP.load();
Observatories.TLS.load();

// enable auto scans from the non-Observatory domain
if ((window.location.hostname !== constants.domain) || (window.location.hash === '#ssh')) {
Observatories.SSH.load();
} else {
$('#ssh-scan-initiator-btn').on('click', Observatories.SSH.load);

}

// let's check the third parties if requested
if (utils.getQueryParameter('third-party') !== 'false') {
thirdParty.load();
Expand Down
3 changes: 1 addition & 2 deletions src/js/observatories/observatories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import HTTP from './http.js';
import SSH from './ssh.js';
import TLS from './tls.js';


export default { HTTP, SSH, TLS };
export default { HTTP, TLS };
Loading