From 6bd650f28022d40acb6839e1fbae8a30ab31807d Mon Sep 17 00:00:00 2001
From: Leo McArdle <leo@mozilla.com>
Date: Thu, 25 Jan 2024 16:58:09 +0000
Subject: [PATCH] point at new api and update banner

---
 src/js/constants.js                         |  5 ++++-
 src/js/observatories/http.js                | 11 +----------
 src/templates/analyze/http/test-scores.html |  7 -------
 src/templates/partials/header.html          |  4 ++--
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/js/constants.js b/src/js/constants.js
index 200f7a5..d1cb084 100644
--- a/src/js/constants.js
+++ b/src/js/constants.js
@@ -20,7 +20,10 @@ module.exports = {
   numImprovedSites: '240,000',
   title: 'Mozilla Observatory',
   urls: {
-    api: 'https://http-observatory.security.mozilla.org/api/v1/',
+    // api: 'https://http-observatory.security.mozilla.org/api/v1/',
+    api: 'https://prod.observatory.mdn.prod.webservices.mozgcp.net/api/v1/',
+    // api: 'https://stage.observatory.mdn.nonprod.webservices.mozgcp.net/api/v1/',
+    // api: 'http://localhost:57001/api/v1/',
     ssh: 'https://sshscan.rubidus.com/api/v1/',
     tls: 'https://tls-observatory.services.mozilla.com/api/v1/',
   },
diff --git a/src/js/observatories/http.js b/src/js/observatories/http.js
index 9e8b245..b883777 100644
--- a/src/js/observatories/http.js
+++ b/src/js/observatories/http.js
@@ -214,15 +214,6 @@ const insert = async (scan, results) => {
     $('#tests-' + result.name + '-score-description').html(scoreDescription);
   });
 
-  // note that HPKP is optional
-  if (includes(['hpkp-not-implemented',
-    'hpkp-not-implemented-no-https',
-    'hpkp-invalid-cert'],
-      results['public-key-pinning'].result)) {
-    $('#tests-public-key-pinning-score-description').text($('#tests-public-key-pinning-score-description').text() + ' (optional)');
-    $('#tests-public-key-pinning-pass').empty().append(utils.getOcticon('dash'));
-  }
-
   // same for Referrer Policy
   if ('referrer-policy' in results) {
     if (includes(['referrer-policy-not-implemented'],
@@ -420,7 +411,7 @@ const insertHostHistory = async () => {
 
 const loadHostHistory = async () => {
   const target = utils.getTarget();
-  var API_URL = 'https://http-observatory.security.mozilla.org/api/v1/getHostHistory?host=' + target;
+  var API_URL = constants.urls.api + 'getHostHistory?host=' + target;
 
   $.ajax({
     method: 'GET',
diff --git a/src/templates/analyze/http/test-scores.html b/src/templates/analyze/http/test-scores.html
index 3848f94..0a0bba1 100644
--- a/src/templates/analyze/http/test-scores.html
+++ b/src/templates/analyze/http/test-scores.html
@@ -43,13 +43,6 @@
                     <td id="tests-cross-origin-resource-sharing-score-description"></td>
                     <td class="tablesaw-hideable tablesaw-center"><span data-octicon="info" data-toggle="popover" title="Cross-origin Resource Sharing" data-content="Incorrectly configured CORS settings can allow foreign sites to read your site's contents, possibly allowing them access to private user information."></span></td>
                 </tr>
-                <tr>
-                    <td class="title font-weight-bold tablesaw-nowrap"><a href="https://infosec.mozilla.org/guidelines/web_security#http-public-key-pinning">HTTP Public Key Pinning</a></td>
-                    <td class="tablesaw-center" id="tests-public-key-pinning-pass" aria-hidden="true"></td>
-                    <td class="tablesaw-center" id="tests-public-key-pinning-score"></td>
-                    <td id="tests-public-key-pinning-score-description"></td>
-                    <td class="tablesaw-hideable tablesaw-center"><span data-octicon="info" data-toggle="popover" title="HTTP Public Key Pinning" data-content="HTTP Public Key Pinning (HPKP) binds a site to a specific combination of certificate authorities and/or keys, protecting against the unauthorized issuance of certificates."></span></td>
-                </tr>
                 <tr>
                     <td class="title font-weight-bold tablesaw-nowrap"><a href="https://infosec.mozilla.org/guidelines/web_security#http-strict-transport-security">HTTP Strict Transport Security</a></td>
                     <td class="tablesaw-center" id="tests-strict-transport-security-pass" aria-hidden="true"></td>
diff --git a/src/templates/partials/header.html b/src/templates/partials/header.html
index a73de42..5b411d0 100644
--- a/src/templates/partials/header.html
+++ b/src/templates/partials/header.html
@@ -18,8 +18,8 @@
 <body>
     <header class="mb-0 mb-md-3">
         <div class="alert alert-danger text-center" id="scoring-banner">
-            📣\uFE0E Heads up! Mozilla Observatory 2.0 launches on January 25, 2024. New security scoring standards will apply - Your website grade may change.
-            <a href="https://developer.mozilla.org/en-US/blog/mdn-observatory/" target="_blank">Learn More</a>.
+            📣\uFE0E Heads up! New security scoring standards apply - Your website grade may have changed. MDN Observatory will launch on January 31, 2024.
+            <a href="https://developer.mozilla.org/en-US/blog/mdn-observatory/?o" target="_blank">Learn More</a>.
         </div>
         <div class="container">
             <nav class="navbar navbar-expand-lg navbar-primary bg-white">