From 84cedba3dbe29c72a0fbab59e70009d1b6cfd6b5 Mon Sep 17 00:00:00 2001 From: Peter Heywood Date: Mon, 17 Jul 2023 10:46:07 +0100 Subject: [PATCH 1/4] Remove MFA deployment in progress announcement banner + js --- _static/js/custom.js | 5 +++-- conf.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_static/js/custom.js b/_static/js/custom.js index ce94db5..0859cce 100644 --- a/_static/js/custom.js +++ b/_static/js/custom.js @@ -4,7 +4,7 @@ so cannot use sphinx :ref: for output destination URIs relative to the current p Instead, find the appropriate link within the current page, to add the anchor to the announcement. This does not currently support linking outside of the documentation website. */ -console.log("foo") +/* window.onload = function () { // Only apply the link if the annoucement content matches (incase the announcement is changed but this file is not.) expectedAnnouncementContent = "MFA Deployment in Progress"; @@ -45,4 +45,5 @@ window.onload = function () { } } } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/conf.py b/conf.py index 189a0ee..2e40028 100644 --- a/conf.py +++ b/conf.py @@ -92,7 +92,7 @@ # Reset the navigation bar footer (html) "extra_navbar": "", # Add an announcement bar, visible at the top of each page. - "announcement": "MFA Deployment in Progress", + # "announcement": "MFA Deployment in Progress", # Add the traditional footer theme and sphinx acknowledgements "extra_footer": f"Built with Sphinx {sphinx.__version__} using a theme by the Executable Book Project." } From f38a286ee503fae7b151ad5326132440955a2562 Mon Sep 17 00:00:00 2001 From: Peter Heywood Date: Mon, 17 Jul 2023 10:49:08 +0100 Subject: [PATCH 2/4] MFA: Remove in-progress info, promote x2go + MFA warning to login section --- usage/index.rst | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/usage/index.rst b/usage/index.rst index ebb98fa..8dd0cfc 100644 --- a/usage/index.rst +++ b/usage/index.rst @@ -28,6 +28,12 @@ fronts the two login nodes, ``login1.bede.dur.ac.uk`` and ``login2.bede.dur.ac.uk``). SSH or X2GO should be used for all interaction with the machine (including shell access, file transfer and graphics). +.. warning:: + + Please use an SSH client and **not** X2GO the first time you ever log in to + Bede, or immediately after a password reset. Your MFA token will be + generated, but X2GO will not show it to you. + The login nodes are shared between all users of the service and therefore should only be used for light interactive work, for example: downloading and compiling software, editing files, preparing jobs and @@ -44,10 +50,6 @@ batch scheduler, and so demanding applications should be submitted to it Multi Factor Authentication --------------------------- -.. note:: - - We are gradually rolling out MFA, so this may not yet apply to your account. - When connecting to the login nodes, the system has to validate your identity. In order to help keep accounts secure, Bede employs a technique called Multi Factor Authentication (MFA), where something you @@ -82,12 +84,6 @@ please contact `support <../faq/#faq-helpsupport>`__ for options. If you are finding that you are having to use your password and a MFA token too many times, we have provided some tips on `how to reduce the frequency that MFA is required <../faq/#faq-reducemfa>`__ -.. warning:: - - When MFA is fully deployed, all logins will need to be done this way. Alternative - methods, such as SSH user keys, will be disabled. - - .. _usage-x2go: X2GO From 2456001e3ece7689ad30d9e17f24799f75474ca3 Mon Sep 17 00:00:00 2001 From: Peter Heywood Date: Mon, 17 Jul 2023 10:50:33 +0100 Subject: [PATCH 3/4] Missing . on usage page --- usage/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usage/index.rst b/usage/index.rst index 8dd0cfc..a37841b 100644 --- a/usage/index.rst +++ b/usage/index.rst @@ -82,7 +82,7 @@ please contact `support <../faq/#faq-helpsupport>`__ for options. **If you have lost your password or MFA token, please use EPCC's SAFE system to request a password reset for your Bede login account, which we normally aim to process within a working day.** -If you are finding that you are having to use your password and a MFA token too many times, we have provided some tips on `how to reduce the frequency that MFA is required <../faq/#faq-reducemfa>`__ +If you are finding that you are having to use your password and a MFA token too many times, we have provided some tips on `how to reduce the frequency that MFA is required <../faq/#faq-reducemfa>`__. .. _usage-x2go: From ac17aeae85496a0b372a0ba9d4a44542907a730d Mon Sep 17 00:00:00 2001 From: Peter Heywood Date: Mon, 17 Jul 2023 10:53:13 +0100 Subject: [PATCH 4/4] Mention x2go in mfa section too --- usage/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usage/index.rst b/usage/index.rst index a37841b..a55c47d 100644 --- a/usage/index.rst +++ b/usage/index.rst @@ -56,7 +56,7 @@ technique called Multi Factor Authentication (MFA), where something you know (your password), is combined with something you have (an app on a mobile device, such as your phone). -When you first login to Bede, or after a password reset, you will be prompted +When you first login to Bede, or after a password reset, you should use SSH to connect to the machine (rather than x2go) and you will be prompted to: 1. Change your password