Merge pull request #53 from vst/vst/various-fixes-and-improvements

Various Fixes and Improvements
vst · Apr 6, 2024 · 70ffb3e · 70ffb3e
2 parents 39d9cbe + d4cf029
commit 70ffb3e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 97 deletions.
diff --git a/default.nix b/default.nix
@@ -111,6 +111,7 @@ let
       pkgs.nil
       pkgs.nixpkgs-fmt
       pkgs.nodePackages.prettier
+      pkgs.nodejs_20
       pkgs.upx
 
       ## Our custom scripts:
@@ -128,6 +129,9 @@ let
     binPaths = [
       pkgs.bashInteractive ## Added for bash-based CLI option completions
     ];
+    nativeBuildInputs = [
+      pkgs.openssh ## Required by the application tests
+    ];
   };
 
   ############

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "40d989164088db79c1895f177ee67216d91ae8a5",
-        "sha256": "149awch51367za8mjs2inx5m3jgijh9ibda1slf8gywc7lbalsaa",
+        "rev": "7644b4bc09c6329bcd82561a076fd7add697d092",
+        "sha256": "11ic5as26f82rcd71wag0n5p4aacb7cz4v3y3kw9p72nkv0i19wi",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/40d989164088db79c1895f177ee67216d91ae8a5.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/7644b4bc09c6329bcd82561a076fd7add697d092.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/src/Lhp/Remote.hs b/src/Lhp/Remote.hs
@@ -100,6 +100,10 @@ instance Aeson.ToJSON LhpError where
 -- * Internal
 
 
+-- | Builds 'Z.Ssh.SshConfig' value from 'Types.Host'.
+--
+-- If the host does not have an SSH configuration, it will default to
+-- an SSH configuration with the host name as the destination.
 getHostSshConfig :: Types.Host -> Z.Ssh.SshConfig
 getHostSshConfig Types.Host {..} =
   fromMaybe Z.Ssh.SshConfig {_sshConfigDestination = _hostName, _sshConfigOptions = []} _hostSsh

diff --git a/website/.envrc b/website/.envrc
diff --git a/website/flake.lock b/website/flake.lock
diff --git a/website/flake.nix b/website/flake.nix
diff --git a/website/src/components/report/TabulateSshKeys.tsx b/website/src/components/report/TabulateSshKeys.tsx
@@ -3,6 +3,7 @@ import { Chip } from '@nextui-org/chip';
 import { Radio, RadioGroup, Select, SelectItem, Selection } from '@nextui-org/react';
 import { Table, TableBody, TableCell, TableColumn, TableHeader, TableRow } from '@nextui-org/table';
 import { useEffect, useState } from 'react';
+import { toast } from 'react-toastify';
 
 export function TabulateSshKeys({ records }: { records: SshKeysTableRecord[] }) {
   const [filters, setFilters] = useState<Record<string, (record: SshKeysTableRecord) => boolean>>({});
@@ -135,13 +136,7 @@ export function TabulateSshKeys({ records }: { records: SshKeysTableRecord[] })
         </div>
       </div>
 
-      <Table
-        aria-label="Table of SSH Keys"
-        removeWrapper
-        selectionMode="multiple"
-        color="secondary"
-        showSelectionCheckboxes={false}
-      >
+      <Table aria-label="Table of SSH Keys" removeWrapper color="secondary" showSelectionCheckboxes={false}>
         <TableHeader>
           <TableColumn key="type">Type</TableColumn>
           <TableColumn key="length">Length</TableColumn>
@@ -164,7 +159,30 @@ export function TabulateSshKeys({ records }: { records: SshKeysTableRecord[] })
                   <Chip color="danger">UNKNOWN</Chip>
                 )}
               </TableCell>
-              <TableCell>{record.key.fingerprint}</TableCell>
+              <TableCell>
+                {record.key.fingerprint}
+                <div>
+                  <span
+                    className="mr-2 cursor-pointer"
+                    onClick={() => {
+                      navigator.clipboard.writeText(record.key.fingerprint);
+                      toast('Fingerprint is copied to clipboard.');
+                    }}
+                  >
+                    (copy fingerprint)
+                  </span>
+
+                  <span
+                    className="cursor-pointer"
+                    onClick={() => {
+                      navigator.clipboard.writeText(record.key.data);
+                      toast('Fingerprint is copied to clipboard.');
+                    }}
+                  >
+                    (copy key)
+                  </span>
+                </div>
+              </TableCell>
               <TableCell>{record.seenHosts.size}</TableCell>
               <TableCell>
                 {Array.from(record.seenHosts).map((h) => (