From 4a93c9055d5715af939d79d6e6c33c95f6cab110 Mon Sep 17 00:00:00 2001 From: jschaul Date: Sun, 13 Oct 2019 23:02:13 +0200 Subject: [PATCH 1/2] Update multifactor-authentication.md to fedora-30 --- .../multifactor-authentication.md | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/external/security-guides/multifactor-authentication.md b/external/security-guides/multifactor-authentication.md index 20b2ce82..7e9d65df 100644 --- a/external/security-guides/multifactor-authentication.md +++ b/external/security-guides/multifactor-authentication.md @@ -67,26 +67,29 @@ Optional Preparation Steps [minimal Fedora template][FedoraMinimal]. Get it if you haven't already done so: - [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-fedora-26-minimal + [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-fedora-30-minimal 2. Since we'll be making some modifications, you may want to clone the minimal template: - [user@dom0 ~]$ qvm-clone fedora-26-minimal fedora-26-min-mfa + [user@dom0 ~]$ qvm-clone fedora-30-minimal fedora-30-min-mfa + + 3. To open a root shell on the minimal template (for details see [this page](https://www.qubes-os.org/doc/templates/minimal/#passwordless-root)), run the following command: - 3. Since this is going to be a minimal environment in which we run `oathtool` + [user@dom0 ~]$ qvm-run -u root fedora-30-min-mfa xterm + + 4. Since this is going to be a minimal environment in which we run `oathtool` from the command line, we'll install only a couple of packages: - [user@fedora-26-min-mfa ~]$ su - - [user@fedora-26-min-mfa ~]# dnf install oathtool vim-minimal - [user@fedora-26-min-mfa ~]$ poweroff + [root@fedora-30-min-mfa ~]# dnf install oathtool vim-minimal + [root@fedora-30-min-mfa ~]$ poweroff - 4. Create an AppVM and set it to use the TemplateVM we just created: + 5. Create an AppVM and set it to use the TemplateVM we just created: [user@dom0 ~]$ qvm-create -l black mfa - [user@dom0 ~]$ qvm-prefs -s mfa template fedora-26-min-mfa + [user@dom0 ~]$ qvm-prefs -s mfa template fedora-30-min-mfa - 5. Isolate the new AppVM from the network: + 6. Isolate the new AppVM from the network: [user@dom0 ~]$ qvm-prefs -s mfa netvm none @@ -135,7 +138,7 @@ is largely the same. [user@mfa ~]$ > google [user@mfa ~]$ vi google - #!/bin/bash + #!/usr/bin/env bash ##My Google Account ##me@gmail.com oathtool --base32 --totp "xd2n mx5t ekg6 h6bi u74d 745k n4m7 zy3x" From 3436c5f977a9bb4fbbf3074ac43080f2a71a9e52 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 13 Oct 2019 20:11:42 -0500 Subject: [PATCH 2/2] Make link descriptive, relative, & reference-style --- external/security-guides/multifactor-authentication.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/security-guides/multifactor-authentication.md b/external/security-guides/multifactor-authentication.md index 7e9d65df..9d074666 100644 --- a/external/security-guides/multifactor-authentication.md +++ b/external/security-guides/multifactor-authentication.md @@ -74,7 +74,7 @@ Optional Preparation Steps [user@dom0 ~]$ qvm-clone fedora-30-minimal fedora-30-min-mfa - 3. To open a root shell on the minimal template (for details see [this page](https://www.qubes-os.org/doc/templates/minimal/#passwordless-root)), run the following command: + 3. To open a root shell on the minimal template (for details, see [Passwordless Root]), run the following command: [user@dom0 ~]$ qvm-run -u root fedora-30-min-mfa xterm @@ -187,3 +187,4 @@ is largely the same. [Google Authenticator]: https://en.wikipedia.org/wiki/Google_Authenticator [FedoraMinimal]: /doc/Templates/FedoraMinimal/ [usage]: https://en.wikipedia.org/wiki/Google_Authenticator#Usage +[Passwordless Root]: /doc/templates/minimal/#passwordless-root